[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/extragear/graphics/digikam/1.0-databaseext/libs
From:       Holger Foerster <hamsi2k () freenet ! de>
Date:       2010-01-28 20:05:28
Message-ID: 1264709128.063554.21237.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1081585 by foerster:

Support libpng14.
Using
http://downloads.sourceforge.net/project/libpng/01-libpng-master/1.4.0/ANNOUNCE-1.4.0.txt?use_mirror=mesh
 as reference.

 M  +5 -4      dimg/loaders/pngloader.cpp  
 M  +3 -3      threadimageio/thumbnailbasic.cpp  


--- branches/extragear/graphics/digikam/1.0-databaseext/libs/dimg/loaders/pngloader.cpp \
#1081584:1081585 @@ -29,6 +29,7 @@
 #define PNG_BYTES_TO_CHECK 4
 
 #include "pngloader.h"
+#include "pngconf.h"
 
 // C ANSI includes
 
@@ -105,7 +106,7 @@
     unsigned char buf[PNG_BYTES_TO_CHECK];
 
     size_t membersRead = fread(buf, 1, PNG_BYTES_TO_CHECK, f);
-    if ((membersRead != PNG_BYTES_TO_CHECK) || !png_check_sig(buf, \
PNG_BYTES_TO_CHECK)) +    if ((membersRead != PNG_BYTES_TO_CHECK) || \
!png_sig_cmp(buf, 0, PNG_BYTES_TO_CHECK))  {
         kDebug() << "Not a PNG image file.";
         fclose(f);
@@ -165,7 +166,7 @@
     CleanupData *cleanupData = new CleanupData;
     cleanupData->setFile(f);
 
-    if (setjmp(png_ptr->jmpbuf))
+    if (setjmp(png_jmpbuf(png_ptr)))
     {
         kDebug() << "Internal libPNG error during reading file. Process aborted!";
         png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
@@ -322,7 +323,7 @@
 #ifdef ENABLE_DEBUG_MESSAGES
                     kDebug() << "PNG in PNG_COLOR_TYPE_GRAY";
 #endif
-                    png_set_gray_1_2_4_to_8(png_ptr);
+                    png_set_expand_gray_1_2_4_to_8(png_ptr);
                     png_set_gray_to_rgb(png_ptr);
 
                     if (QSysInfo::ByteOrder == QSysInfo::LittleEndian)           // \
Intel @@ -627,7 +628,7 @@
     CleanupData *cleanupData = new CleanupData;
     cleanupData->setFile(f);
 
-    if (setjmp(png_ptr->jmpbuf))
+    if (setjmp(png_jmpbuf(png_ptr)))
     {
         kDebug() << "Internal libPNG error during writing file. Process aborted!";
         png_destroy_write_struct(&png_ptr, (png_infopp) & info_ptr);
--- branches/extragear/graphics/digikam/1.0-databaseext/libs/threadimageio/thumbnailbasic.cpp \
#1081584:1081585 @@ -137,7 +137,7 @@
     unsigned char buf[PNG_BYTES_TO_CHECK];
 
     size_t itemsRead = fread(buf, 1, PNG_BYTES_TO_CHECK, f);
-    if (itemsRead != 1 || !png_check_sig(buf, PNG_BYTES_TO_CHECK))
+    if (itemsRead != 1 || !png_sig_cmp(buf, 0, PNG_BYTES_TO_CHECK))
     {
         fclose(f);
         return qimage;
@@ -159,7 +159,7 @@
         return qimage;
     }
 
-    if (setjmp(png_ptr->jmpbuf))
+    if (setjmp(png_jmpbuf(png_ptr)))
     {
         png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
         fclose(f);
@@ -232,7 +232,7 @@
     {
         png_set_gray_to_rgb(png_ptr);
         if (png_get_bit_depth(png_ptr, info_ptr) < 8)
-            png_set_gray_1_2_4_to_8(png_ptr);
+            png_set_expand_gray_1_2_4_to_8(png_ptr);
     }
 
     int sizeOfUint = sizeof(unsigned int);


[prev in list] [next in list] [prev in thread] [next in thread]