[libvigraimpex] 04/07: dropped off-by-on-in-exportImageAlpha.diff

[Daniel Stender]

This is an automated email from the git hooks/post-receive script.

danstender-guest pushed a commit to branch master
in repository libvigraimpex.

commit b7e478ff59cfbc14fd367a4e3021d9d016599e8d
Author: Daniel Stender <debian at danielstender.com>
Date:   Mon Jan 25 17:17:14 2016 +0100

    dropped off-by-on-in-exportImageAlpha.diff
---
 debian/changelog                                  |  6 ++++--
 debian/patches/off-by-on-in-exportImageAlpha.diff | 15 ---------------
 debian/patches/series                             |  1 -
 3 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 62e96bd..4cce912 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,9 +6,11 @@ libvigraimpex (0.10.0+git20160120.803d5d4-1) UNRELEASED; urgency=medium
     + dropped deb/get-orig.source.sh.
     + deb/copyright: added Files-Excluded with remaining strip patterns.
     + deb/rules: dropped build target get-orig-source, updated clean target.
-  * Dropped deb/*.dirs (obsolete).
+  * Dropped:
+    + deb/*.dirs (obsolete)
+    + off-by-on-in-exportImageAlpha.diff (applied upstream).
 
- -- Daniel Stender <debian at danielstender.com>  Mon, 25 Jan 2016 17:13:28 +0100
+ -- Daniel Stender <debian at danielstender.com>  Mon, 25 Jan 2016 17:16:14 +0100
 
 libvigraimpex (1.10.0+dfsg-11) unstable; urgency=medium
 
diff --git a/debian/patches/off-by-on-in-exportImageAlpha.diff b/debian/patches/off-by-on-in-exportImageAlpha.diff
deleted file mode 100644
index c13c1d2..0000000
--- a/debian/patches/off-by-on-in-exportImageAlpha.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: fix an off-by-one error in function exportImageAlpha
- suggested by Andreas Metzer, fixes an exr issue in enblend
-Origin: https://github.com/ukoethe/vigra/commit/c3fb6c90ab8b4243b752919d0e491df2a2d4f047
-
---- a/include/vigra/impexalpha.hxx
-+++ b/include/vigra/impexalpha.hxx
-@@ -789,7 +789,7 @@
- 
-             encoder->setPixelType(pixel_type);
- 
--            vigra_precondition(isBandNumberSupported(encoder->getFileType(), image_accessor.size(image_upper_left)),
-+            vigra_precondition(isBandNumberSupported(encoder->getFileType(), image_accessor.size(image_upper_left) + 1U),
-                                "exportImageAlpha(): file format does not support requested number of bands (color channels)");
- 
-             const range_t image_source_range(find_source_value_range(export_info,
diff --git a/debian/patches/series b/debian/patches/series
index 34bef67..5bb6c5a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,4 +3,3 @@ docsrc-out-of-source.diff
 docsrc-paths.diff
 vigra-config-docdir.diff
 removed-static-docs.diff
-off-by-on-in-exportImageAlpha.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/libvigraimpex.git