rev 4966 - in kde-extras/digikam/trunk/debian: . patches
Achim Bohnet
ach-guest at alioth.debian.org
Wed Nov 22 00:23:47 UTC 2006
Author: ach-guest
Date: 2006-11-22 01:23:47 +0100 (Wed, 22 Nov 2006)
New Revision: 4966
Added:
kde-extras/digikam/trunk/debian/patches/10_kdesvn_606804_dcraw-return-code.diff
kde-extras/digikam/trunk/debian/patches/11_kdesvn_606805_file-extention-parsing.diff
Modified:
kde-extras/digikam/trunk/debian/changelog
Log:
digikam: Pick fixes from upstream svn:
+ 10_kdesvn_606804_dcraw-return-code.diff : fix file-extention parsing
when it's a null string KDEBUG: 137495
+ 11_kdesvn_606805_file-extention-parsing.diff: dcraw fail to decode a
RAW file. KDEBUG: 137495
Modified: kde-extras/digikam/trunk/debian/changelog
===================================================================
--- kde-extras/digikam/trunk/debian/changelog 2006-11-21 19:41:27 UTC (rev 4965)
+++ kde-extras/digikam/trunk/debian/changelog 2006-11-22 00:23:47 UTC (rev 4966)
@@ -11,6 +11,11 @@
* removed patches/va_list.patch. No longer necesssary
* removed patches/11_only_-lqt-mt.diff: autoconf 2.60 uses a totally
different method to substitute vars.
+ * Pick fixes from svn:
+ + 10_kdesvn_606804_dcraw-return-code.diff : fix file-extention parsing
+ when it's a null string KDEBUG: 137495
+ + 11_kdesvn_606805_file-extention-parsing.diff: dcraw fail to decode a
+ RAW file. KDEBUG: 137495
-- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org> Tue, 21 Nov 2006 17:44:48 +0100
Added: kde-extras/digikam/trunk/debian/patches/10_kdesvn_606804_dcraw-return-code.diff
===================================================================
--- kde-extras/digikam/trunk/debian/patches/10_kdesvn_606804_dcraw-return-code.diff 2006-11-21 19:41:27 UTC (rev 4965)
+++ kde-extras/digikam/trunk/debian/patches/10_kdesvn_606804_dcraw-return-code.diff 2006-11-22 00:23:47 UTC (rev 4966)
@@ -0,0 +1,53 @@
+Index: digikam/libs/dimg/loaders/rawloader.cpp
+===================================================================
+--- digikam/libs/dimg/loaders/rawloader.cpp (Revision 606803)
++++ digikam/libs/dimg/loaders/rawloader.cpp (Revision 606804)
+@@ -53,6 +53,7 @@
+ #include "dimgloaderobserver.h"
+ #include "dcrawbinary.h"
+ #include "rawloader.h"
++#include "rawloader.moc"
+
+ namespace Digikam
+ {
+@@ -89,9 +90,9 @@
+
+ bool RAWLoader::loadFromDcraw(const QString& filePath, DImgLoaderObserver *observer)
+ {
+- m_observer = observer;
+- m_filePath = filePath;
+- m_running = true;
++ m_observer = observer;
++ m_filePath = filePath;
++ m_running = true;
+ m_normalExit = false;
+
+ // trigger startProcess and loop to wait dcraw decoding
+@@ -120,7 +121,6 @@
+ // Remove when porting to Qt4.
+ while (m_running && !m_observer->isShuttingDown())
+ {
+-
+ if (m_dataPos == 0)
+ {
+ int elapsedMsecs = dcrawStartTime.msecsTo(QTime::currentTime());
+@@ -391,10 +391,10 @@
+ // set variables, clean up, wake up loader thread
+
+ QMutexLocker lock(&m_mutex);
+- m_running = false;
+- m_normalExit = m_process->normalExit();
++ m_running = false;
++ m_normalExit = m_process->normalExit() && m_process->exitStatus() == 0;
+ delete m_process;
+- m_process = 0;
++ m_process = 0;
+ delete m_queryTimer;
+ m_queryTimer = 0;
+ m_condVar.wakeAll();
+@@ -484,5 +484,4 @@
+
+ } // NameSpace Digikam
+
+-#include "rawloader.moc"
+
Added: kde-extras/digikam/trunk/debian/patches/11_kdesvn_606805_file-extention-parsing.diff
===================================================================
--- kde-extras/digikam/trunk/debian/patches/11_kdesvn_606805_file-extention-parsing.diff 2006-11-21 19:41:27 UTC (rev 4965)
+++ kde-extras/digikam/trunk/debian/patches/11_kdesvn_606805_file-extention-parsing.diff 2006-11-22 00:23:47 UTC (rev 4966)
@@ -0,0 +1,133 @@
+Index: digikam/libs/imageproperties/imagepropertiestab.cpp
+===================================================================
+--- digikam/libs/imageproperties/imagepropertiestab.cpp (Revision 606804)
++++ digikam/libs/imageproperties/imagepropertiestab.cpp (Revision 606805)
+@@ -383,13 +383,14 @@
+ QSize dims;
+ QString compression, bitDepth, colorMode;
+ QString rawFilesExt(raw_file_extentions);
++ QString ext = fileInfo.extension(false).upper();
+
+- if (rawFilesExt.upper().contains( fileInfo.extension(false).upper() ))
++ if (!ext.isEmpty() && rawFilesExt.upper().contains(ext))
+ {
+ d->labelImageMime->setText(i18n("RAW Image"));
+ compression = i18n("None");
+- bitDepth = "48";
+- dims = metaData.getImageDimensions();
++ bitDepth = "48";
++ dims = metaData.getImageDimensions();
+ }
+ else
+ {
+Index: digikam/libs/dcraw/dcrawpreview.cpp
+===================================================================
+--- digikam/libs/dcraw/dcrawpreview.cpp (Revision 606804)
++++ digikam/libs/dcraw/dcrawpreview.cpp (Revision 606805)
+@@ -62,8 +62,9 @@
+
+ QFileInfo fileInfo(path);
+ QString rawFilesExt(raw_file_extentions);
++ QString ext = fileInfo.extension(false).upper();
+
+- if (!fileInfo.exists() || !rawFilesExt.upper().contains( fileInfo.extension(false).upper() ))
++ if (!fileInfo.exists() || ext.isEmpty() || !rawFilesExt.upper().contains(ext))
+ return false;
+
+ // Try to extract embedded thumbnail using dcraw with options:
+Index: digikam/libs/dimg/dimg.cpp
+===================================================================
+--- digikam/libs/dimg/dimg.cpp (Revision 606804)
++++ digikam/libs/dimg/dimg.cpp (Revision 606805)
+@@ -433,16 +433,19 @@
+
+ QString rawFilesExt(raw_file_extentions);
+ QString ext = fileInfo.extension(false).upper();
++
++ if (!ext.isEmpty())
++ {
++ if (ext == QString("JPEG") || ext == QString("JPG") || ext == QString("JPE"))
++ return JPEG;
++ else if (ext == QString("PNG"))
++ return PNG;
++ else if (ext == QString("TIFF") || ext == QString("TIF"))
++ return TIFF;
++ else if (rawFilesExt.upper().contains(ext))
++ return RAW;
++ }
+
+- if (ext == QString("JPEG") || ext == QString("JPG") || ext == QString("JPE"))
+- return JPEG;
+- else if (ext == QString("PNG"))
+- return PNG;
+- else if (ext == QString("TIFF") || ext == QString("TIF"))
+- return TIFF;
+- else if (rawFilesExt.upper().contains(ext))
+- return RAW;
+-
+ // In second, we trying to parse file header.
+
+ FILE* f = fopen(QFile::encodeName(filePath), "rb");
+Index: digikam/digikam/albumfiletip.cpp
+===================================================================
+--- digikam/digikam/albumfiletip.cpp (Revision 606804)
++++ digikam/digikam/albumfiletip.cpp (Revision 606805)
+@@ -359,8 +359,9 @@
+
+ QSize dims;
+ QString rawFilesExt(raw_file_extentions);
++ QString ext = fileInfo.extension(false).upper();
+
+- if (rawFilesExt.upper().contains( fileInfo.extension(false).upper() ))
++ if (!ext.isEmpty() && rawFilesExt.upper().contains(ext))
+ {
+ str = i18n("RAW Image");
+ dims = metaData.getImageDimensions();
+Index: digikam/kioslave/digikamalbums.cpp
+===================================================================
+--- digikam/kioslave/digikamalbums.cpp (Revision 606804)
++++ digikam/kioslave/digikamalbums.cpp (Revision 606805)
+@@ -184,10 +184,11 @@
+ dims = QSize();
+ if (getDimensions)
+ {
++ QFileInfo fileInfo(base + name);
+ QString rawFilesExt(raw_file_extentions);
++ QString ext = fileInfo.extension(false).upper();
+
+- QFileInfo fileInfo(base + name);
+- if (rawFilesExt.upper().contains( fileInfo.extension(false).upper() ))
++ if (!ext.isEmpty() && rawFilesExt.upper().contains(ext))
+ {
+ Digikam::DMetadata metaData(base + name);
+ dims = metaData.getImageDimensions();
+Index: digikam/kioslave/digikamthumbnail.cpp
+===================================================================
+--- digikam/kioslave/digikamthumbnail.cpp (Revision 606804)
++++ digikam/kioslave/digikamthumbnail.cpp (Revision 606805)
+@@ -259,14 +259,17 @@
+ QString ext = fileInfo.extension(false).upper();
+ QString rawFilesExt(raw_file_extentions);
+
+- if (ext == QString("JPEG") || ext == QString("JPG") || ext == QString("JPE"))
+- return (loadJPEG(image, path));
+- else if (ext == QString("PNG"))
+- return (loadDImg(image, path));
+- else if (ext == QString("TIFF") || ext == QString("TIF"))
+- return (loadDImg(image, path));
+- else if (rawFilesExt.upper().contains(ext))
+- return (DcrawPreview::loadDcrawPreview(image, path));
++ if (!ext.isEmpty())
++ {
++ if (ext == QString("JPEG") || ext == QString("JPG") || ext == QString("JPE"))
++ return (loadJPEG(image, path));
++ else if (ext == QString("PNG"))
++ return (loadDImg(image, path));
++ else if (ext == QString("TIFF") || ext == QString("TIF"))
++ return (loadDImg(image, path));
++ else if (rawFilesExt.upper().contains(ext))
++ return (DcrawPreview::loadDcrawPreview(image, path));
++ }
+
+ return false;
+ }
More information about the pkg-kde-commits
mailing list