Changelog update, fix for small leak introduced in 5c5d74a

lovell · Aug 17, 2016 · 7ada9db · 7ada9db
1 parent 5c5d74a
commit 7ada9db
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git a/docs/changelog.md b/docs/changelog.md
@@ -21,6 +21,10 @@ Requires libvips v8.3.3
   [#511](https://github.com/lovell/sharp/pull/511)
   [@mhirsch](https://github.com/mhirsch)
 
+* Add joinChannel and toColourspace/toColorspace operations.
+  [#513](https://github.com/lovell/sharp/pull/513)
+  [@mhirsch](https://github.com/mhirsch)
+
 * Add support for raw pixel data with boolean and withOverlay operations.
   [#516](https://github.com/lovell/sharp/pull/516)
   [@mhirsch](https://github.com/mhirsch)

diff --git a/src/pipeline.cc b/src/pipeline.cc
@@ -918,6 +918,11 @@ class PipelineWorker : public Nan::AsyncWorker {
     delete baton->input;
     delete baton->overlay;
     delete baton->boolean;
+    for_each(baton->joinChannelIn.begin(), baton->joinChannelIn.end(),
+      [this](sharp::InputDescriptor *joinChannelIn) {
+        delete joinChannelIn;
+      }
+    );
     delete baton;
 
     // Decrement processing task counter

diff --git a/test/leak/sharp.supp b/test/leak/sharp.supp
@@ -29,7 +29,16 @@
   ...
   fun:jpeg_finish_compress
 }
-
+{
+  value_jpeg_obj
+  Memcheck:Value8
+  obj:*/libjpeg.so*
+}
+{
+  cond_jpeg_obj
+  Memcheck:Cond
+  obj:*/libjpeg.so*
+}
 # libpng
 {
   cond_libpng_png_read_row