TDE
/
digikam
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/digikam
0
0
Fork 0
Code Issues Releases Wiki Activity

Fix FTBFS due to png code

Browse Source 
This closes Bug 595
(cherry picked from commit 3e27b07ff5)
v3.5.13-sru
Timothy Pearson 13 years ago committed by Slávek Banko
parent cfbdd5b7e5
commit ff9fe94dc2
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File

4
digikam/kioslave/digikamthumbnail.cpp
Unescape View File

@ -370,7 +370,7 @@ TQImage kio_digikamthumbnailProtocol::loadPNG(const TQString& path)
unsigned char buf[PNG_BYTES_TO_CHECK]; unsigned char buf[PNG_BYTES_TO_CHECK];
fread(buf, 1, PNG_BYTES_TO_CHECK, f); 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); fclose(f);
return qimage; return qimage;
@ -465,7 +465,7 @@ TQImage kio_digikamthumbnailProtocol::loadPNG(const TQString& path)
{ {
png_set_gray_to_rgb(png_ptr); png_set_gray_to_rgb(png_ptr);
if (png_get_bit_depth(png_ptr, info_ptr) < 8) 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); int sizeOfUint = sizeof(unsigned int);

4
digikam/libs/dimg/loaders/pngloader.cpp
Unescape View File

@ -88,7 +88,7 @@ bool PNGLoader::load(const TQString& filePath, DImgLoaderObserver *observer)
unsigned char buf[PNG_BYTES_TO_CHECK]; unsigned char buf[PNG_BYTES_TO_CHECK];
fread(buf, 1, PNG_BYTES_TO_CHECK, f); 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))
{ {
DDebug() << k_funcinfo << "Not a PNG image file." << endl; DDebug() << k_funcinfo << "Not a PNG image file." << endl;
fclose(f); fclose(f);
@ -252,7 +252,7 @@ bool PNGLoader::load(const TQString& filePath, DImgLoaderObserver *observer)
#ifdef ENABLE_DEBUG_MESSAGES #ifdef ENABLE_DEBUG_MESSAGES
DDebug() << "PNG in PNG_COLOR_TYPE_GRAY" << endl; DDebug() << "PNG in PNG_COLOR_TYPE_GRAY" << endl;
#endif #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); png_set_gray_to_rgb(png_ptr);
if (TQImage::systemByteOrder() == TQImage::LittleEndian) // Intel if (TQImage::systemByteOrder() == TQImage::LittleEndian) // Intel

2
digikam/libs/greycstoration/CImg.h
Unescape View File

@ -29449,7 +29449,7 @@ namespace cimg_library {
new_bit_depth = 8; new_bit_depth = 8;
} }
if (new_color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8){ if (new_color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8){
png_set_gray_1_2_4_to_8(png_ptr); png_set_expand_gray_1_2_4_to_8(png_ptr);
new_bit_depth = 8; new_bit_depth = 8;
} }
if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS))

Write Preview
Loading…
Cancel
Save