liz/rawTherapee
liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3376 from Beep6581/small_camconst_speedup

Browse Source 
Improve processing time to read camconst.json by almost factor 2. Additionally make it future-proof by reducing O(n²) copying amount in reallocate phase to O(n)
This commit is contained in:
Ingo Weyrich 2016-07-08 12:43:40 +02:00 committed by GitHub
commit 3b734e4a7a
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
rtengine/camconst.cc
View File

@ -550,7 +550,8 @@ CameraConstantsStore::parse_camera_constants_file(Glib::ustring filename_)
return false; return false;
} }
size_t bufsize = 4096; size_t bufsize = 16384;
size_t increment = 2 * bufsize;
size_t datasize = 0, ret; size_t datasize = 0, ret;
char *buf = (char *)malloc(bufsize); char *buf = (char *)malloc(bufsize);
@ -558,8 +559,9 @@ CameraConstantsStore::parse_camera_constants_file(Glib::ustring filename_)
datasize += ret; datasize += ret;
if (datasize == bufsize) { if (datasize == bufsize) {
bufsize += 4096; bufsize += increment;
buf = (char *)realloc(buf, bufsize); buf = (char *)realloc(buf, bufsize);
increment *= 2;
} }
} }
@ -571,7 +573,11 @@ CameraConstantsStore::parse_camera_constants_file(Glib::ustring filename_)
} }
fclose(stream); fclose(stream);
buf = (char *)realloc(buf, datasize + 1);
if(datasize == bufsize) {
buf = (char *)realloc(buf, datasize + 1);
}
buf[datasize] = '\0'; buf[datasize] = '\0';
// remove comments // remove comments
@ -637,18 +643,16 @@ CameraConstantsStore::parse_camera_constants_file(Glib::ustring filename_)
Glib::ustring make_model(ji->valuestring); Glib::ustring make_model(ji->valuestring);
make_model = make_model.uppercase(); make_model = make_model.uppercase();
std::map<Glib::ustring, CameraConst *>::iterator existingccIter = mCameraConstants.find(make_model);
if (existingccIter == mCameraConstants.end()) { const auto ret = mCameraConstants.emplace(make_model, cc);
// add the new CamConst to the map
mCameraConstants.insert(std::pair<Glib::ustring, CameraConst *>(make_model, cc));
if(ret.second) { // entry inserted into map
if (settings->verbose) { if (settings->verbose) {
printf("Add camera constants for \"%s\"\n", make_model.c_str()); printf("Add camera constants for \"%s\"\n", make_model.c_str());
} }
} else { } else {
// The CameraConst already exist for this camera make/model -> we merge the values // The CameraConst already exist for this camera make/model -> we merge the values
CameraConst *existingcc = existingccIter->second; CameraConst *existingcc = ret.first->second;
// updating the dcraw matrix // updating the dcraw matrix
existingcc->update_dcrawMatrix(cc->get_dcrawMatrix()); existingcc->update_dcrawMatrix(cc->get_dcrawMatrix());