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

Issue 2008: fixed camconst.json parse bug; added iso-dependent white levels for Canon EOS 5D Mark II

Browse Source
This commit is contained in:
torger
2013-10-16 21:20:09 +02:00
parent 39f5f6701a
commit 1b98fe4d18
2 changed files with 34 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rtengine/camconst.cc
View File

@@ -58,7 +58,7 @@ CameraConst::parseLevels(CameraConst *cc, int bw, void *ji_)
}
struct camera_const_levels lvl;
if (js->type == cJSON_Number) {
lvl.levels[0] = lvl.levels[1] = lvl.levels[2] = lvl.levels[3] = ji->valueint;
lvl.levels[0] = lvl.levels[1] = lvl.levels[2] = lvl.levels[3] = js->valueint;
} else if (js->type == cJSON_Array) {
int i;
for (js = js->child, i = 0; js != NULL && i < 4; js = js->next, i++) {

33
rtengine/camconst.json
View File

@@ -86,6 +86,39 @@ Examples:
*/
{"camera_constants": [
{
"make_model": "Canon EOS 5D Mark II",
"dcraw_matrix": [ 4716,603,-830,-7798,15474,2480,-1496,1937,6651 ],
"ranges": {
// black levels are read from raw masked pixels
// white levels are same for all colors, but vary on ISO
"white": [
{ "iso": 50, "levels": 15760 },
{ "iso": 100, "levels": 15760 },
{ "iso": 125, "levels": 15760 },
{ "iso": 160, "levels": 12810 },
{ "iso": 200, "levels": 15760 },
{ "iso": 250, "levels": 15760 },
{ "iso": 320, "levels": 12810 },
{ "iso": 400, "levels": 15760 },
{ "iso": 500, "levels": 15760 },
{ "iso": 640, "levels": 12810 },
{ "iso": 800, "levels": 15760 },
{ "iso": 1000, "levels": 15760 },
{ "iso": 1250, "levels": 12810 },
{ "iso": 1600, "levels": 15760 },
{ "iso": 2000, "levels": 15760 },
{ "iso": 2500, "levels": 15760 },
{ "iso": 3200, "levels": 15760 },
{ "iso": 4000, "levels": 15760 },
{ "iso": 5000, "levels": 15760 },
{ "iso": 6400, "levels": 16383 },
{ "iso": 12800, "levels": 16383 },
{ "iso": 25600, "levels": 16383 }
]
}
},
// Phase One: color matrices borrowed from Adobe DNG Converter, black/white levels tested on actual raw files
{
"make_model": "Phase One P40+",