Author: post
Date: 2012-07-28 18:09:28 +0200 (Sat, 28 Jul 2012)
New Revision: 4242
Modified:
trunk/plugins/load-rawspeed/Makefile.am
trunk/plugins/load-rawspeed/rawstudio-plugin-api.cpp
Log:
Update with new RawSpeed changes.
Modified: trunk/plugins/load-rawspeed/Makefile.am
===================================================================
--- trunk/plugins/load-rawspeed/Makefile.am 2012-07-18 13:39:34 UTC (rev
4241)
+++ trunk/plugins/load-rawspeed/Makefile.am 2012-07-28 16:09:28 UTC (rev
4242)
@@ -18,7 +18,7 @@
libdir = $(datadir)/rawstudio/plugins/
-load_rawspeed_la_LIBADD = @PACKAGE_LIBS@
+load_rawspeed_la_LIBADD = @PACKAGE_LIBS@ @LIBJPEG@
load_rawspeed_la_LDFLAGS = -module -avoid-version
load_rawspeed_la_SOURCES = rawstudio-plugin-api.cpp rawstudio-plugin-api.h \
rawstudio-plugin.c \
@@ -39,6 +39,7 @@
rawspeed/Cr2Decoder.cpp rawspeed/Cr2Decoder.h \
rawspeed/DngDecoder.cpp rawspeed/DngDecoder.h \
rawspeed/DngDecoderSlices.cpp rawspeed/DngDecoderSlices.h \
+ rawspeed/DngOpcodes.cpp rawspeed/DngOpcodes.h \
rawspeed/FileIOException.cpp rawspeed/FileIOException.h \
rawspeed/FileMap.cpp rawspeed/FileMap.h \
rawspeed/FileReader.cpp rawspeed/FileReader.h \
Modified: trunk/plugins/load-rawspeed/rawstudio-plugin-api.cpp
===================================================================
--- trunk/plugins/load-rawspeed/rawstudio-plugin-api.cpp 2012-07-18
13:39:34 UTC (rev 4241)
+++ trunk/plugins/load-rawspeed/rawstudio-plugin-api.cpp 2012-07-28
16:09:28 UTC (rev 4242)
@@ -107,8 +107,8 @@
d->decodeRaw();
d->decodeMetaData(c);
- for (guint i = 0; i < d->errors.size(); i++)
- g_warning("RawSpeed: Error Encountered:%s\n",
d->errors[i]);
+ for (guint i = 0; i < d->mRaw->errors.size(); i++)
+ g_warning("RawSpeed: Error Encountered:
'%s'\n", d->mRaw->errors[i]);
RawImage r = d->mRaw;
delete d; d = NULL;
@@ -120,7 +120,6 @@
RS_DEBUG(PERFORMANCE, "RawSpeed Decode %s: %.03fs\n", filename,
g_timer_elapsed(gt, NULL));
g_timer_destroy(gt);
#endif
-
cpp = r->getCpp();
if (cpp == 1)
image = rs_image16_new(r->dim.x, r->dim.y, cpp,
cpp);
_______________________________________________
Rawstudio-commit mailing list
[email protected]
http://rawstudio.org/cgi-bin/mailman/listinfo/rawstudio-commit
