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

[Patrick Matthäi]

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

The following commit has been merged in the master branch:
commit 8baa661c4483c5af440b832038dd3a47abf9270d
Author: Patrick Matthäi <pmatthaei at debian.org>
Date:   Mon Feb 6 12:24:47 2017 +0100

    * Add upstream patch 01-crash-affine to fix a crash in affine due to relaxed
      constraints.
---
 debian/changelog                    |  7 +++++++
 debian/patches/01-crash-affine.diff | 40 +++++++++++++++++++++++++++++++++++++
 debian/patches/series               |  1 +
 3 files changed, 48 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index f423448..cb1f655 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mlt (6.4.1-2) UNRELEASED; urgency=low
+
+  * Add upstream patch 01-crash-affine to fix a crash in affine due to relaxed
+    constraints.
+
+ -- Patrick Matthäi <pmatthaei at debian.org>  Mon, 06 Feb 2017 12:24:09 +0100
+
 mlt (6.4.1-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/patches/01-crash-affine.diff b/debian/patches/01-crash-affine.diff
new file mode 100644
index 0000000..ba13782
--- /dev/null
+++ b/debian/patches/01-crash-affine.diff
@@ -0,0 +1,40 @@
+commit ab626f7543e0498e3ca3842ba69ad2f2e66ce227
+Author: Dan Dennedy <dan at dennedy.org>
+Date:   Sun Jan 29 00:43:28 2017 -0800
+
+    Fix crash in affine due to relaxed constraints.
+
+diff --git a/src/modules/plus/transition_affine.c b/src/modules/plus/transition_affine.c
+index 8c8820e..91607fd 100644
+--- a/src/modules/plus/transition_affine.c
++++ b/src/modules/plus/transition_affine.c
+@@ -1,6 +1,6 @@
+ /*
+  * transition_affine.c -- affine transformations
+- * Copyright (C) 2003-2016 Meltytech, LLC
++ * Copyright (C) 2003-2017 Meltytech, LLC
+  *
+  * This library is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU Lesser General Public
+@@ -552,8 +552,8 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f
+ 
+ 		// Affine boundaries
+ 		float minima = 0;
+-		float xmax = b_width;
+-		float ymax = b_height;
++		float xmax = b_width - 1;
++		float ymax = b_height - 1;
+ 
+ 		// Set the interpolation function
+ 		if ( interps == NULL || strcmp( interps, "nearest" ) == 0 || strcmp( interps, "neighbor" ) == 0 || strcmp( interps, "tiles" ) == 0 || strcmp( interps, "fast_bilinear" ) == 0 )
+@@ -567,9 +567,7 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f
+ 		else if ( strcmp( interps, "bilinear" ) == 0 )
+ 		{
+ 			interp = interpBL_b32;
+-			// uses floorf. Values should be >= 0 and < max + 1.
+-			xmax += 0.99;
+-			ymax += 0.99;
++			// uses floorf.
+ 		}
+ 		else if ( strcmp( interps, "bicubic" ) == 0 ||  strcmp( interps, "hyper" ) == 0 || strcmp( interps, "sinc" ) == 0 || strcmp( interps, "lanczos" ) == 0 || strcmp( interps, "spline" ) == 0 )
+ 		{
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..2ee23c7
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-crash-affine.diff

-- 
MLT multimedia framework packaging