Update of /cvsroot/ufraw/ufraw
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv23558
Modified Files:
dcraw_api.cc
Log Message:
Better fix for Foveon *.X3F crash. Make sure d->image is initialized before we
use it.
Index: dcraw_api.cc
===================================================================
RCS file: /cvsroot/ufraw/ufraw/dcraw_api.cc,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -d -r1.89 -r1.90
--- dcraw_api.cc 12 Mar 2013 05:00:07 -0000 1.89
+++ dcraw_api.cc 16 Mar 2013 03:45:08 -0000 1.90
@@ -227,8 +227,8 @@
} else {
h->raw.image = d->image = g_new0(dcraw_image_type, d->iheight *
d->iwidth
+ d->meta_length);
+ d->meta_data = (char *)(d->image + d->iheight * d->iwidth);
}
- d->meta_data = (char *)(d->image + d->iheight * d->iwidth);
d->dcraw_message(DCRAW_VERBOSE, _("Loading %s %s image from %s ...\n"),
d->make, d->model, d->ifname_display);
fseek(d->ifp, 0, SEEK_END);
@@ -240,6 +240,7 @@
if (d->raw_image) {
h->raw.image = d->image = g_new0(dcraw_image_type, d->iheight *
d->iwidth
+ d->meta_length);
+ d->meta_data = (char *)(d->image + d->iheight * d->iwidth);
d->crop_masked_pixels();
g_free(d->raw_image);
}
------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_d2d_mar
_______________________________________________
ufraw-cvs mailing list
ufraw-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ufraw-cvs
