diff options
author | François Andriot <albator78@libertysurf.fr> | 2015-01-24 19:14:56 +0100 |
---|---|---|
committer | François Andriot <albator78@libertysurf.fr> | 2015-01-24 19:14:56 +0100 |
commit | c8c952a5271361bd5322edf70f15b2b3756ece5e (patch) | |
tree | f00d009b5907f6b8083c3e9b430314f68498194d /redhat/applications/digikam/digikam-3.5.13-fix_obsolete_libpng_jmpbuf.patch | |
parent | 67bac3ac20fb06b85cfea0d0f85745a80af41338 (diff) | |
download | tde-packaging-c8c952a5271361bd5322edf70f15b2b3756ece5e.tar.gz tde-packaging-c8c952a5271361bd5322edf70f15b2b3756ece5e.zip |
RPM packaging: update digikam
Diffstat (limited to 'redhat/applications/digikam/digikam-3.5.13-fix_obsolete_libpng_jmpbuf.patch')
-rw-r--r-- | redhat/applications/digikam/digikam-3.5.13-fix_obsolete_libpng_jmpbuf.patch | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/redhat/applications/digikam/digikam-3.5.13-fix_obsolete_libpng_jmpbuf.patch b/redhat/applications/digikam/digikam-3.5.13-fix_obsolete_libpng_jmpbuf.patch deleted file mode 100644 index fa9f2a6d6..000000000 --- a/redhat/applications/digikam/digikam-3.5.13-fix_obsolete_libpng_jmpbuf.patch +++ /dev/null @@ -1,41 +0,0 @@ -commit 7d0d82b7d93af5822d4c84c4ebd4ad82b9e463d0 -Author: Timothy Pearson <kb9vqf@pearsoncomputing.net> -Date: 1334801652 -0500 - - Fix usage of obsolete libpng jmpbuf member - -diff --git a/digikam/kioslave/digikamthumbnail.cpp b/digikam/kioslave/digikamthumbnail.cpp -index 96cba8e..6dba518 100644 ---- a/digikam/kioslave/digikamthumbnail.cpp -+++ b/digikam/kioslave/digikamthumbnail.cpp -@@ -392,7 +392,7 @@ TQImage kio_digikamthumbnailProtocol::loadPNG(const TQString& path) - return qimage; - } - -- if (setjmp(png_ptr->jmpbuf)) -+ if (setjmp(png_jmpbuf(png_ptr))) - { - png_destroy_read_struct(&png_ptr, &info_ptr, NULL); - fclose(f); -diff --git a/digikam/libs/dimg/loaders/pngloader.cpp b/digikam/libs/dimg/loaders/pngloader.cpp -index 3367561..fd5d771 100644 ---- a/digikam/libs/dimg/loaders/pngloader.cpp -+++ b/digikam/libs/dimg/loaders/pngloader.cpp -@@ -120,7 +120,7 @@ bool PNGLoader::load(const TQString& filePath, DImgLoaderObserver *observer) - // PNG error handling. If an error occurs during reading, libpng - // will jump here - -- if (setjmp(png_ptr->jmpbuf)) -+ if (setjmp(png_jmpbuf(png_ptr))) - { - DDebug() << k_funcinfo << "Internal libPNG error during reading file. Process aborted!" << endl; - png_destroy_read_struct(&png_ptr, &info_ptr, NULL); -@@ -526,7 +526,7 @@ bool PNGLoader::save(const TQString& filePath, DImgLoaderObserver *observer) - // PNG error handling. If an error occurs during writing, libpng - // will jump here - -- if (setjmp(png_ptr->jmpbuf)) -+ if (setjmp(png_jmpbuf(png_ptr))) - { - DDebug() << k_funcinfo << "Internal libPNG error during writing file. Process aborted!" << endl; - fclose(f); |