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

Merge pull request #6667 from Beep6581/om-1

Browse Source 
Initial support for OM-1 raws
This commit is contained in:
Lawrence37
2023-03-03 22:06:45 -08:00
committed by GitHub
parent f2b0301be2 48b1b6f9be
commit 2d37dec49b
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
rtengine/camconst.json
View File

@@ -2175,6 +2175,16 @@ Camera constants:
"dcraw_matrix" : [8360, -2420, -880, -3928, 12353, 1739, -1381, 2416, 5173] // DNG
},
{ // Quality C
"make_model": ["OM Digital Solutions OM-1"],
"ranges": { "white": 4095 },
"raw_crop" : [
{ "frame" : [10400, 7792], "crop": [0, 0, 10390, 7792] },
{ "frame" : [8180, 6132], "crop": [0, 0, 8172, 6132] },
{ "frame" : [5220, 3912], "crop": [0, 0, 5220, 3912] }
]
},
{ // Quality B
"make_model": [ "Panasonic DC-LX100M2" ],
"dcraw_matrix": [ 11577, -4230, -1106, -3967, 12211, 1957, -759, 1762, 5610 ], // DNG v13.2

8
rtengine/dcraw.cc
View File

@@ -5546,9 +5546,11 @@ void CLASS parse_makernote (int base, int uptag)
offset = get4();
fseek (ifp, offset-8, SEEK_CUR);
} else if (!strcmp (buf,"OLYMPUS") ||
!strcmp (buf,"PENTAX ")) {
!strcmp (buf,"PENTAX ") ||
!strncmp(buf,"OM SYS",6)) { // From LibRaw
base = ftell(ifp)-10;
fseek (ifp, -2, SEEK_CUR);
if (buf[1] == 'M') get4(); // From LibRaw
order = get2();
if (buf[0] == 'O') get2();
} else if (!strncmp (buf,"SONY",4) ||
@@ -7172,7 +7174,7 @@ void CLASS apply_tiff()
if (tiff_ifd[raw].bytes*4 == raw_width*raw_height*7) break;
load_flags = 0;
case 16: load_raw = &CLASS unpacked_load_raw;
if (!strncmp(make,"OLYMPUS",7) &&
if ((!strncmp(make,"OLYMPUS",7) || !strncmp(make, "OM Digi", 7)) && // OM Digi from LibRaw
tiff_ifd[raw].bytes*7 > raw_width*raw_height)
load_raw = &CLASS olympus_load_raw;
// ------- RT -------
@@ -8704,6 +8706,8 @@ void CLASS adobe_coeff (const char *make, const char *model)
{ 10901,-4095,-1074,-1141,9208,2293,-62,1417,5158 } },
{ "Olympus XZ-2", 0, 0,
{ 9777,-3483,-925,-2886,11297,1800,-602,1663,5134 } },
{ "OM Digital Solutions OM-1", 0, 0,
{ 9488, -3984, -714, -2887, 10945, 2229, -137, 960, 5786 } }, // From LibRaw
{ "OmniVision", 0, 0, /* DJC */
{ 12782,-4059,-379,-478,9066,1413,1340,1513,5176 } },
{ "Pentax *ist DL2", 0, 0,