diff --git a/rtdata/iccprofiles/Canon EOS 20D.icc b/rtdata/iccprofiles/Canon EOS 20D.icc new file mode 100644 index 000000000..53b65e090 Binary files /dev/null and b/rtdata/iccprofiles/Canon EOS 20D.icc differ diff --git a/rtdata/iccprofiles/Canon EOS-1D Mark III.icc b/rtdata/iccprofiles/Canon EOS-1D Mark III.icc new file mode 100644 index 000000000..11271982a Binary files /dev/null and b/rtdata/iccprofiles/Canon EOS-1D Mark III.icc differ diff --git a/rtengine/dcraw.cc b/rtengine/dcraw.cc index 61f3ac7d5..765400d95 100644 --- a/rtengine/dcraw.cc +++ b/rtengine/dcraw.cc @@ -6209,8 +6209,8 @@ void CLASS adobe_coeff (const char *make, const char *model) { 8197,-2000,-1118,-6714,14335,2592,-2536,3178,8266 } }, { "Canon EOS 20Da", 0, 0, { 14155,-5065,-1382,-6550,14633,2039,-1623,1824,6561 } }, - { "Canon EOS 20D", 0, 0xfff, - { 6599,-537,-891,-8071,15783,2424,-1983,2234,7462 } }, + { "Canon EOS 20D", 0, 0xfff, /* RT */ + { 7590,-1646,-673,-4697,12411,2568,-627,1118,7295 } }, { "Canon EOS 30D", 0, 0, { 6257,-303,-1000,-7880,15621,2396,-1714,1904,7046 } }, { "Canon EOS 40D", 0, 0x3f60, @@ -6243,8 +6243,8 @@ void CLASS adobe_coeff (const char *make, const char *model) { 6517,-602,-867,-8180,15926,2378,-1618,1771,7633 } }, { "Canon EOS-1D Mark IV", 0, 0x3bb0, { 6014,-220,-795,-4109,12014,2361,-561,1824,5787 } }, - { "Canon EOS-1D Mark III", 0, 0x3bb0, - { 6291,-540,-976,-8350,16145,2311,-1714,1858,7326 } }, + { "Canon EOS-1D Mark III", 0, 0x3bb0, /* RT */ + { 7406,-1592,-646,-4856,12457,2698,-432,726,7921 } }, { "Canon EOS-1D Mark II N", 0, 0xe80, { 6240,-466,-822,-8180,15825,2500,-1801,1938,8042 } }, { "Canon EOS-1D Mark II", 0, 0xe80, diff --git a/rtengine/dcraw.patch b/rtengine/dcraw.patch index 6e8b5a4f5..46cc0929e 100644 --- a/rtengine/dcraw.patch +++ b/rtengine/dcraw.patch @@ -1,5 +1,5 @@ --- C:/GCC/RT/RTSrc/rtengine/dcraw.c Sun Oct 09 18:44:03 2011 -+++ C:/GCC/RT/RTSrc/rtengine/dcraw.cc Mon Oct 10 19:12:06 2011 ++++ C:/GCC/RT/RTSrc/rtengine/dcraw.cc Tue Oct 11 19:52:42 2011 @@ -1,6 +1,17 @@ +/*RT*/#include +/*RT*/#include @@ -310,7 +310,7 @@ if (parse_tiff (save+6)) apply_tiff(); fseek (ifp, save+len, SEEK_SET); } -@@ -6182,8 +6203,8 @@ +@@ -6182,30 +6203,30 @@ { 4716,603,-830,-7798,15474,2480,-1496,1937,6651 } }, { "Canon EOS 5D", 0, 0xe6c, { 6347,-479,-972,-8297,15954,2480,-1968,2131,7649 } }, @@ -321,7 +321,14 @@ { "Canon EOS 10D", 0, 0xfa0, { 8197,-2000,-1118,-6714,14335,2592,-2536,3178,8266 } }, { "Canon EOS 20Da", 0, 0, -@@ -6196,16 +6217,16 @@ + { 14155,-5065,-1382,-6550,14633,2039,-1623,1824,6561 } }, +- { "Canon EOS 20D", 0, 0xfff, +- { 6599,-537,-891,-8071,15783,2424,-1983,2234,7462 } }, ++ { "Canon EOS 20D", 0, 0xfff, /* RT */ ++ { 7590,-1646,-673,-4697,12411,2568,-627,1118,7295 } }, + { "Canon EOS 30D", 0, 0, + { 6257,-303,-1000,-7880,15621,2396,-1714,1904,7046 } }, + { "Canon EOS 40D", 0, 0x3f60, { 6071,-747,-856,-7653,15365,2441,-2025,2553,7315 } }, { "Canon EOS 50D", 0, 0x3d93, { 4920,616,-593,-6493,13964,2784,-1774,3178,7005 } }, @@ -342,6 +349,17 @@ { "Canon EOS 500D", 0, 0x3479, { 4763,712,-646,-6821,14399,2640,-1921,3276,6561 } }, { "Canon EOS 550D", 0, 0x3dd7, +@@ -6222,8 +6243,8 @@ + { 6517,-602,-867,-8180,15926,2378,-1618,1771,7633 } }, + { "Canon EOS-1D Mark IV", 0, 0x3bb0, + { 6014,-220,-795,-4109,12014,2361,-561,1824,5787 } }, +- { "Canon EOS-1D Mark III", 0, 0x3bb0, +- { 6291,-540,-976,-8350,16145,2311,-1714,1858,7326 } }, ++ { "Canon EOS-1D Mark III", 0, 0x3bb0, /* RT */ ++ { 7406,-1592,-646,-4856,12457,2698,-432,726,7921 } }, + { "Canon EOS-1D Mark II N", 0, 0xe80, + { 6240,-466,-822,-8180,15825,2500,-1801,1938,8042 } }, + { "Canon EOS-1D Mark II", 0, 0xe80, @@ -6370,8 +6391,8 @@ { 13690,-5358,-1474,-3369,11600,1998,-132,1554,4395 } }, { "FUJIFILM FinePix F600EXR", 0, 0,