Fixed raw image load err under debugger

This commit is contained in:
Oliver Duis
2011-04-14 20:47:43 +02:00
parent f258169b08
commit 397d93e5d8
2 changed files with 6 additions and 7 deletions

View File

@@ -128,14 +128,13 @@ skip_block: ;
int RawImage::loadRaw (bool loadData, bool closeFile)
{
ifname = safe_locale_from_utf8(filename).c_str();
ifname = filename.c_str();
image = NULL;
verbose = settings->verbose;
oprof = NULL;
ifp = gfopen (ifname);
if (!ifp)
return 3;
ifp = gfopen (ifname); // Maps to either file map or direct fopen
if (!ifp) return 3;
thumb_length = 0;
thumb_offset = 0;

View File

@@ -884,9 +884,9 @@ int RawImageSource::load (Glib::ustring fname, bool batch) {
}
ri = new RawImage(fname);
int res = ri->loadRaw ();
if (res)
return res;
int errCode = ri->loadRaw ();
if (errCode) return errCode;
ri->compress_image();
if (plistener) {
plistener->setProgress (0.8);