From c50c32000228639f7fa31ba2376542f73ecfeb1e Mon Sep 17 00:00:00 2001
From: Jan Schneider <jan@horde.org>
Date: Mon, 25 Sep 2017 17:09:45 +0200
Subject: [PATCH] [jan] Fix generating PDF thumbnails with imagick extension
 3.3.0+ (arjen+horde@de-korte.org, Bug #14697).

---
 imp/lib/Mime/Viewer/Pdf.php |  3 ++-
 imp/package.xml             | 15 ++++++++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/imp/lib/Mime/Viewer/Pdf.php b/imp/lib/Mime/Viewer/Pdf.php
index 722518a954f..4b7fa5626a8 100644
--- a/imp/lib/Mime/Viewer/Pdf.php
+++ b/imp/lib/Mime/Viewer/Pdf.php
@@ -133,8 +133,9 @@ protected function _getHordeImageOb($load)
             if ($img instanceof Horde_Image_Imagick) {
                 /* Get rid of PDF transparency. */
                 $img->imagick->setImageBackgroundColor('white');
+                $img->imagick->setImageAlphaChannel(imagick::ALPHACHANNEL_REMOVE);
                 return $GLOBALS['injector']->getInstance('Horde_Core_Factory_Image')->create(array(
-                    'data' => $img->imagick->flattenImages()->getImageBlob()
+                    'data' => $img->imagick->mergeImageLayers(imagick::LAYERMETHOD_FLATTEN)->getImageBlob()
                 ));
             }
 
diff --git a/imp/package.xml b/imp/package.xml
index 559721b83ee..956961c4a87 100644
--- a/imp/package.xml
+++ b/imp/package.xml
@@ -4023,12 +4023,25 @@
    <stability>
     <release>stable</release>
     <api>stable</api></stability>
-   <date>2017-08-01</date>
+   <date>2017-09-19</date>
    <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
    <notes>
 * [jan] Officially support PHP 7.
    </notes>
   </release>
+  <release>
+   <version>
+    <release>6.2.22</release>
+    <api>6.2.0</api></version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api></stability>
+   <date>2017-09-19</date>
+   <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
+   <notes>
+* [jan] Fix generating PDF thumbnails with imagick extension 3.3.0+ (arjen+horde@de-korte.org, Bug #14697).
+   </notes>
+  </release>
   <release>
    <date>2016-12-05</date>
    <version>