diff --git a/rtdata/iccprofiles/input/Canon PowerShot G12.icc b/rtdata/iccprofiles/input/Canon PowerShot G12.icc new file mode 100644 index 000000000..efc495d50 Binary files /dev/null and b/rtdata/iccprofiles/input/Canon PowerShot G12.icc differ diff --git a/rtengine/dcraw.cc b/rtengine/dcraw.cc index 6598b3846..23bf0f394 100644 --- a/rtengine/dcraw.cc +++ b/rtengine/dcraw.cc @@ -6262,12 +6262,12 @@ void CLASS adobe_coeff (const char *make, const char *model) { -5300,9846,1776,3436,684,3939,-5540,9879,6200,-1404,11175,217 } }, { "Canon PowerShot A5", 0, 0, { -4801,9475,1952,2926,1611,4094,-5259,10164,5947,-1554,10883,547 } }, - { "Canon PowerShot G10", 0, 0, /* RT */ + { "Canon PowerShot G10", 0, 0, /* RT */ { 12535,-5030,-796,-2711,10134,3006,-413,1605,5264 } }, { "Canon PowerShot G11", 0, 0, { 12177,-4817,-1069,-1612,9864,2049,-98,850,4471 } }, - { "Canon PowerShot G12", 0, 0, - { 13244,-5501,-1248,-1508,9858,1935,-270,1083,4366 } }, + { "Canon PowerShot G12", 0, 0, /* RT */ + { 12222,-4097,-1380,-2876,11016,2130,-888,1630,4434 } }, { "Canon PowerShot G1", 0, 0, { -4778,9467,2172,4743,-1141,4344,-5146,9908,6077,-1566,11051,557 } }, { "Canon PowerShot G2", 0, 0, diff --git a/rtengine/dcraw.patch b/rtengine/dcraw.patch index 2947fdeb6..7dae0c415 100644 --- a/rtengine/dcraw.patch +++ b/rtengine/dcraw.patch @@ -1,5 +1,5 @@ --- C:/GCC/RT/RTSrc/rtengine/dcraw.c Thu Dec 29 11:43:38 2011 -+++ C:/GCC/RT/RTSrc/rtengine/dcraw.cc Thu Mar 15 18:15:28 2012 ++++ C:/GCC/RT/RTSrc/rtengine/dcraw.cc Fri Mar 16 15:48:27 2012 @@ -1,3 +1,14 @@ +/*RT*/#include +/*RT*/#include @@ -430,17 +430,23 @@ { "Canon EOS-1D Mark II N", 0, 0xe80, { 6240,-466,-822,-8180,15825,2500,-1801,1938,8042 } }, { "Canon EOS-1D Mark II", 0, 0xe80, -@@ -6241,8 +6262,8 @@ +@@ -6241,12 +6262,12 @@ { -5300,9846,1776,3436,684,3939,-5540,9879,6200,-1404,11175,217 } }, { "Canon PowerShot A5", 0, 0, { -4801,9475,1952,2926,1611,4094,-5259,10164,5947,-1554,10883,547 } }, - { "Canon PowerShot G10", 0, 0, - { 11093,-3906,-1028,-5047,12492,2879,-1003,1750,5561 } }, -+ { "Canon PowerShot G10", 0, 0, /* RT */ ++ { "Canon PowerShot G10", 0, 0, /* RT */ + { 12535,-5030,-796,-2711,10134,3006,-413,1605,5264 } }, { "Canon PowerShot G11", 0, 0, { 12177,-4817,-1069,-1612,9864,2049,-98,850,4471 } }, - { "Canon PowerShot G12", 0, 0, +- { "Canon PowerShot G12", 0, 0, +- { 13244,-5501,-1248,-1508,9858,1935,-270,1083,4366 } }, ++ { "Canon PowerShot G12", 0, 0, /* RT */ ++ { 12222,-4097,-1380,-2876,11016,2130,-888,1630,4434 } }, + { "Canon PowerShot G1", 0, 0, + { -4778,9467,2172,4743,-1141,4344,-5146,9908,6077,-1566,11051,557 } }, + { "Canon PowerShot G2", 0, 0, @@ -6302,7 +6323,7 @@ { "Canon PowerShot SX1 IS", 0, 0, { 6578,-259,-502,-5974,13030,3309,-308,1058,4970 } },