diff options
| author | Dirk Meyer <dinoex@FreeBSD.org> | 2012-06-01 05:26:28 +0000 |
|---|---|---|
| committer | Dirk Meyer <dinoex@FreeBSD.org> | 2012-06-01 05:26:28 +0000 |
| commit | 2b74a89bc8342f0b9b737c37d87737caf7b0ea1e (patch) | |
| tree | c04604583d8be53b3ed7f10975be828c731f87cb /graphics/digikam/files/patch-kioslave__digikamthumbnail.cpp | |
| parent | 24315159daa0089f08acea4ba1b130fb6721ad5c (diff) | |
| download | ports-2b74a89bc8342f0b9b737c37d87737caf7b0ea1e.tar.gz ports-2b74a89bc8342f0b9b737c37d87737caf7b0ea1e.zip | |
Notes
Diffstat (limited to 'graphics/digikam/files/patch-kioslave__digikamthumbnail.cpp')
| -rw-r--r-- | graphics/digikam/files/patch-kioslave__digikamthumbnail.cpp | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/graphics/digikam/files/patch-kioslave__digikamthumbnail.cpp b/graphics/digikam/files/patch-kioslave__digikamthumbnail.cpp index 6309033f8f68..2f5bb7f5202c 100644 --- a/graphics/digikam/files/patch-kioslave__digikamthumbnail.cpp +++ b/graphics/digikam/files/patch-kioslave__digikamthumbnail.cpp @@ -1,6 +1,14 @@ --- 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 @@ ++++ digikam/kioslave/digikamthumbnail.cpp 2012-05-04 00:15:30.000000000 +0200 +@@ -94,6 +94,7 @@ + #include <sys/shm.h> + #include <sys/time.h> + #include <png.h> ++#include <pngpriv.h> + } + + using namespace KIO; +@@ -370,7 +371,7 @@ unsigned char buf[PNG_BYTES_TO_CHECK]; fread(buf, 1, PNG_BYTES_TO_CHECK, f); @@ -9,7 +17,16 @@ { fclose(f); return qimage; -@@ -465,7 +465,7 @@ +@@ -392,7 +393,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); +@@ -465,7 +466,7 @@ { png_set_gray_to_rgb(png_ptr); if (png_get_bit_depth(png_ptr, info_ptr) < 8) |