From 81fa149570649031f53f1d56341696c29bb35c03 Mon Sep 17 00:00:00 2001 From: heckflosse Date: Thu, 3 Nov 2016 00:41:33 +0100 Subject: [PATCH] small change for Hombre --- rtengine/rawimage.cc | 7 +++++-- rtengine/rawimagesource.cc | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/rtengine/rawimage.cc b/rtengine/rawimage.cc index 85d6a00b5..395a8bc55 100644 --- a/rtengine/rawimage.cc +++ b/rtengine/rawimage.cc @@ -423,13 +423,16 @@ int RawImage::loadRaw (bool loadData, unsigned int &imageNum, bool closeFile, Pr //***************** Read ALL raw file info // set the number of the frame to extract. If the number is larger then number of existing frames - 1, dcraw will handle that correctly - shot_select = imageNum; identify (); + fclose(ifp); + ifp = gfopen (ifname); // Maps to either file map or direct fopen + shot_select = imageNum; + shot_select = std::min(shot_select, std::max(is_raw, 1u) - 1); + identify(); std::cout << "israw : " << is_raw << std::endl; // in case dcraw didn't handle the above mentioned case... - shot_select = std::min(shot_select, std::max(is_raw, 1u) - 1); imageNum = shot_select; if (!is_raw) { diff --git a/rtengine/rawimagesource.cc b/rtengine/rawimagesource.cc index 1d30706aa..9cef132ae 100644 --- a/rtengine/rawimagesource.cc +++ b/rtengine/rawimagesource.cc @@ -1506,7 +1506,7 @@ int RawImageSource::load (const Glib::ustring &fname, int imageNum, bool batch) plistener->setProgress (0.0); } - unsigned int tempImageNum = 4; + unsigned int tempImageNum = 16; do { tempImageNum --; numFrames ++;