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

Override system camcons.json raw_crop with one from users camconst.json, fixes #3873

Browse Source
This commit is contained in:
Morgan Hardwood
2017-05-14 12:36:19 +02:00
parent ccafff7fd7
commit d1bfbc7967
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
rtengine/camconst.cc
View File

@@ -418,6 +418,18 @@ CameraConst::update_Levels(const CameraConst *other)
// } // }
} }
void
CameraConst::update_Crop(CameraConst *other)
{
if (!other) {
return;
}
if (other->has_rawCrop()) {
other->get_rawCrop(raw_crop[0], raw_crop[1], raw_crop[2], raw_crop[3]);
}
}
bool bool
CameraConst::get_Levels(struct camera_const_levels & lvl, int bw, int iso, float fnumber) CameraConst::get_Levels(struct camera_const_levels & lvl, int bw, int iso, float fnumber)
{ {
@@ -668,6 +680,7 @@ CameraConstantsStore::parse_camera_constants_file(Glib::ustring filename_)
existingcc->update_dcrawMatrix(cc->get_dcrawMatrix()); existingcc->update_dcrawMatrix(cc->get_dcrawMatrix());
// deleting all the existing levels, replaced by the new ones // deleting all the existing levels, replaced by the new ones
existingcc->update_Levels(cc); existingcc->update_Levels(cc);
existingcc->update_Crop(cc);
if (settings->verbose) { if (settings->verbose) {
printf("Merging camera constants for \"%s\"\n", make_model.c_str()); printf("Merging camera constants for \"%s\"\n", make_model.c_str());

1
rtengine/camconst.h
View File

@@ -43,6 +43,7 @@ public:
int get_BlackLevel(int idx, int iso_speed); int get_BlackLevel(int idx, int iso_speed);
int get_WhiteLevel(int idx, int iso_speed, float fnumber); int get_WhiteLevel(int idx, int iso_speed, float fnumber);
void update_Levels(const CameraConst *other); void update_Levels(const CameraConst *other);
void update_Crop(CameraConst *other);
}; };
class CameraConstantsStore class CameraConstantsStore