rev 18589 - in kde-extras/digikam/trunk/debian: . patches

[Mark Purcell]

Author: msp
Date: 2010-07-26 21:43:06 +0000 (Mon, 26 Jul 2010)
New Revision: 18589

Added:
   kde-extras/digikam/trunk/debian/patches/
   kde-extras/digikam/trunk/debian/patches/patch_libpgf.diff
   kde-extras/digikam/trunk/debian/patches/series
Modified:
   kde-extras/digikam/trunk/debian/changelog
Log:
* Pull big-endian thumbnails patch from upstream
  - https://bugs.kde.org/show_bug.cgi?id=233094

Modified: kde-extras/digikam/trunk/debian/changelog
===================================================================
--- kde-extras/digikam/trunk/debian/changelog	2010-07-26 10:42:48 UTC (rev 18588)
+++ kde-extras/digikam/trunk/debian/changelog	2010-07-26 21:43:06 UTC (rev 18589)
@@ -1,9 +1,9 @@
-digikam (2:1.3.0-1) UNRELEASED; urgency=low
+digikam (2:1.2.0-6) unstable; urgency=low
 
-  * New Upstream Release
-    - TODO await KDE SC 4.5 for libkdcraw & libkexiv2 :-(
+  * Pull big-endian thumbnails patch from upstream
+    - https://bugs.kde.org/show_bug.cgi?id=233094
 
- -- Mark Purcell <msp at debian.org>  Mon, 07 Jun 2010 18:45:55 +1000
+ -- Mark Purcell <msp at debian.org>  Tue, 27 Jul 2010 07:39:25 +1000
 
 digikam (2:1.2.0-5) unstable; urgency=low
 

Added: kde-extras/digikam/trunk/debian/patches/patch_libpgf.diff
===================================================================
--- kde-extras/digikam/trunk/debian/patches/patch_libpgf.diff	                        (rev 0)
+++ kde-extras/digikam/trunk/debian/patches/patch_libpgf.diff	2010-07-26 21:43:06 UTC (rev 18589)
@@ -0,0 +1,52 @@
+--- digikam-1.2.0/libs/threadimageio/pgfutils.cpp	2010-03-29 00:18:32.000000000 +0200
++++ ../digikam-1.2.0/libs/threadimageio/pgfutils.cpp	2010-05-15 08:42:00.099403788 +0200
+@@ -65,8 +65,13 @@
+         }
+ 
+         img = QImage(pgfImg.Width(), pgfImg.Height(), QImage::Format_ARGB32);
++#ifdef __BIG_ENDIAN__
++        int map[] = {3, 2, 1, 0};
++#else
++        int map[] = {0, 1, 2, 3};
++#endif
+         pgfImg.Read();
+-        pgfImg.GetBitmap(img.bytesPerLine(), (UINT8*)img.bits(), img.depth());
++        pgfImg.GetBitmap(img.bytesPerLine(), (UINT8*)img.bits(), img.depth(), map);
+     }
+     catch(IOException& e)
+     {
+@@ -93,7 +98,11 @@
+         // No need Alpha to optimize space on DB.
+         if (img.format() != QImage::Format_ARGB32)
+             img.convertToFormat(QImage::Format_ARGB32);
+-
++#ifdef __BIG_ENDIAN__
++        int map[] = {3, 2, 1, 0};
++#else
++        int map[] = {0, 1, 2, 3};
++#endif
+         CPGFImage pgfImg;
+ 
+         PGFHeader header;
+@@ -105,7 +114,7 @@
+         header.mode     = ImageModeRGBA;
+         header.background.rgbtBlue = header.background.rgbtGreen = header.background.rgbtRed = 0;
+         pgfImg.SetHeader(header);
+-        pgfImg.ImportBitmap(img.bytesPerLine(), (UINT8*)img.bits(), img.depth());
++        pgfImg.ImportBitmap(img.bytesPerLine(), (UINT8*)img.bits(), img.depth(), map);
+ 
+         // TODO : optimize memory allocation...
+         CPGFMemoryStream stream(256000);
+@@ -193,7 +202,11 @@
+         if (i<0) i=0;
+ 
+         pgf.Read(i);  // Read PGF image at reduced level i.
+-        int map[] = { 0, 1, 2 };
++#ifdef __BIG_ENDIAN__
++        int map[] = {3, 2, 1, 0};
++#else
++        int map[] = {0, 1, 2, 3};
++#endif
+         img = QImage(pgf.Width(i), pgf.Height(i), QImage::Format_RGB32);
+ 
+ /*

Added: kde-extras/digikam/trunk/debian/patches/series
===================================================================
--- kde-extras/digikam/trunk/debian/patches/series	                        (rev 0)
+++ kde-extras/digikam/trunk/debian/patches/series	2010-07-26 21:43:06 UTC (rev 18589)
@@ -0,0 +1 @@
+patch_libpgf.diff