rev 5775 - in kde-extras/digikamimageplugins/branches/experimental/debian: . patches

[Achim Bohnet]

Author: ach-guest
Date: 2007-03-24 23:00:09 +0000 (Sat, 24 Mar 2007)
New Revision: 5775

Added:
   kde-extras/digikamimageplugins/branches/experimental/debian/patches/20_keep_alpha_channel.diff
Modified:
   kde-extras/digikamimageplugins/branches/experimental/debian/changelog
Log:
digikamimageplugins:
  * Added: patches/20_keep_alpha_channel.diff.  Fixes: Restoration plugin
    ignores alpha channel. Backported from KDE svn: commit #646166. Thanks
    Gilles for notifying me.

Modified: kde-extras/digikamimageplugins/branches/experimental/debian/changelog
===================================================================
--- kde-extras/digikamimageplugins/branches/experimental/debian/changelog	2007-03-24 20:10:48 UTC (rev 5774)
+++ kde-extras/digikamimageplugins/branches/experimental/debian/changelog	2007-03-24 23:00:09 UTC (rev 5775)
@@ -9,6 +9,9 @@
     check also ;-)
 
   [ Achim Bohnet ]
+  * Added: patches/20_keep_alpha_channel.diff.  Fixes: Restoration plugin
+    ignores alpha channel. Backported from KDE svn: commit #646166. Thanks
+    Gilles for notifying me.
   * debian/control:
     + Point XS-Vcs-* header fields to experimental branch until post etch
     + Remove libkexif1-dev build-dep.  Not needed anymore.

Added: kde-extras/digikamimageplugins/branches/experimental/debian/patches/20_keep_alpha_channel.diff
===================================================================
--- kde-extras/digikamimageplugins/branches/experimental/debian/patches/20_keep_alpha_channel.diff	2007-03-24 20:10:48 UTC (rev 5774)
+++ kde-extras/digikamimageplugins/branches/experimental/debian/patches/20_keep_alpha_channel.diff	2007-03-24 23:00:09 UTC (rev 5775)
@@ -0,0 +1,43 @@
+--- digikamimageplugins-0.9.1.orig/digikamimageplugins/common/cimgiface/cimgiface.cpp
++++ digikamimageplugins-0.9.1/digikamimageplugins/common/cimgiface/cimgiface.cpp
+@@ -156,7 +156,7 @@
+     int imageWidth   = m_orgImage.width();
+     int imageHeight  = m_orgImage.height();
+     
+-    img   = CImg<>(imageWidth, imageHeight, 1, 3);
++    img   = CImg<>(imageWidth, imageHeight, 1, 4);
+     eigen = CImgl<>(CImg<>(2,1), CImg<>(2,2));    
+     register int x, y;
+ 
+@@ -171,6 +171,7 @@
+                 img(x, y, 0) = ptr[0];        // blue.
+                 img(x, y, 1) = ptr[1];        // green.
+                 img(x, y, 2) = ptr[2];        // red.
++                img(x, y, 3) = ptr[3];        // alpha.
+                 ptr += 4;
+             }
+         }
+@@ -186,6 +187,7 @@
+                 img(x, y, 0) = ptr[0];        // blue.
+                 img(x, y, 1) = ptr[1];        // green.
+                 img(x, y, 2) = ptr[2];        // red.
++                img(x, y, 3) = ptr[3];        // alpha.
+                 ptr += 4;
+             }
+         }
+@@ -224,6 +226,7 @@
+                 ptr[0] = (uchar) img(x, y, 0);        // Blue
+                 ptr[1] = (uchar) img(x, y, 1);        // Green
+                 ptr[2] = (uchar) img(x, y, 2);        // Red
++                ptr[3] = (uchar) img(x, y, 3);        // Alpha.
+                 ptr += 4;
+             }
+        }
+@@ -240,6 +243,7 @@
+                 ptr[0] = (unsigned short) img(x, y, 0);        // Blue
+                 ptr[1] = (unsigned short) img(x, y, 1);        // Green
+                 ptr[2] = (unsigned short) img(x, y, 2);        // Red
++                ptr[3] = (unsigned short) img(x, y, 3);        // Alpha.
+                 ptr += 4;
+             }
+        }