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

[Achim Bohnet]

Author: ach-guest
Date: 2006-02-25 22:56:48 +0000 (Sat, 25 Feb 2006)
New Revision: 3199

Added:
   kde-extras/digikam/trunk/debian/patches/10_kdesvn_r507591_fix_jpeg_on_ppc.diff
Removed:
   kde-extras/digikam/trunk/debian/patches/10_kdesvn_r507545_fix_jpeg_on_ppc.diff
Modified:
   kde-extras/digikam/trunk/debian/changelog
Log:
digikam: attempt to fix 'Bug#354173: digikam displays all black when trying to view image'
	on AMD64 without breaking PPC again.  Waiting for confirmation...

Modified: kde-extras/digikam/trunk/debian/changelog
===================================================================
--- kde-extras/digikam/trunk/debian/changelog	2006-02-25 21:48:50 UTC (rev 3198)
+++ kde-extras/digikam/trunk/debian/changelog	2006-02-25 22:56:48 UTC (rev 3199)
@@ -2,7 +2,11 @@
 
   [ Achim Bohnet ]
   * recommend dcraw
-
+  * patches/10_kdesvn_r507545_fix_jpeg_on_ppc.diff removed: breaks AMD64.
+  * patches/10_kdesvn_r507591_fix_jpeg_on_ppc.diff 2nd try.  Works on
+    PPC without breaking AMD64     <-------------  !!!! to verify -> then
+    closes: #354173 !!!!!!.  Thanks to Rodney Gordon II for testing.
+    
  -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Fri, 24 Feb 2006 02:23:18 +0100
 
 digikam (0.8.1-3) unstable; urgency=low

Deleted: kde-extras/digikam/trunk/debian/patches/10_kdesvn_r507545_fix_jpeg_on_ppc.diff

Added: kde-extras/digikam/trunk/debian/patches/10_kdesvn_r507591_fix_jpeg_on_ppc.diff
===================================================================
--- kde-extras/digikam/trunk/debian/patches/10_kdesvn_r507591_fix_jpeg_on_ppc.diff	2006-02-25 21:48:50 UTC (rev 3198)
+++ kde-extras/digikam/trunk/debian/patches/10_kdesvn_r507591_fix_jpeg_on_ppc.diff	2006-02-25 22:56:48 UTC (rev 3199)
@@ -0,0 +1,66 @@
+Index: digikam/utilities/imageeditor/imlibinterface.cpp
+===================================================================
+--- digikam/utilities/imageeditor/imlibinterface.cpp	(revision 507544)
++++ digikam/utilities/imageeditor/imlibinterface.cpp	(revision 507591)
+@@ -48,6 +48,7 @@
+ 
+ // KDE includes.
+ 
++#include <kfilemetainfo.h>
+ #include <kdebug.h>
+ #include <kprocess.h>
+ #include <libkexif/kexifdata.h>
+@@ -69,7 +70,8 @@
+ 
+ #define MaxRGB 255L
+ 
+-class ImlibInterfacePrivate {
++class ImlibInterfacePrivate
++{
+ 
+ public:
+ 
+@@ -170,7 +172,11 @@
+ 
+ int ImlibInterface::fileFormat(const QString& filePath)
+ {
++    if ( filePath == QString::null )
++        return NONE_IMAGE;
++        
+     FILE* f = fopen(QFile::encodeName(filePath), "rb");
++    
+     if (!f)
+     {
+         kdWarning() << "Failed to open file" << endl;
+@@ -189,12 +195,12 @@
+ 
+     fclose(f);
+     
+-    DcrawParse     rawFileParser;
+-    unsigned short jpegID    = 0xD8FF;
+-    unsigned short tiffBigID = 0x4d4d;
+-    unsigned short tiffLilID = 0x4949;
+-    unsigned char  pngID[8]  = {'\211', 'P', 'N', 'G', '\r', '\n', '\032', '\n'};
+-    
++    DcrawParse rawFileParser;
++    uchar jpegID[2]    = { 0xFF, 0xD8 };   
++    uchar tiffBigID[2] = { 0x4D, 0x4D };
++    uchar tiffLilID[2] = { 0x49, 0x49 };
++    uchar pngID[8]     = {'\211', 'P', 'N', 'G', '\r', '\n', '\032', '\n'};
++
+     if (memcmp(&header, &jpegID, 2) == 0)            // JPEG file ?
+     {
+         return JPEG_IMAGE;
+@@ -215,9 +221,10 @@
+     {
+         return TIFF_IMAGE;
+     }
++    
++    // In others cases, QImage will be used to try to open file.
++    return QIMAGE_IMAGE;
+ 
+-    // In others cases, QImage will be used to open file.
+-    return QIMAGE_IMAGE;      
+ }
+ 
+ bool ImlibInterface::load(const QString& filename, bool *isReadOnly)