[Digikam-devel] extragear/graphics/digikam/libs/dmetadata/loaders

[Gilles Caulier]

SVN commit 544159 by cgilles:

digikam from trunk : bye bye MRW parser from digiKam core, Welcome to  MRW parser from Exiv2 (0.10 release) !!!

To resume: Exif/Makernote from RAW file formats are now extracted in digiKam using Exiv2 library (http://www.exiv2.org). Next release planed in a near future, will support (in read only) these RAW file formats:

Adobe DNG, 
Canon CR2,
Canon CRW, 
Nikon NEF, 
Pentax PEF, 
Sony SR2,
Minolta MRW

New RAW file formats will be added in the future, like X3F, ORF, RAF... 

Developpers : all contributions welcome to improve this great library ! 

I can close bug #96459 now.

BUG: 96459
CCMAIL: digikam-devel at kde.org, ahuggel at gmx.net

 M  +1 -1      Makefile.am  
 D             mrwparser.cpp  
 D             mrwparser.h  
 M  +2 -12     rawmetaloader.cpp  


--- trunk/extragear/graphics/digikam/libs/dmetadata/loaders/Makefile.am #544158:544159
@@ -4,7 +4,7 @@
 noinst_LTLIBRARIES = libdmetadataloader.la
 
 libdmetadataloader_la_SOURCES = dmetaloader.cpp jpegmetaloader.cpp pngmetaloader.cpp tiffmetaloader.cpp \
-	                        rawmetaloader.cpp mrwparser.cpp 
+	                        rawmetaloader.cpp 
 
 libdmetadataloader_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIBJPEG) $(LIB_TIFF) $(LIB_PNG)
 
--- trunk/extragear/graphics/digikam/libs/dmetadata/loaders/rawmetaloader.cpp #544158:544159
@@ -24,7 +24,6 @@
 
 // Local includes.
 
-#include "mrwparser.h"
 #include "rawmetaloader.h"
 
 namespace Digikam
@@ -42,28 +41,19 @@
 bool RAWMetaLoader::load(const QString& filePath)
 {
     // In first we trying to use Exiv2 library
+    // Exiv2 0.10 support : DNG, CRW, CR2, NEF, PEF, MRW, SR2
     if (loadWithExiv2(filePath))
         return true;
 
-    // Try to parse MRW RAW file
-    
-    MRWParser mrwparser;
-    if (mrwparser.parseMRW(QFile::encodeName(filePath)))
-    {
-        exifMetadata() = mrwparser.getExif();
-        return true;
-    }
-        
+    // TODO new experimental RAW parser can be added here.
     return false;
 }
 
 bool RAWMetaLoader::save(const QString& filePath)
 {
-    // In first we trying to use Exiv2 library
     if (saveWithExiv2(filePath))
         return true;
         
-    // TODO
     return false;
 }