[SCM] MLT multimedia framework packaging branch, master, updated. debian/6.4.1-6-13-ga2da7dd

[Patrick Matthäi]

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

The following commit has been merged in the master branch:
commit edb85d615333e01ff4bffd5f910e7a23d65a1c56
Author: Patrick Matthäi <pmatthaei at debian.org>
Date:   Wed Jan 24 09:54:27 2018 +0100

    - Remove merged patch 01-crash-affine.
---
 debian/changelog                    |  1 +
 debian/patches/01-crash-affine.diff | 40 -------------------------------------
 2 files changed, 1 insertion(+), 40 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 23fe1d7..8f92e09 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 mlt (6.6.0-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+    - Remove merged patch 01-crash-affine.
 
  -- Patrick Matthäi <pmatthaei at debian.org>  Wed, 24 Jan 2018 09:53:33 +0100
 
diff --git a/debian/patches/01-crash-affine.diff b/debian/patches/01-crash-affine.diff
deleted file mode 100644
index ba13782..0000000
--- a/debian/patches/01-crash-affine.diff
+++ /dev/null
@@ -1,40 +0,0 @@
-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 )
- 		{

-- 
MLT multimedia framework packaging