[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    extragear/graphics/kphotoalbum
From:       Jan Kundrát <jkt () gentoo ! org>
Date:       2011-01-04 7:50:54
Message-ID: 20110104075054.12F46AC8AE () svn ! kde ! org
[Download RAW message or body]

SVN commit 1211466 by jkt:

The exporter can't resize RAW files when exporting, and shouldn't try.

Applied patch by Robert Krawitz <rlk@alum.mit.edu> with whitespace fixes for
readability and some changes to make it apply to trunk.

 M  +9 -2      ImageManager/RawImageDecoder.cpp  
 M  +3 -2      ImageManager/RawImageDecoder.h  
 M  +2 -2      ImportExport/Export.cpp  
 M  +7 -0      Utilities/Util.cpp  
 M  +1 -0      Utilities/Util.h  


--- trunk/extragear/graphics/kphotoalbum/ImageManager/RawImageDecoder.cpp \
#1211465:1211466 @@ -91,7 +91,7 @@
 #endif /* HAVE_KDCRAW */
 }
 
-void RAWImageDecoder::_initializeExtensionLists( QStringList& rawExtensions, \
QStringList& standardExtensions, QStringList& ignoredExtensions ) const +void \
RAWImageDecoder::_initializeExtensionLists( QStringList& rawExtensions, QStringList& \
standardExtensions, QStringList& ignoredExtensions )  {
     static QStringList _rawExtensions, _standardExtensions, _ignoredExtensions;
     static bool extensionListsInitialized = false;
@@ -178,7 +178,7 @@
 }
 
 bool RAWImageDecoder::_fileEndsWithExtensions( const QString& fileName,
-					      const QStringList& extensionList) const
+					      const QStringList& extensionList)
 {
 	for ( QStringList::ConstIterator it = extensionList.begin();
 	      it != extensionList.end(); ++it ) {
@@ -198,6 +198,13 @@
 	return false;
 }
 
+bool RAWImageDecoder::isRAW( const QString& imageFile )
+{
+    QStringList _rawExtensions, _standardExtensions, _ignoredExtensions;
+    _initializeExtensionLists( _rawExtensions, _standardExtensions, \
_ignoredExtensions ); +    return _fileEndsWithExtensions(imageFile, _rawExtensions);
+}
+
 bool RAWImageDecoder::_skipThisFile( const QSet<QString>& loadedFiles, const \
QString& imageFile ) const  {
     QStringList _rawExtensions, _standardExtensions, _ignoredExtensions;
--- trunk/extragear/graphics/kphotoalbum/ImageManager/RawImageDecoder.h \
#1211465:1211466 @@ -30,12 +30,13 @@
 	virtual bool _decode(QImage *img, const QString& imageFile, QSize* fullSize, int \
dim=-1);  virtual bool _mightDecode( const QString& imageFile );
 	virtual bool _skipThisFile( const QSet<QString>& loadedFiles, const QString& \
imageFile ) const; +	static bool isRAW( const QString& imageFile );
 
 private:
 	bool _fileExistsWithExtensions( const QString& fileName, const QStringList& \
                extensionList ) const;
-	bool _fileEndsWithExtensions( const QString& fileName, const QStringList& \
extensionList ) const; +	static bool _fileEndsWithExtensions( const QString& \
fileName, const QStringList& extensionList );  bool _fileIsKnownWithExtensions( const \
QSet<QString>& files, const QString& fileName, const QStringList& extensionList ) \
                const;
-	void _initializeExtensionLists( QStringList& rawExtensions, QStringList& \
standardExtensions, QStringList& ignoredExtensions ) const; +	static void \
_initializeExtensionLists( QStringList& rawExtensions, QStringList& \
standardExtensions, QStringList& ignoredExtensions );  };
 
 }
--- trunk/extragear/graphics/kphotoalbum/ImportExport/Export.cpp #1211465:1211466
@@ -265,7 +265,7 @@
         QString file = info->fileName(DB::AbsolutePath);
         QString zippedName = _filenameMapper.uniqNameFor(file);
 
-        if ( _maxSize == -1 || Utilities::isVideo( file ) ) {
+        if ( _maxSize == -1 || Utilities::isVideo( file ) || Utilities::isRAW( file \
)) {  if ( QFileInfo( file ).isSymLink() )
                 file = QFileInfo(file).readLink();
 
@@ -308,7 +308,7 @@
     if ( !loadedOK )
         return;
 
-    const QString ext = Utilities::isVideo( fileName ) ? QString::fromLatin1( "jpg" \
) : QFileInfo( _filenameMapper.uniqNameFor(fileName) ).completeSuffix(); +    const \
QString ext = (Utilities::isVideo( fileName ) || Utilities::isRAW( fileName )) ? \
QString::fromLatin1( "jpg" ) : QFileInfo( _filenameMapper.uniqNameFor(fileName) \
).completeSuffix();  
     // Add the file to the zip archive
     QString zipFileName = QString::fromLatin1( "%1/%2.%3" ).arg( \
                Utilities::stripSlash(_subdir))
--- trunk/extragear/graphics/kphotoalbum/Utilities/Util.cpp #1211465:1211466
@@ -36,6 +36,7 @@
 #include <kcmdlineargs.h>
 #include <kio/netaccess.h>
 #include "MainWindow/Window.h"
+#include "ImageManager/RawImageDecoder.h"
 
 #ifdef Q_WS_X11
 #include "X11/X.h"
@@ -668,6 +669,12 @@
     return videoExtensions.contains( ext );
 }
 
+bool Utilities::isRAW( const QString& fileName )
+{
+    return ImageManager::RAWImageDecoder::isRAW( fileName );
+}
+
+
 QImage Utilities::scaleImage(const QImage &image, int w, int h, Qt::AspectRatioMode \
mode )  {
     return image.scaled( w, h, mode, \
Settings::SettingsData::instance()->smoothScale() ? Qt::SmoothTransformation : \
                Qt::FastTransformation );
--- trunk/extragear/graphics/kphotoalbum/Utilities/Util.h #1211465:1211466
@@ -47,6 +47,7 @@
 QString setupDemo();
 bool canReadImage( const QString& fileName );
 bool isVideo( const QString& fileName );
+bool isRAW( const QString& fileName );
 QString locateDataFile(const QString& fileName);
 QString readFile( const QString& fileName );
 bool loadJPEG(QImage *img, const QString& imageFile, QSize* fullSize, int dim=-1);


[prev in list] [next in list] [prev in thread] [next in thread]