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

[Mark Purcell]

Author: msp
Date: 2006-08-04 22:31:27 +0000 (Fri, 04 Aug 2006)
New Revision: 4280

Added:
   kde-extras/digikam/trunk/debian/patches/kbugs131550.patch
Modified:
   kde-extras/digikam/trunk/debian/changelog
Log:
* Pull powerpc fix from http://bugs.kde.org/show_bug.cgi?id=131550

Modified: kde-extras/digikam/trunk/debian/changelog
===================================================================
--- kde-extras/digikam/trunk/debian/changelog	2006-08-04 14:00:48 UTC (rev 4279)
+++ kde-extras/digikam/trunk/debian/changelog	2006-08-04 22:31:27 UTC (rev 4280)
@@ -1,8 +1,9 @@
-digikam (1:0.9-beta1-3) UNRELEASED; urgency=low
+digikam (1:0.9-beta1-3) experimental; urgency=low
 
-  * NOT RELEASED YET
+  [ Mark Purcell ]
+  * Pull powerpc fix from http://bugs.kde.org/show_bug.cgi?id=131550
 
- -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Fri, 28 Jul 2006 07:54:49 +0100
+ -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Fri,  4 Aug 2006 21:49:24 +0100
 
 digikam (1:0.9-beta1-2) experimental; urgency=low
 

Added: kde-extras/digikam/trunk/debian/patches/kbugs131550.patch
===================================================================
--- kde-extras/digikam/trunk/debian/patches/kbugs131550.patch	2006-08-04 14:00:48 UTC (rev 4279)
+++ kde-extras/digikam/trunk/debian/patches/kbugs131550.patch	2006-08-04 22:31:27 UTC (rev 4280)
@@ -0,0 +1,23 @@
+diff -Nur digikam-0.9-beta1/digikam/libs/dimg/loaders/jpegloader.cpp digikam-0.9-beta1.new/digikam/libs/dimg/loaders/jpegloader.cpp
+--- digikam-0.9-beta1/digikam/libs/dimg/loaders/jpegloader.cpp	2006-07-19 22:09:30.000000000 +0100
++++ digikam-0.9-beta1.new/digikam/libs/dimg/loaders/jpegloader.cpp	2006-08-04 21:46:24.000000000 +0100
+@@ -105,7 +105,7 @@
+     if (!file)
+         return false;
+ 
+-    unsigned short header;
++    unsigned char header[2];
+ 
+     if (fread(&header, 2, 1, file) != 1)
+     {
+@@ -113,7 +113,9 @@
+         return false;
+     }
+ 
+-    if (header != 0xd8ff)
++    unsigned char jpegID[] = { 0xFF, 0xD8 }; 
++
++    if (memcmp(header, jpegID, 2) != 0) 
+     {
+         // not a jpeg file
+         fclose(file);