[SCM] MLT multimedia framework packaging branch, master, updated. debian/6.6.0-1-2-g99478f9

[Patrick Matthäi]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/krap/mlt.git;a=commitdiff;h=99478f9

The following commit has been merged in the master branch:
commit 99478f97e93c13dab1a0da6277a27d3e933752cb
Author: Patrick Matthäi <pmatthaei at debian.org>
Date:   Tue Mar 6 10:09:22 2018 +0100

    * Add upstream patch 02-qimage-crash.
---
 debian/changelog                    |  1 +
 debian/patches/02-qimage-crash.diff | 25 +++++++++++++++++++++++++
 debian/patches/series               |  1 +
 3 files changed, 27 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 38b3c46..354deb0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 mlt (6.6.0-2) UNRELEASED; urgency=medium
 
   * Add upstream patch 01-qimage-segfault.
+  * Add upstream patch 02-qimage-crash.
 
  -- Patrick Matthäi <pmatthaei at debian.org>  Thu, 01 Feb 2018 16:56:52 +0100
 
diff --git a/debian/patches/02-qimage-crash.diff b/debian/patches/02-qimage-crash.diff
new file mode 100644
index 0000000..363cf1d
--- /dev/null
+++ b/debian/patches/02-qimage-crash.diff
@@ -0,0 +1,25 @@
+commit 14aaea69be922cbb4eb4ba46c4bf2c94fb0858da
+Author: Dan Dennedy <dan at dennedy.org>
+Date:   Mon Mar 5 15:38:35 2018 -0800
+
+    Fix crash in qimage when format changes.
+    
+    The format will change if it has an alpha channel.
+
+diff --git a/src/modules/qt/qimage_wrapper.cpp b/src/modules/qt/qimage_wrapper.cpp
+index 99b4ebf8..c3b101aa 100644
+--- a/src/modules/qt/qimage_wrapper.cpp
++++ b/src/modules/qt/qimage_wrapper.cpp
+@@ -236,9 +236,11 @@ void refresh_image( producer_qimage self, mlt_frame frame, mlt_image_format form
+ 		if ( qimage->format() != qimageFormat )
+ 		{
+ 			QImage temp = qimage->convertToFormat( qimageFormat );
+-			delete qimage;
+ 			qimage = new QImage( temp );
+ 			self->qimage = qimage;
++			mlt_cache_item_close( self->qimage_cache );
++			mlt_service_cache_put( MLT_PRODUCER_SERVICE( producer ), "qimage.qimage", qimage, 0, ( mlt_destructor )qimage_delete );
++			self->qimage_cache = mlt_service_cache_get( MLT_PRODUCER_SERVICE( producer ), "qimage.qimage" );
+ 		}
+ 		QImage scaled = interp? qimage->scaled( QSize( width, height ) ) :
+ 			qimage->scaled( QSize(width, height), Qt::IgnoreAspectRatio, Qt::SmoothTransformation );
diff --git a/debian/patches/series b/debian/patches/series
index 174e725..b0b7bdf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 01-qimage-segfault.diff
+02-qimage-crash.diff

-- 
MLT multimedia framework packaging