mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-29 10:18:30 +00:00
Code Issues Releases Activity

- fix build for png-1.4.1

Browse Source
This commit is contained in:
Dirk Meyer 2010-03-29 17:37:39 +00:00
parent 2d640b7c88
commit 02af94568b
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=251744
2 changed files with 71 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
graphics/digikam/files/patch-kioslave__digikamthumbnail.cpp Normal file
View File

@ -0,0 +1,20 @@
--- digikam/kioslave/digikamthumbnail.cpp.orig 2009-07-03 07:19:41.000000000 +0200
+++ digikam/kioslave/digikamthumbnail.cpp 2010-03-29 19:04:20.000000000 +0200
@@ -370,7 +370,7 @@
unsigned char buf[PNG_BYTES_TO_CHECK];
fread(buf, 1, PNG_BYTES_TO_CHECK, f);
- if (!png_check_sig(buf, PNG_BYTES_TO_CHECK))
+ if (png_sig_cmp(buf, 0, PNG_BYTES_TO_CHECK))
{
fclose(f);
return qimage;
@@ -465,7 +465,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);

51
graphics/digikam/files/patch-libs__dimg__loaders__pngloader.cpp Normal file
View File

@ -0,0 +1,51 @@
--- digikam/libs/dimg/loaders/pngloader.cpp.orig 2009-07-03 07:19:41.000000000 +0200
+++ digikam/libs/dimg/loaders/pngloader.cpp 2010-03-29 18:35:49.000000000 +0200
@@ -88,7 +88,11 @@
unsigned char buf[PNG_BYTES_TO_CHECK];
fread(buf, 1, PNG_BYTES_TO_CHECK, f);
+#if PNG_LIBPNG_VER >= 10400
+ if (png_sig_cmp(buf, 0, PNG_BYTES_TO_CHECK))
+#else
if (!png_check_sig(buf, PNG_BYTES_TO_CHECK))
+#endif
{
DDebug() << k_funcinfo << "Not a PNG image file." << endl;
fclose(f);
@@ -120,7 +124,11 @@
// PNG error handling. If an error occurs during reading, libpng
// will jump here
+#if PNG_LIBPNG_VER >= 10400
+ if (setjmp(png_jmpbuf(png_ptr)))
+#else
if (setjmp(png_ptr->jmpbuf))
+#endif
{
DDebug() << k_funcinfo << "Internal libPNG error during reading file. Process aborted!" << endl;
png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
@@ -252,7 +260,11 @@
#ifdef ENABLE_DEBUG_MESSAGES
DDebug() << "PNG in PNG_COLOR_TYPE_GRAY" << endl;
#endif
+#if PNG_LIBPNG_VER >= 10400
+ png_set_expand_gray_1_2_4_to_8(png_ptr);
+#else
png_set_gray_1_2_4_to_8(png_ptr);
+#endif
png_set_gray_to_rgb(png_ptr);
if (QImage::systemByteOrder() == QImage::LittleEndian) // Intel
@@ -526,7 +538,11 @@
// PNG error handling. If an error occurs during writing, libpng
// will jump here
- if (setjmp(png_ptr->jmpbuf))
+#if PNG_LIBPNG_VER >= 10400
+ if (setjmp(png_jmpbuf(png_ptr)))
+#else
+ if (setjmp(png_ptr->jmpbuf))
+#endif
{
DDebug() << k_funcinfo << "Internal libPNG error during writing file. Process aborted!" << endl;
fclose(f);