diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-04-18 21:14:12 -0500 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2012-06-28 02:54:19 +0200 |
| commit | 6dd8615cc4ffa35c6fa5627a11b7fce95f4f31f9 (patch) | |
| tree | a5f2aa2bb221ab6e791ea4bc368b18f4322c0753 | |
| parent | 3fffac24137016b068da3f1bd4410a1bd96747a8 (diff) | |
| download | digikam-6dd8615cc4ffa35c6fa5627a11b7fce95f4f31f9.tar.gz digikam-6dd8615cc4ffa35c6fa5627a11b7fce95f4f31f9.zip | |
Fix usage of obsolete libpng jmpbuf member
(cherry picked from commit 7d0d82b7d93af5822d4c84c4ebd4ad82b9e463d0)
| -rw-r--r-- | digikam/kioslave/digikamthumbnail.cpp | 2 | ||||
| -rw-r--r-- | digikam/libs/dimg/loaders/pngloader.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/digikam/kioslave/digikamthumbnail.cpp b/digikam/kioslave/digikamthumbnail.cpp index 96cba8e0..6dba518f 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 33675617..fd5d771a 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); |