From 7ada9dbd0d43cf985cc4438a74f1ead338193ff4 Mon Sep 17 00:00:00 2001
From: Lovell Fuller <github@lovell.info>
Date: Wed, 17 Aug 2016 20:56:53 +0100
Subject: [PATCH] Changelog update, fix for small leak introduced in 5c5d74a

---
 docs/changelog.md    |  4 ++++
 src/pipeline.cc      |  5 +++++
 test/leak/sharp.supp | 11 ++++++++++-
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.md b/docs/changelog.md
index 44537573..3abae989 100644
--- 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
index 4db7a400..4f9b6f35 100644
--- 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
index 8e81393b..00e302cf 100644
--- 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