[arrayfire] 280/284: Drop Always-use-freeimage-flags-instead-of-hardcoded-offsets.patch, fixed upstream.
Ghislain Vaillant
ghisvail-guest at moszumanska.debian.org
Sun Feb 7 18:59:42 UTC 2016
This is an automated email from the git hooks/post-receive script.
ghisvail-guest pushed a commit to branch debian/experimental
in repository arrayfire.
commit 13993e8c31c39e1a16f04debfe373c7aded062e8
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date: Fri Feb 5 11:06:46 2016 +0000
Drop Always-use-freeimage-flags-instead-of-hardcoded-offsets.patch,
fixed upstream.
---
...eimage-flags-instead-of-hardcoded-offsets.patch | 94 ----------------------
debian/patches/series | 1 -
2 files changed, 95 deletions(-)
diff --git a/debian/patches/Always-use-freeimage-flags-instead-of-hardcoded-offsets.patch b/debian/patches/Always-use-freeimage-flags-instead-of-hardcoded-offsets.patch
deleted file mode 100644
index 42857f3..0000000
--- a/debian/patches/Always-use-freeimage-flags-instead-of-hardcoded-offsets.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From: Pavan Yalamanchili <pavan at arrayfire.com>
-Date: Fri, 8 Jan 2016 08:43:51 -0500
-Subject: Always use freeimage flags instead of hardcoded offsets
-
----
- src/api/c/imageio.cpp | 40 ++++++++++++++++++++--------------------
- 1 file changed, 20 insertions(+), 20 deletions(-)
-
-diff --git a/src/api/c/imageio.cpp b/src/api/c/imageio.cpp
-index 746ee69..c6a20a8 100644
---- a/src/api/c/imageio.cpp
-+++ b/src/api/c/imageio.cpp
-@@ -63,9 +63,9 @@ static af_err readImage(af_array *rImage, const uchar* pSrcLine, const int nSrcP
- } else {
- // Non 8-bit types do not use ordering
- // See Pixel Access Functions Chapter in FreeImage Doc
-- pDst0[indx] = (float) *(src + (x * step + 0));
-- pDst1[indx] = (float) *(src + (x * step + 1));
-- pDst2[indx] = (float) *(src + (x * step + 2));
-+ pDst0[indx] = (float) *(src + (x * step + FI_RGBA_RED));
-+ pDst1[indx] = (float) *(src + (x * step + FI_RGBA_GREEN));
-+ pDst2[indx] = (float) *(src + (x * step + FI_RGBA_BLUE));
- }
- if (fo_color == 4) pDst3[indx] = (float) *(src + (x * step + FI_RGBA_ALPHA));
- }
-@@ -104,9 +104,9 @@ static af_err readImage(af_array *rImage, const uchar* pSrcLine, const int nSrcP
- } else {
- // Non 8-bit types do not use ordering
- // See Pixel Access Functions Chapter in FreeImage Doc
-- r = (T) *(src + (x * step + 0));
-- g = (T) *(src + (x * step + 1));
-- b = (T) *(src + (x * step + 2));
-+ r = (T) *(src + (x * step + FI_RGBA_RED));
-+ g = (T) *(src + (x * step + FI_RGBA_GREEN));
-+ b = (T) *(src + (x * step + FI_RGBA_BLUE));
- }
- pDst[indx] = r * 0.2989f + g * 0.5870f + b * 0.1140f;
- }
-@@ -333,10 +333,10 @@ af_err af_save_image(const char* filename, const af_array in_)
- // Copy the array into FreeImage buffer
- for (uint y = 0; y < fi_h; ++y) {
- for (uint x = 0; x < fi_w; ++x) {
-- *(pDstLine + x * step + 0) = (uchar) pSrc2[indx]; // r
-- *(pDstLine + x * step + 1) = (uchar) pSrc1[indx]; // g
-- *(pDstLine + x * step + 2) = (uchar) pSrc0[indx]; // b
-- *(pDstLine + x * step + 3) = (uchar) pSrc3[indx]; // a
-+ *(pDstLine + x * step + FI_RGBA_RED ) = (uchar) pSrc0[indx]; // r
-+ *(pDstLine + x * step + FI_RGBA_GREEN) = (uchar) pSrc1[indx]; // g
-+ *(pDstLine + x * step + FI_RGBA_BLUE ) = (uchar) pSrc2[indx]; // b
-+ *(pDstLine + x * step + FI_RGBA_ALPHA) = (uchar) pSrc3[indx]; // a
- ++indx;
- }
- pDstLine -= nDstPitch;
-@@ -362,9 +362,9 @@ af_err af_save_image(const char* filename, const af_array in_)
- // Copy the array into FreeImage buffer
- for (uint y = 0; y < fi_h; ++y) {
- for (uint x = 0; x < fi_w; ++x) {
-- *(pDstLine + x * step + 0) = (uchar) pSrc2[indx]; // r
-- *(pDstLine + x * step + 1) = (uchar) pSrc1[indx]; // g
-- *(pDstLine + x * step + 2) = (uchar) pSrc0[indx]; // b
-+ *(pDstLine + x * step + FI_RGBA_RED ) = (uchar) pSrc0[indx]; // r
-+ *(pDstLine + x * step + FI_RGBA_GREEN) = (uchar) pSrc1[indx]; // g
-+ *(pDstLine + x * step + FI_RGBA_BLUE ) = (uchar) pSrc2[indx]; // b
- ++indx;
- }
- pDstLine -= nDstPitch;
-@@ -602,10 +602,10 @@ af_err af_save_image_memory(void **ptr, const af_array in_, const af_image_forma
- // Copy the array into FreeImage buffer
- for (uint y = 0; y < fi_h; ++y) {
- for (uint x = 0; x < fi_w; ++x) {
-- *(pDstLine + x * step + 2) = (uchar) pSrc0[indx]; // b
-- *(pDstLine + x * step + 1) = (uchar) pSrc1[indx]; // g
-- *(pDstLine + x * step + 0) = (uchar) pSrc2[indx]; // r
-- *(pDstLine + x * step + 3) = (uchar) pSrc3[indx]; // a
-+ *(pDstLine + x * step + FI_RGBA_RED ) = (uchar) pSrc0[indx]; // r
-+ *(pDstLine + x * step + FI_RGBA_GREEN) = (uchar) pSrc1[indx]; // g
-+ *(pDstLine + x * step + FI_RGBA_BLUE ) = (uchar) pSrc2[indx]; // b
-+ *(pDstLine + x * step + FI_RGBA_ALPHA) = (uchar) pSrc3[indx]; // a
- ++indx;
- }
- pDstLine -= nDstPitch;
-@@ -631,9 +631,9 @@ af_err af_save_image_memory(void **ptr, const af_array in_, const af_image_forma
- // Copy the array into FreeImage buffer
- for (uint y = 0; y < fi_h; ++y) {
- for (uint x = 0; x < fi_w; ++x) {
-- *(pDstLine + x * step + 2) = (uchar) pSrc0[indx]; // b
-- *(pDstLine + x * step + 1) = (uchar) pSrc1[indx]; // g
-- *(pDstLine + x * step + 0) = (uchar) pSrc2[indx]; // r
-+ *(pDstLine + x * step + FI_RGBA_RED ) = (uchar) pSrc0[indx]; // r
-+ *(pDstLine + x * step + FI_RGBA_GREEN) = (uchar) pSrc1[indx]; // g
-+ *(pDstLine + x * step + FI_RGBA_BLUE ) = (uchar) pSrc2[indx]; // b
- ++indx;
- }
- pDstLine -= nDstPitch;
diff --git a/debian/patches/series b/debian/patches/series
index 671fbcb..f64c3c8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,3 @@ Use-system-mathjax.patch
Disable-privacy-breaching-settings.patch
Use-system-gtest.patch
Disable-git-usage-in-Doxygen-settings.patch
-Always-use-freeimage-flags-instead-of-hardcoded-offsets.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/arrayfire.git
More information about the debian-science-commits
mailing list