Update of /cvsroot/ufraw/ufraw
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv26558
Modified Files:
ufraw_settings.cc ufraw_ufraw.c
Log Message:
Handle camera make and model names case-insensitively when reading WB presets.
Index: ufraw_settings.cc
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_settings.cc,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- ufraw_settings.cc 26 Mar 2015 14:00:14 -0000 1.31
+++ ufraw_settings.cc 13 Dec 2015 14:00:09 -0000 1.32
@@ -368,7 +368,7 @@
dcraw_data *raw = static_cast<dcraw_data *>(uf->raw);
if (strcasecmp(uf->conf->make, raw->make) != 0 ||
- strcmp(uf->conf->model, raw->model) != 0)
+ strcasecmp(uf->conf->model, raw->model) != 0)
uf->WBDirty = TRUE; // Re-calculate channel multipliers.
if (uf->LoadingID)
uf->WBDirty = TRUE; // Re-calculate channel multipliers.
@@ -391,7 +391,7 @@
}
UFArray &wb = (*this)[ufWB];
for (int i = 0; i < wb_preset_count; i++) {
- if (strcmp(wb_preset[i].make, "") == 0) {
+ if (strcasecmp(wb_preset[i].make, "") == 0) {
/* Common presets */
if (strcmp(wb_preset[i].name, uf_camera_wb) == 0) {
// Get the camera's presets.
@@ -409,7 +409,7 @@
}
wb << new UFString(ufPreset, wb_preset[i].name);
} else if (strcasecmp(wb_preset[i].make, uf->conf->make) == 0 &&
- strcmp(wb_preset[i].model, model) == 0) {
+ strcasecmp(wb_preset[i].model, model) == 0) {
/* Camera specific presets */
uf->wb_presets_make_model_match = TRUE;
if (lastPreset == NULL ||
Index: ufraw_ufraw.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_ufraw.c,v
retrieving revision 1.291
retrieving revision 1.292
diff -u -d -r1.291 -r1.292
--- ufraw_ufraw.c 20 Jun 2015 03:00:38 -0000 1.291
+++ ufraw_ufraw.c 13 Dec 2015 14:00:09 -0000 1.292
@@ -2124,7 +2124,7 @@
for (i = 0; i < wb_preset_count; i++) {
if (ufarray_is_equal(wb, wb_preset[i].name) &&
!strcasecmp(uf->conf->make, wb_preset[i].make) &&
- !strcmp(model, wb_preset[i].model)) {
+ !strcasecmp(model, wb_preset[i].model)) {
if (ufnumber_value(wbTuning) == wb_preset[i].tuning) {
double chanMulArray[4] = {1, 1, 1, 1 };
for (c = 0; c < uf->colors; c++)
------------------------------------------------------------------------------
_______________________________________________
ufraw-cvs mailing list
ufraw-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ufraw-cvs
