[Rawstudio-commit] r4056 - trunk/plugins/load-rawspeed

[Klaus Post]

Author: post
Date: 2011-11-20 13:13:09 +0100 (Sun, 20 Nov 2011)
New Revision: 4056

Modified:
   trunk/plugins/load-rawspeed/Makefile.am
   trunk/plugins/load-rawspeed/rawstudio-plugin-api.cpp
Log:
Update to use generic interface.

Modified: trunk/plugins/load-rawspeed/Makefile.am
===================================================================
--- trunk/plugins/load-rawspeed/Makefile.am     2011-11-20 12:07:34 UTC (rev 
4055)
+++ trunk/plugins/load-rawspeed/Makefile.am     2011-11-20 12:13:09 UTC (rev 
4056)
@@ -56,6 +56,7 @@
        rawspeed/RawImage.cpp rawspeed/RawImage.h \
        rawspeed/RawImageDataU16.cpp rawspeed/RawImage.h \
        rawspeed/RawImageDataFloat.cpp rawspeed/RawImage.h \
+       rawspeed/RawParser.cpp rawspeed/RawParser.h \
        rawspeed/Rw2Decoder.cpp rawspeed/Rw2Decoder.h \
        rawspeed/StdAfx.cpp rawspeed/StdAfx.h \
        rawspeed/SrwDecoder.cpp rawspeed/SrwDecoder.h \

Modified: trunk/plugins/load-rawspeed/rawstudio-plugin-api.cpp
===================================================================
--- trunk/plugins/load-rawspeed/rawstudio-plugin-api.cpp        2011-11-20 
12:07:34 UTC (rev 4055)
+++ trunk/plugins/load-rawspeed/rawstudio-plugin-api.cpp        2011-11-20 
12:13:09 UTC (rev 4056)
@@ -19,7 +19,7 @@
 #include <rawstudio.h>
 #include "StdAfx.h"
 #include "FileReader.h"
-#include "TiffParser.h"
+#include "RawParser.h"
 #include "RawDecoder.h"
 #include "CameraMetaData.h"
 #include "rawstudio-plugin-api.h"
@@ -95,8 +95,7 @@
 
                try
                {
-                       TiffParser t(m);
-                       t.parseData();
+                       RawParser t(m);
                        d = t.getDecoder();
                        gint col, row;
                        gint cpp;
@@ -162,16 +161,12 @@
           }
         }
       }
-               }
+       }
                catch (RawDecoderException e)
                {
                        g_warning("RawSpeed: RawDecoderException: %s", 
e.what());
                }
        }
-       catch (TiffParserException e)
-       {
-               g_warning("RawSpeed: TiffParserException: %s", e.what());
-       }
        catch (IOException e)
        {
                g_warning("RawSpeed: IOException: %s", e.what());


_______________________________________________
Rawstudio-commit mailing list
Rawstudio-commit@rawstudio.org
http://rawstudio.org/cgi-bin/mailman/listinfo/rawstudio-commit