Francois Andriot
12 years ago
parent
75c1b2f8bf
commit
c0c1a90179
@ -0,0 +1,31 @@
|
|||||||
|
--- bibletime/sword.m4.ftbfs 2011-05-17 20:42:02.000000000 +0200
|
||||||
|
+++ bibletime/sword.m4 2012-08-03 17:40:00.461746639 +0200
|
||||||
|
@@ -119,7 +119,7 @@
|
||||||
|
EOF
|
||||||
|
|
||||||
|
|
||||||
|
-ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
|
||||||
|
+ac_link='$LIBTOOL_SHELL --silent --mode=link --tag=LD ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
|
||||||
|
if AC_TRY_EVAL(ac_link) && test -s conftest; then
|
||||||
|
if test -x conftest; then
|
||||||
|
eval ac_cv_installed_sword_version=`./conftest 2>&5`
|
||||||
|
@@ -192,7 +192,7 @@
|
||||||
|
}
|
||||||
|
EOF
|
||||||
|
|
||||||
|
-ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
|
||||||
|
+ac_link='$LIBTOOL_SHELL --silent --mode=link --tag=LD ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
|
||||||
|
if AC_TRY_EVAL(ac_link) && test -s conftest; then
|
||||||
|
if test -x conftest; then
|
||||||
|
eval ac_cv_sword_recent_version=`./conftest $1 2>&5`
|
||||||
|
--- bibletime/clucene.m4.ORI 2012-08-03 17:41:19.989067063 +0200
|
||||||
|
+++ bibletime/clucene.m4 2012-08-03 17:41:35.675734952 +0200
|
||||||
|
@@ -119,7 +119,7 @@
|
||||||
|
EOF
|
||||||
|
|
||||||
|
|
||||||
|
-ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
|
||||||
|
+ac_link='$LIBTOOL_SHELL --silent --mode=link --tag=LD ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
|
||||||
|
if AC_TRY_EVAL(ac_link) && test -s conftest; then
|
||||||
|
if test -x conftest; then
|
||||||
|
eval ac_cv_installed_clucene_version=`./conftest 2>&5`
|
||||||
@ -0,0 +1,19 @@
|
|||||||
|
commit 029218cd9cd3192a2a61ac29d896a2c3640f2dd8
|
||||||
|
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
|
||||||
|
Date: 1336066180 -0500
|
||||||
|
|
||||||
|
Fix 'format not a string literal' error
|
||||||
|
|
||||||
|
diff --git a/digikam/libs/sqlite2/shell.c b/digikam/libs/sqlite2/shell.c
|
||||||
|
index 1100f38..89898ab 100644
|
||||||
|
--- a/digikam/libs/sqlite2/shell.c
|
||||||
|
+++ b/digikam/libs/sqlite2/shell.c
|
||||||
|
@@ -692,7 +692,7 @@ static int do_meta_command(char *zLine, struct callback_data *p){
|
||||||
|
}else
|
||||||
|
|
||||||
|
if( c=='h' && strncmp(azArg[0], "help", n)==0 ){
|
||||||
|
- fprintf(stderr,zHelp);
|
||||||
|
+ fprintf(stderr, "%s", zHelp);
|
||||||
|
}else
|
||||||
|
|
||||||
|
if( c=='i' && strncmp(azArg[0], "indices", n)==0 && nArg>1 ){
|
||||||
@ -0,0 +1,30 @@
|
|||||||
|
commit 18ecd51264727c75ab3e17a762d8f95361023f0a
|
||||||
|
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
|
||||||
|
Date: 1340749881 -0500
|
||||||
|
|
||||||
|
Fix FTBFS on png >= 0.15
|
||||||
|
|
||||||
|
diff --git a/digikam/kioslave/digikamthumbnail.cpp b/digikam/kioslave/digikamthumbnail.cpp
|
||||||
|
index 6dba518..97acf12 100644
|
||||||
|
--- a/digikam/kioslave/digikamthumbnail.cpp
|
||||||
|
+++ b/digikam/kioslave/digikamthumbnail.cpp
|
||||||
|
@@ -413,16 +413,16 @@ TQImage kio_digikamthumbnailProtocol::loadPNG(const TQString& path)
|
||||||
|
if (color_type == PNG_COLOR_TYPE_PALETTE)
|
||||||
|
png_set_expand(png_ptr);
|
||||||
|
|
||||||
|
- if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
|
||||||
|
+ if (color_type == PNG_COLOR_TYPE_RGB_ALPHA)
|
||||||
|
has_alpha = 1;
|
||||||
|
|
||||||
|
- if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
|
||||||
|
+ if (color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
|
||||||
|
{
|
||||||
|
has_alpha = 1;
|
||||||
|
has_grey = 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
- if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY)
|
||||||
|
+ if (color_type == PNG_COLOR_TYPE_GRAY)
|
||||||
|
has_grey = 1;
|
||||||
|
|
||||||
|
unsigned char **lines;
|
||||||
@ -1,49 +1,59 @@
|
|||||||
diff -ruN digikam-0.9.6.old/digikam/kioslave/digikamthumbnail.cpp digikam-0.9.6/digikam/kioslave/digikamthumbnail.cpp
|
commit 3e27b07ff572b00aa5f013f039c3f63593016816
|
||||||
--- digikam-0.9.6.old/digikam/kioslave/digikamthumbnail.cpp 2009-07-03 07:19:41.000000000 +0200
|
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
|
||||||
+++ digikam-0.9.6/digikam/kioslave/digikamthumbnail.cpp 2010-06-30 10:29:09.000000000 +0200
|
Date: 1326324999 -0600
|
||||||
@@ -370,7 +370,7 @@
|
|
||||||
unsigned char buf[PNG_BYTES_TO_CHECK];
|
Fix FTBFS due to png code
|
||||||
|
This closes Bug 595
|
||||||
|
|
||||||
|
diff --git a/digikam/kioslave/digikamthumbnail.cpp b/digikam/kioslave/digikamthumbnail.cpp
|
||||||
|
index 33ba573..96cba8e 100644
|
||||||
|
--- a/digikam/kioslave/digikamthumbnail.cpp
|
||||||
|
+++ b/digikam/kioslave/digikamthumbnail.cpp
|
||||||
|
@@ -370,7 +370,7 @@ TQImage kio_digikamthumbnailProtocol::loadPNG(const TQString& path)
|
||||||
|
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_check_sig(buf, PNG_BYTES_TO_CHECK))
|
||||||
+ if (png_sig_cmp(buf, 0, 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 @@
|
@@ -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_gray_1_2_4_to_8(png_ptr);
|
||||||
+ png_set_expand_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);
|
||||||
diff -ruN digikam-0.9.6.old/digikam/libs/dimg/loaders/pngloader.cpp digikam-0.9.6/digikam/libs/dimg/loaders/pngloader.cpp
|
diff --git a/digikam/libs/dimg/loaders/pngloader.cpp b/digikam/libs/dimg/loaders/pngloader.cpp
|
||||||
--- digikam-0.9.6.old/digikam/libs/dimg/loaders/pngloader.cpp 2009-07-03 07:19:41.000000000 +0200
|
index ac1fcf8..3367561 100644
|
||||||
+++ digikam-0.9.6/digikam/libs/dimg/loaders/pngloader.cpp 2010-06-30 10:28:24.000000000 +0200
|
--- a/digikam/libs/dimg/loaders/pngloader.cpp
|
||||||
@@ -88,7 +88,7 @@
|
+++ b/digikam/libs/dimg/loaders/pngloader.cpp
|
||||||
|
@@ -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_check_sig(buf, PNG_BYTES_TO_CHECK))
|
||||||
+ if (png_sig_cmp(buf, 0, 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 @@
|
@@ -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_gray_1_2_4_to_8(png_ptr);
|
||||||
+ png_set_expand_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
|
||||||
diff -ruN digikam-0.9.6.old/digikam/libs/greycstoration/CImg.h digikam-0.9.6/digikam/libs/greycstoration/CImg.h
|
diff --git a/digikam/libs/greycstoration/CImg.h b/digikam/libs/greycstoration/CImg.h
|
||||||
--- digikam-0.9.6.old/digikam/libs/greycstoration/CImg.h 2009-07-03 07:19:41.000000000 +0200
|
index e240f99..714920e 100644
|
||||||
+++ digikam-0.9.6/digikam/libs/greycstoration/CImg.h 2010-06-30 10:28:52.000000000 +0200
|
--- a/digikam/libs/greycstoration/CImg.h
|
||||||
@@ -29449,7 +29449,7 @@
|
+++ b/digikam/libs/greycstoration/CImg.h
|
||||||
|
@@ -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){
|
||||||
@ -1,24 +0,0 @@
|
|||||||
--- digikam/digikam/libs/dimg/loaders/pngloader.cpp.libpng 2012-05-01 15:02:57.235666444 +0200
|
|
||||||
+++ digikam/digikam/libs/dimg/loaders/pngloader.cpp 2012-05-01 15:04:30.737122439 +0200
|
|
||||||
@@ -408,10 +408,11 @@
|
|
||||||
TQMap<int, TQByteArray>& metaData = imageMetaData();
|
|
||||||
|
|
||||||
png_charp profile_name, profile_data=NULL;
|
|
||||||
+ unsigned char* uprofile_data = reinterpret_cast<unsigned char*>(profile_data);
|
|
||||||
png_uint_32 profile_size;
|
|
||||||
int compression_type;
|
|
||||||
|
|
||||||
- png_get_iCCP(png_ptr, info_ptr, &profile_name, &compression_type, &profile_data, &profile_size);
|
|
||||||
+ png_get_iCCP(png_ptr, info_ptr, &profile_name, &compression_type, &uprofile_data, &profile_size);
|
|
||||||
|
|
||||||
if (profile_data != NULL)
|
|
||||||
{
|
|
||||||
@@ -607,7 +608,7 @@
|
|
||||||
|
|
||||||
if (!profile_rawdata.isEmpty())
|
|
||||||
{
|
|
||||||
- png_set_iCCP(png_ptr, info_ptr, (png_charp)"icc", PNG_COMPRESSION_TYPE_BASE, profile_rawdata.data(), profile_rawdata.size());
|
|
||||||
+ png_set_iCCP(png_ptr, info_ptr, (png_charp)"icc", PNG_COMPRESSION_TYPE_BASE, (unsigned char*)profile_rawdata.data(), profile_rawdata.size());
|
|
||||||
}
|
|
||||||
|
|
||||||
// -------------------------------------------------------------------
|
|
||||||
@ -1,40 +0,0 @@
|
|||||||
--- digikam/digikam/libs/dimg/loaders/pngloader.cpp.ORI 2012-05-01 14:49:41.357985513 +0200
|
|
||||||
+++ digikam/digikam/libs/dimg/loaders/pngloader.cpp 2012-05-01 14:53:47.459349483 +0200
|
|
||||||
@@ -120,7 +120,11 @@
|
|
||||||
// PNG error handling. If an error occurs during reading, libpng
|
|
||||||
// will jump here
|
|
||||||
|
|
||||||
+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
|
|
||||||
+ 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);
|
|
||||||
@@ -526,7 +531,11 @@
|
|
||||||
// PNG error handling. If an error occurs during writing, libpng
|
|
||||||
// will jump here
|
|
||||||
|
|
||||||
+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
|
|
||||||
+ 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);
|
|
||||||
--- digikam/digikam/kioslave/digikamthumbnail.cpp.ORI 2012-05-01 15:44:40.237089691 +0200
|
|
||||||
+++ digikam/digikam/kioslave/digikamthumbnail.cpp 2012-05-01 15:45:22.939534916 +0200
|
|
||||||
@@ -392,7 +392,11 @@
|
|
||||||
return qimage;
|
|
||||||
}
|
|
||||||
|
|
||||||
+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
|
|
||||||
+ if (setjmp(png_jmpbuf(png_ptr)))
|
|
||||||
+#else
|
|
||||||
if (setjmp(png_ptr->jmpbuf))
|
|
||||||
+#endif
|
|
||||||
{
|
|
||||||
png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
|
|
||||||
fclose(f);
|
|
||||||
@ -0,0 +1,41 @@
|
|||||||
|
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);
|
||||||
@ -0,0 +1,20 @@
|
|||||||
|
commit 5a0438539cbe7a99e9b6d0ed21d7b73342b4a6f6
|
||||||
|
Author: Darrell Anderson <humanreadable@yahoo.com>
|
||||||
|
Date: 1336340005 -0500
|
||||||
|
|
||||||
|
Update patch in GIT hash a9489034 to use reinterpret_cast<iCCP_data>.
|
||||||
|
Thanks to /dev/ammo42.
|
||||||
|
|
||||||
|
diff --git a/digikam/libs/dimg/loaders/pngloader.cpp b/digikam/libs/dimg/loaders/pngloader.cpp
|
||||||
|
index fa6dad9..6862b6e 100644
|
||||||
|
--- a/digikam/libs/dimg/loaders/pngloader.cpp
|
||||||
|
+++ b/digikam/libs/dimg/loaders/pngloader.cpp
|
||||||
|
@@ -611,7 +611,7 @@ bool PNGLoader::save(const TQString& filePath, DImgLoaderObserver *observer)
|
||||||
|
if (!profile_rawdata.isEmpty())
|
||||||
|
{
|
||||||
|
#if PNG_LIBPNG_VER_MAJOR > 1 || ( PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR >= 5 )
|
||||||
|
- png_set_iCCP(png_ptr, info_ptr, (png_charp)("icc"), PNG_COMPRESSION_TYPE_BASE, (iCCP_data)profile_rawdata.data(), profile_rawdata.size());
|
||||||
|
+ png_set_iCCP(png_ptr, info_ptr, (png_charp)("icc"), PNG_COMPRESSION_TYPE_BASE, reinterpret_cast<iCCP_data>(profile_rawdata.data()), profile_rawdata.size());
|
||||||
|
#else
|
||||||
|
png_set_iCCP(png_ptr, info_ptr, (png_charp)"icc", PNG_COMPRESSION_TYPE_BASE, profile_rawdata.data(), profile_rawdata.size());
|
||||||
|
#endif
|
||||||
@ -0,0 +1,50 @@
|
|||||||
|
commit a94890345ef2caae35a72ed3a398b2984349bb2f
|
||||||
|
Author: Darrell Anderson <humanreadable@yahoo.com>
|
||||||
|
Date: 1335586728 -0500
|
||||||
|
|
||||||
|
GCC 4.7 fix.
|
||||||
|
This partially resolves bug report 958.
|
||||||
|
Thanks to David C. Rankin.
|
||||||
|
|
||||||
|
diff --git a/digikam/libs/dimg/loaders/pngloader.cpp b/digikam/libs/dimg/loaders/pngloader.cpp
|
||||||
|
index fd5d771..fa6dad9 100644
|
||||||
|
--- a/digikam/libs/dimg/loaders/pngloader.cpp
|
||||||
|
+++ b/digikam/libs/dimg/loaders/pngloader.cpp
|
||||||
|
@@ -57,6 +57,12 @@ extern "C"
|
||||||
|
namespace Digikam
|
||||||
|
{
|
||||||
|
|
||||||
|
+#if PNG_LIBPNG_VER_MAJOR > 1 || ( PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR >= 5 )
|
||||||
|
+ typedef png_bytep iCCP_data;
|
||||||
|
+#else
|
||||||
|
+ typedef png_charp iCCP_data;
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
PNGLoader::PNGLoader(DImg* image)
|
||||||
|
: DImgLoader(image)
|
||||||
|
{
|
||||||
|
@@ -403,7 +409,12 @@ bool PNGLoader::load(const TQString& filePath, DImgLoaderObserver *observer)
|
||||||
|
|
||||||
|
TQMap<int, TQByteArray>& metaData = imageMetaData();
|
||||||
|
|
||||||
|
+#if PNG_LIBPNG_VER_MAJOR > 1 || ( PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR >= 5 )
|
||||||
|
+ png_charp profile_name;
|
||||||
|
+ iCCP_data profile_data=NULL;
|
||||||
|
+#else
|
||||||
|
png_charp profile_name, profile_data=NULL;
|
||||||
|
+#endif
|
||||||
|
png_uint_32 profile_size;
|
||||||
|
int compression_type;
|
||||||
|
|
||||||
|
@@ -599,7 +610,11 @@ bool PNGLoader::save(const TQString& filePath, DImgLoaderObserver *observer)
|
||||||
|
|
||||||
|
if (!profile_rawdata.isEmpty())
|
||||||
|
{
|
||||||
|
+#if PNG_LIBPNG_VER_MAJOR > 1 || ( PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR >= 5 )
|
||||||
|
+ png_set_iCCP(png_ptr, info_ptr, (png_charp)("icc"), PNG_COMPRESSION_TYPE_BASE, (iCCP_data)profile_rawdata.data(), profile_rawdata.size());
|
||||||
|
+#else
|
||||||
|
png_set_iCCP(png_ptr, info_ptr, (png_charp)"icc", PNG_COMPRESSION_TYPE_BASE, profile_rawdata.data(), profile_rawdata.size());
|
||||||
|
+#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
// -------------------------------------------------------------------
|
||||||
@ -0,0 +1,33 @@
|
|||||||
|
commit a209c81b78b8af98c53748bc1eb9020ef6b2605e
|
||||||
|
Author: Darrell Anderson <humanreadable@yahoo.com>
|
||||||
|
Date: 1335586778 -0500
|
||||||
|
|
||||||
|
GCC 4.7 fix.
|
||||||
|
This partially resolves bug report 958.
|
||||||
|
Thanks to David C. Rankin.
|
||||||
|
|
||||||
|
diff --git a/digikam/digikam/albummanager.cpp b/digikam/digikam/albummanager.cpp
|
||||||
|
index d6b9f74..07f43bb 100644
|
||||||
|
--- a/digikam/digikam/albummanager.cpp
|
||||||
|
+++ b/digikam/digikam/albummanager.cpp
|
||||||
|
@@ -1579,16 +1579,16 @@ void AlbumManager::slotDatesJobData(KIO::Job*, const TQByteArray& data)
|
||||||
|
|
||||||
|
// Check if Year Album already exist.
|
||||||
|
DAlbum *yAlbum = 0;
|
||||||
|
- AlbumIterator it(d->rootDAlbum);
|
||||||
|
- while (it.current())
|
||||||
|
+ AlbumIterator it2(d->rootDAlbum);
|
||||||
|
+ while (it2.current())
|
||||||
|
{
|
||||||
|
- DAlbum* a = (DAlbum*)(*it);
|
||||||
|
+ DAlbum* a = (DAlbum*)(*it2);
|
||||||
|
if (a->date() == TQDate(year, 1, 1) && a->range() == DAlbum::Year)
|
||||||
|
{
|
||||||
|
yAlbum = a;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
- ++it;
|
||||||
|
+ ++it2;
|
||||||
|
}
|
||||||
|
|
||||||
|
// If no, create Year album.
|
||||||
@ -1,47 +0,0 @@
|
|||||||
diff -uNrb digikam.orig/digikam/digikam/albummanager.cpp digikam/digikam/digikam/albummanager.cpp
|
|
||||||
--- digikam.orig/digikam/digikam/albummanager.cpp 2012-02-21 18:52:03.000000000 -0600
|
|
||||||
+++ digikam/digikam/digikam/albummanager.cpp 2012-04-19 16:42:29.951033101 -0500
|
|
||||||
@@ -1579,16 +1579,16 @@
|
|
||||||
|
|
||||||
// Check if Year Album already exist.
|
|
||||||
DAlbum *yAlbum = 0;
|
|
||||||
- AlbumIterator it(d->rootDAlbum);
|
|
||||||
- while (it.current())
|
|
||||||
+ AlbumIterator it2(d->rootDAlbum);
|
|
||||||
+ while (it2.current())
|
|
||||||
{
|
|
||||||
- DAlbum* a = (DAlbum*)(*it);
|
|
||||||
+ DAlbum* a = (DAlbum*)(*it2);
|
|
||||||
if (a->date() == TQDate(year, 1, 1) && a->range() == DAlbum::Year)
|
|
||||||
{
|
|
||||||
yAlbum = a;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
- ++it;
|
|
||||||
+ ++it2;
|
|
||||||
}
|
|
||||||
|
|
||||||
// If no, create Year album.
|
|
||||||
diff -uNrb digikam.orig/digikam/kioslave/digikamthumbnail.cpp digikam/digikam/kioslave/digikamthumbnail.cpp
|
|
||||||
--- digikam.orig/digikam/kioslave/digikamthumbnail.cpp 2012-04-19 07:02:43.000000000 -0500
|
|
||||||
+++ digikam/digikam/kioslave/digikamthumbnail.cpp 2012-04-19 16:44:10.307517462 -0500
|
|
||||||
@@ -413,16 +413,16 @@
|
|
||||||
if (color_type == PNG_COLOR_TYPE_PALETTE)
|
|
||||||
png_set_expand(png_ptr);
|
|
||||||
|
|
||||||
- if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
|
|
||||||
+ if (color_type == PNG_COLOR_TYPE_RGB_ALPHA)
|
|
||||||
has_alpha = 1;
|
|
||||||
|
|
||||||
- if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
|
|
||||||
+ if (color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
|
|
||||||
{
|
|
||||||
has_alpha = 1;
|
|
||||||
has_grey = 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
- if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY)
|
|
||||||
+ if (color_type == PNG_COLOR_TYPE_GRAY)
|
|
||||||
has_grey = 1;
|
|
||||||
|
|
||||||
unsigned char **lines;
|
|
||||||
@ -0,0 +1,11 @@
|
|||||||
|
--- digikam/digikam/digikam/Makefile.am.ORI 2012-08-03 19:41:42.791088483 +0200
|
||||||
|
+++ digikam/digikam/digikam/Makefile.am 2012-08-03 19:41:56.661794764 +0200
|
||||||
|
@@ -111,6 +111,8 @@
|
||||||
|
# if shared libsqlite3 is used LIB_SQLITE3_LOCAL is null.
|
||||||
|
libdigikam_la_LIBADD = $(LIB_SQLITE3) \
|
||||||
|
$(LIB_SQLITE3_LOCAL) \
|
||||||
|
+ $(LIB_QT) \
|
||||||
|
+ $(LIB_KPARTS) \
|
||||||
|
$(LIB_KIO) \
|
||||||
|
$(LIB_KABC) \
|
||||||
|
$(LIB_KHTML) \
|
||||||
@ -0,0 +1,43 @@
|
|||||||
|
commit 0f64ac7c10fb4053f578ef950e55510818d6d440
|
||||||
|
Author: Darrell Anderson <humanreadable@yahoo.com>
|
||||||
|
Date: 1334285499 -0500
|
||||||
|
|
||||||
|
Remove version.h. Cruft from an older version prior to 0.9.6.
|
||||||
|
Part of an extensive cleanup of various problems with kipi-plugins, digikam,
|
||||||
|
and gwenview to resolve bug reports 241, 962, 963.
|
||||||
|
|
||||||
|
diff --git a/digikam/digikam/version.h b/digikam/digikam/version.h
|
||||||
|
deleted file mode 100644
|
||||||
|
index d9baae1..0000000
|
||||||
|
--- a/digikam/digikam/version.h
|
||||||
|
+++ /dev/null
|
||||||
|
@@ -1,29 +0,0 @@
|
||||||
|
-/* ============================================================
|
||||||
|
- *
|
||||||
|
- * This file is a part of digiKam project
|
||||||
|
- * http://www.digikam.org
|
||||||
|
- *
|
||||||
|
- * Date : 2004-09-09
|
||||||
|
- * Description : digiKam release ID header.
|
||||||
|
- *
|
||||||
|
- * Copyright (C) 2004-2008 by Gilles Caulier <caulier dot gilles at gmail dot com>
|
||||||
|
- *
|
||||||
|
- * This program is free software; you can redistribute it
|
||||||
|
- * and/or modify it under the terms of the GNU General
|
||||||
|
- * Public License as published by the Free Software Foundation;
|
||||||
|
- * either version 2, or (at your option)
|
||||||
|
- * any later version.
|
||||||
|
- *
|
||||||
|
- * This program is distributed in the hope that it will be useful,
|
||||||
|
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
- * GNU General Public License for more details.
|
||||||
|
- *
|
||||||
|
- * ============================================================ */
|
||||||
|
-
|
||||||
|
-#ifndef DIGIKAM_VERSION_H
|
||||||
|
-#define DIGIKAM_VERSION_H
|
||||||
|
-
|
||||||
|
-static const char digikam_version[] = "0.9.4";
|
||||||
|
-
|
||||||
|
-#endif // DIGIKAM_VERSION_H
|
||||||
Loading…
Reference in new issue