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

[Patrick Matthäi]

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

The following commit has been merged in the master branch:
commit 1a128172cdc94a61f5075304ed432357d53d9f37
Author: Patrick Matthäi <pmatthaei at debian.org>
Date:   Fri Apr 13 09:09:24 2018 +0200

    * Add upstream patch 05-pgm-luma-crash.
---
 debian/changelog                      |  1 +
 debian/patches/05-pgm-luma-crash.diff | 42 +++++++++++++++++++++++++++++++++++
 debian/patches/series                 |  1 +
 3 files changed, 44 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 910058b..95e6a7b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 mlt (6.6.0-3) UNRELEASED; urgency=medium
 
   * Add upstream patch 04-rotoscoping-crash.
+  * Add upstream patch 05-pgm-luma-crash.
 
  -- Patrick Matthäi <pmatthaei at debian.org>  Wed, 11 Apr 2018 10:54:32 +0200
 
diff --git a/debian/patches/05-pgm-luma-crash.diff b/debian/patches/05-pgm-luma-crash.diff
new file mode 100644
index 0000000..d73e5b0
--- /dev/null
+++ b/debian/patches/05-pgm-luma-crash.diff
@@ -0,0 +1,42 @@
+commit 715bf79a6450aa70360362f473ced1c7b2b83afc
+Author: Jean-Baptiste Mardelle <jb at kdenlive.org>
+Date:   Wed Apr 11 14:59:33 2018 +0200
+
+    Fix crash on composite transition with unexpected pgm luma
+    https://bugs.kde.org/show_bug.cgi?id=381110
+
+diff --git a/src/modules/core/transition_composite.c b/src/modules/core/transition_composite.c
+index eb4b90f1..0cc9e853 100644
+--- a/src/modules/core/transition_composite.c
++++ b/src/modules/core/transition_composite.c
+@@ -745,6 +745,7 @@ static uint16_t* get_luma( mlt_transition self, mlt_properties properties, int w
+ 			char *extension = strrchr( resource, '.' );
+ 			
+ 			// See if it is a PGM
++			int lumaLoaded = 0;
+ 			if ( extension != NULL && strcmp( extension, ".pgm" ) == 0 )
+ 			{
+ 				// Open PGM
+@@ -754,14 +755,16 @@ static uint16_t* get_luma( mlt_transition self, mlt_properties properties, int w
+ 					// Load from PGM
+ 					luma_read_pgm( f, &orig_bitmap, &luma_width, &luma_height );
+ 					fclose( f );
+-					
+-					// Remember the original size for subsequent scaling
+-					mlt_properties_set_data( properties, "_luma.orig_bitmap", orig_bitmap, luma_width * luma_height * 2, mlt_pool_release, NULL );
+-					mlt_properties_set_int( properties, "_luma.orig_width", luma_width );
+-					mlt_properties_set_int( properties, "_luma.orig_height", luma_height );
++					if ( luma_width > 0 && luma_height > 0 ) {
++						// Remember the original size for subsequent scaling
++						mlt_properties_set_data( properties, "_luma.orig_bitmap", orig_bitmap, luma_width * luma_height * 2, mlt_pool_release, NULL );
++						mlt_properties_set_int( properties, "_luma.orig_width", luma_width );
++						mlt_properties_set_int( properties, "_luma.orig_height", luma_height );
++						lumaLoaded = 1;
++					}
+ 				}
+ 			}
+-			else
++			if ( !lumaLoaded )
+ 			{
+ 				// Get the factory producer service
+ 				char *factory = mlt_properties_get( properties, "factory" );
diff --git a/debian/patches/series b/debian/patches/series
index 0487e11..3b94cf1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 02-qimage-crash.diff
 03-crash-kdenlivetile.diff
 04-rotoscoping-crash.diff
+05-pgm-luma-crash.diff

-- 
MLT multimedia framework packaging