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

[Patrick Matthäi]

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

The following commit has been merged in the master branch:
commit a9d861cb829b3e1b5e7251ccb4213cf8c8670632
Author: Patrick Matthäi <pmatthaei at debian.org>
Date:   Thu Feb 1 16:57:04 2018 +0100

    * Add upstream patch 01-qimage-segfault.
---
 debian/changelog                       |  6 ++++++
 debian/patches/01-qimage-segfault.diff | 33 +++++++++++++++++++++++++++++++++
 debian/patches/series                  |  1 +
 3 files changed, 40 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index da6a6b6..38b3c46 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mlt (6.6.0-2) UNRELEASED; urgency=medium
+
+  * Add upstream patch 01-qimage-segfault.
+
+ -- Patrick Matthäi <pmatthaei at debian.org>  Thu, 01 Feb 2018 16:56:52 +0100
+
 mlt (6.6.0-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/patches/01-qimage-segfault.diff b/debian/patches/01-qimage-segfault.diff
new file mode 100644
index 0000000..12b967c
--- /dev/null
+++ b/debian/patches/01-qimage-segfault.diff
@@ -0,0 +1,33 @@
+commit e013fd7c2f49b40a1b482d712d531329d538da88
+Author: Brian Matherly <code at brianmatherly.com>
+Date:   Wed Jan 31 20:57:42 2018 -0600
+
+    Fix segmentation fault when using qimage png producer #296
+
+diff --git a/src/modules/qt/qimage_wrapper.cpp b/src/modules/qt/qimage_wrapper.cpp
+index 436f65d1..99b4ebf8 100644
+--- a/src/modules/qt/qimage_wrapper.cpp
++++ b/src/modules/qt/qimage_wrapper.cpp
+@@ -229,18 +229,19 @@ void refresh_image( producer_qimage self, mlt_frame frame, mlt_image_format form
+ 		QString interps = mlt_properties_get( properties, "rescale.interp" );
+ 		bool interp = ( interps != "nearest" ) && ( interps != "none" );
+ 		QImage *qimage = static_cast<QImage*>( self->qimage );
++		int has_alpha = qimage->hasAlphaChannel();
++		QImage::Format qimageFormat = has_alpha ? QImage::Format_ARGB32 : QImage::Format_RGB32;
+ 
+ 		// Note - the original qimage is already safe and ready for destruction
+-		if ( qimage->depth() == 1 )
++		if ( qimage->format() != qimageFormat )
+ 		{
+-			QImage temp = qimage->convertToFormat( QImage::Format_RGB32 );
++			QImage temp = qimage->convertToFormat( qimageFormat );
+ 			delete qimage;
+ 			qimage = new QImage( temp );
+ 			self->qimage = qimage;
+ 		}
+ 		QImage scaled = interp? qimage->scaled( QSize( width, height ) ) :
+ 			qimage->scaled( QSize(width, height), Qt::IgnoreAspectRatio, Qt::SmoothTransformation );
+-		int has_alpha = scaled.hasAlphaChannel();
+ 
+ 		// Store width and height
+ 		self->current_width = width;
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..174e725
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-qimage-segfault.diff

-- 
MLT multimedia framework packaging