diff --git a/rtdata/CMakeLists.txt b/rtdata/CMakeLists.txt index 0ddfdc9a0..c145f8ebb 100644 --- a/rtdata/CMakeLists.txt +++ b/rtdata/CMakeLists.txt @@ -3,6 +3,7 @@ file (GLOB IMAGEFILES "images/*.png") file (GLOB PROFILEFILES "profiles/*.pp3") file (GLOB LANGUAGEFILES "languages/*") file (GLOB SOUNDFILES "sounds/*") +file (GLOB ICCFILES "iccprofiles/*") # THEMEDIR includes subfolders for image resources for some themes; doing the normal glob won't work. set (THEMEDIR "themes") @@ -29,6 +30,7 @@ install (FILES ${IMAGEFILES} DESTINATION ${DATADIR}/images) install (FILES ${LANGUAGEFILES} DESTINATION ${DATADIR}/languages) install (FILES ${PROFILEFILES} DESTINATION ${DATADIR}/profiles) install (FILES ${SOUNDFILES} DESTINATION ${DATADIR}/sounds) +install (FILES ${ICCFILES} DESTINATION ${DATADIR}/iccprofiles) install (DIRECTORY ${THEMEDIR} DESTINATION ${DATADIR}) install (FILES ${OPTIONSFILE} DESTINATION ${DATADIR} PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ RENAME options) diff --git a/rtdata/iccprofiles/Canon EOS 450D.icc b/rtdata/iccprofiles/Canon EOS 450D.icc new file mode 100644 index 000000000..e3229b821 Binary files /dev/null and b/rtdata/iccprofiles/Canon EOS 450D.icc differ diff --git a/rtdata/iccprofiles/Nikon D700.icc b/rtdata/iccprofiles/Nikon D700.icc new file mode 100644 index 000000000..01192d7fb Binary files /dev/null and b/rtdata/iccprofiles/Nikon D700.icc differ diff --git a/rtdata/iccprofiles/Sony DSLR-A700.icc b/rtdata/iccprofiles/Sony DSLR-A700.icc new file mode 100644 index 000000000..831470c8c Binary files /dev/null and b/rtdata/iccprofiles/Sony DSLR-A700.icc differ diff --git a/rtengine/dcraw.cc b/rtengine/dcraw.cc index 7ad29d8cd..13f77bd46 100644 --- a/rtengine/dcraw.cc +++ b/rtengine/dcraw.cc @@ -6202,7 +6202,7 @@ void CLASS adobe_coeff (const char *make, const char *model) { 4716,603,-830,-7798,15474,2480,-1496,1937,6651 } }, { "Canon EOS 5D", 0, 0xe6c, { 6347,-479,-972,-8297,15954,2480,-1968,2131,7649 } }, - { "Canon EOS 7D", 0, 0x3510, /* RT - Colin Walker */ + { "Canon EOS 7D", 0, 0x3510, /* RT - Colin Walker */ { 5962,-171,-732,-4189,12307,2099,-911,1981,6304 } }, { "Canon EOS 10D", 0, 0xfa0, { 8197,-2000,-1118,-6714,14335,2592,-2536,3178,8266 } }, @@ -6216,16 +6216,16 @@ void CLASS adobe_coeff (const char *make, const char *model) { 6071,-747,-856,-7653,15365,2441,-2025,2553,7315 } }, { "Canon EOS 50D", 0, 0x3d93, { 4920,616,-593,-6493,13964,2784,-1774,3178,7005 } }, - { "Canon EOS 60D", 0, 0x2ff7, /* RT - Colin Walker */ - { 5678,-179,-718,-4389,12381,2243,-869,1819,6380 } }, + { "Canon EOS 60D", 0, 0x2ff7, /* RT - Colin Walker */ + { 5678,-179,-718,-4389,12381,2243,-869,1819,6380 } }, { "Canon EOS 300D", 0, 0xfa0, { 8197,-2000,-1118,-6714,14335,2592,-2536,3178,8266 } }, { "Canon EOS 350D", 0, 0xfff, { 6018,-617,-965,-8645,15881,2975,-1530,1719,7642 } }, { "Canon EOS 400D", 0, 0xe8e, { 7054,-1501,-990,-8156,15544,2812,-1278,1414,7796 } }, - { "Canon EOS 450D", 0, 0x390d, - { 5784,-262,-821,-7539,15064,2672,-1982,2681,7427 } }, + { "Canon EOS 450D", 0, 0x390d, /* RT */ + { 6246,-1272,-523,-5075,12357,3075,-1035,1825,7333 } }, { "Canon EOS 500D", 0, 0x3479, { 4763,712,-646,-6821,14399,2640,-1921,3276,6561 } }, { "Canon EOS 550D", 0, 0x3dd7, @@ -6389,7 +6389,7 @@ void CLASS adobe_coeff (const char *make, const char *model) { "FUJIFILM FinePix F550EXR", 0, 0, { 13690,-5358,-1474,-3369,11600,1998,-132,1554,4395 } }, { "FUJIFILM FinePix X100", 0, 0, /* RT - Colin Walker */ - { 10841,-3288,-807,-4652,12552,2344,-642,1355,7206 } }, + { 10841,-3288,-807,-4652,12552,2344,-642,1355,7206 } }, { "Imacon Ixpress", 0, 0, /* DJC */ { 7025,-1415,-704,-5188,13765,1424,-1248,2742,6038 } }, { "KODAK NC2000", 0, 0, @@ -6602,12 +6602,12 @@ void CLASS adobe_coeff (const char *make, const char *model) { 8453,-2198,-1092,-7609,15681,2008,-1725,2337,7824 } }, { "OLYMPUS E-620", 0, 0xfaf, { 8453,-2198,-1092,-7609,15681,2008,-1725,2337,7824 } }, - { "OLYMPUS E-P1", 0, 0xffd, /* RT - Colin Walker */ - { 8834,-2344,-804,-4691,12503,2448,-978,1919,7603 } }, - { "OLYMPUS E-P2", 0, 0xffd, /* RT - Colin Walker */ - { 7758,-1619,-800,-5002,12886,2349,-985,1964,8305 } }, - { "OLYMPUS E-P3", 0, 0, /* RT - Colin Walker */ - { 7041,-1794,-336,-3790,11192,2984,-1364,2625,6217 } }, + { "OLYMPUS E-P1", 0, 0xffd, /* RT - Colin Walker */ + { 8834,-2344,-804,-4691,12503,2448,-978,1919,7603 } }, + { "OLYMPUS E-P2", 0, 0xffd, /* RT - Colin Walker */ + { 7758,-1619,-800,-5002,12886,2349,-985,1964,8305 } }, + { "OLYMPUS E-P3", 0, 0, /* RT - Colin Walker */ + { 7041,-1794,-336,-3790,11192,2984,-1364,2625,6217 } }, { "OLYMPUS E-PL1s", 0, 0, /* RT - Colin Walker */ { 9010,-2271,-838,-4792,12753,2263,-1059,2058,7589 } }, { "OLYMPUS E-PL1", 0, 0, /* RT - Colin Walker */ @@ -6706,32 +6706,32 @@ void CLASS adobe_coeff (const char *make, const char *model) { 10909,-4295,-948,-1333,9306,2399,22,1738,4582 } }, { "LEICA D-LUX 5", 143, 0, { 10909,-4295,-948,-1333,9306,2399,22,1738,4582 } }, - { "Leica Camera AG M9 Digital Camera", 0, 0, /* RT */ - { 7181,-1706,-55,-3557,11409,2450,-621,2072,7533 } }, + { "Leica Camera AG M9 Digital Camera", 0, 0, /* RT */ + { 7181,-1706,-55,-3557,11409,2450,-621,2072,7533 } }, { "Panasonic DMC-FZ100", 143, 0xfff, { 16197,-6146,-1761,-2393,10765,1869,366,2238,5248 } }, { "LEICA V-LUX 2", 143, 0xfff, { 16197,-6146,-1761,-2393,10765,1869,366,2238,5248 } }, { "Panasonic DMC-FX150", 15, 0xfff, { 9082,-2907,-925,-6119,13377,3058,-1797,2641,5609 } }, - { "Panasonic DMC-G10", 15, 0xf3c, /* RT - Colin Walker */ - { 8310,-1811,-960,-4941,12990,2151,-1378,2468,6860 } }, - { "Panasonic DMC-G1", 15, 0xf94, /* RT - Colin Walker*/ - { 7477,-1615,-651,-5016,12769,2506,-1380,2475,7240 } }, - { "Panasonic DMC-G2", 15, 0xf3c, /* RT - Colin Walker */ - { 8310,-1811,-960,-4941,12990,2151,-1378,2468,6860 } }, + { "Panasonic DMC-G10", 15, 0xf3c, /* RT - Colin Walker */ + { 8310,-1811,-960,-4941,12990,2151,-1378,2468,6860 } }, + { "Panasonic DMC-G1", 15, 0xf94, /* RT - Colin Walker*/ + { 7477,-1615,-651,-5016,12769,2506,-1380,2475,7240 } }, + { "Panasonic DMC-G2", 15, 0xf3c, /* RT - Colin Walker */ + { 8310,-1811,-960,-4941,12990,2151,-1378,2468,6860 } }, { "Panasonic DMC-G3", 143, 0xfff, /* RT - Colin Walker */ { 6051,-1406,-671,-4015,11505,2868,-1654,2667,6219 } }, - { "Panasonic DMC-GF1", 15, 0xf92, /* RT - Colin Walker */ - { 7863,-2080,-668,-4623,12331,2578,-1020,2066,7266 } }, - { "Panasonic DMC-GF2", 143, 0xfff, /* RT - Colin Walker */ - { 7694,-1791,-745,-4917,12818,2332,-1221,2322,7197 } }, - { "Panasonic DMC-GF3", 143, 0xfff, /* RT - Colin Walker */ - { 8074,-1846,-861,-5026,12999,2239,-1320,2375,7422 } }, - { "Panasonic DMC-GH1", 15, 0xf92, /* RT - Colin Walker */ - { 6360,-1557,-375,-4201,11504,3086,-1378,2518,5843 } }, - { "Panasonic DMC-GH2", 15, 0xf95, /* RT - Colin Walker */ - { 6855,-1765,-456,-4223,11600,2996,-1450,2602,5761 } }, + { "Panasonic DMC-GF1", 15, 0xf92, /* RT - Colin Walker */ + { 7863,-2080,-668,-4623,12331,2578,-1020,2066,7266 } }, + { "Panasonic DMC-GF2", 143, 0xfff, /* RT - Colin Walker */ + { 7694,-1791,-745,-4917,12818,2332,-1221,2322,7197 } }, + { "Panasonic DMC-GF3", 143, 0xfff, /* RT - Colin Walker */ + { 8074,-1846,-861,-5026,12999,2239,-1320,2375,7422 } }, + { "Panasonic DMC-GH1", 15, 0xf92, /* RT - Colin Walker */ + { 6360,-1557,-375,-4201,11504,3086,-1378,2518,5843 } }, + { "Panasonic DMC-GH2", 15, 0xf95, /* RT - Colin Walker */ + { 6855,-1765,-456,-4223,11600,2996,-1450,2602,5761 } }, { "Phase One H 20", 0, 0, /* DJC */ { 1313,1855,-109,-6715,15908,808,-327,1840,6020 } }, { "Phase One P 2", 0, 0, @@ -6784,8 +6784,8 @@ void CLASS adobe_coeff (const char *make, const char *model) { 5932,-1492,-411,-4813,12285,2856,-741,1524,6739 } }, { "SONY DSLR-A5", 128, 0xfeb, { 4950,-580,-103,-5228,12542,3029,-709,1435,7371 } }, - { "SONY DSLR-A700", 126, 0, - { 5775,-805,-359,-8574,16295,2391,-1943,2341,7249 } }, + { "SONY DSLR-A700", 126, 0, /* RT */ + { 6509,-1333,-137,-6171,13621,2824,-1490,2226,6952 } }, { "SONY DSLR-A850", 128, 0, { 5413,-1162,-365,-5665,13098,2866,-608,1179,8440 } }, { "SONY DSLR-A900", 128, 0, @@ -6804,8 +6804,8 @@ void CLASS adobe_coeff (const char *make, const char *model) { 4504,-1495,115,-3507,9101,4407,-669,1844,6806 } }, { "SONY SLT-A55", 128, 0, { 5932,-1492,-411,-4813,12285,2856,-741,1524,6739 } }, - { "SONY SLT-A77V", 128, 0, /* RT - Colin Walker */ - { 5126,-830,-261,-4788,12196,2934,-948,1602,7068 } } + { "SONY SLT-A77V", 128, 0, /* RT - Colin Walker */ + { 5126,-830,-261,-4788,12196,2934,-948,1602,7068 } } }; double cam_xyz[4][3]; char name[130]; diff --git a/rtengine/dcraw.patch b/rtengine/dcraw.patch index 6b0ed5ff2..27c0633e6 100644 --- a/rtengine/dcraw.patch +++ b/rtengine/dcraw.patch @@ -1,5 +1,5 @@ --- C:/GCC/RT/RTSrc/rtengine/dcraw.c Tue Aug 16 06:59:22 2011 -+++ C:/GCC/RT/RTSrc/rtengine/dcraw.cc Mon Sep 05 17:48:51 2011 ++++ C:/GCC/RT/RTSrc/rtengine/dcraw.cc Fri Sep 30 15:03:27 2011 @@ -1,3 +1,14 @@ +/*RT*/#include +/*RT*/#include @@ -317,7 +317,7 @@ { "Canon EOS 10D", 0, 0xfa0, { 8197,-2000,-1118,-6714,14335,2592,-2536,3178,8266 } }, { "Canon EOS 20Da", 0, 0, -@@ -6195,8 +6216,8 @@ +@@ -6195,16 +6216,16 @@ { 6071,-747,-856,-7653,15365,2441,-2025,2553,7315 } }, { "Canon EOS 50D", 0, 0x3d93, { 4920,616,-593,-6493,13964,2784,-1774,3178,7005 } }, @@ -328,15 +328,16 @@ { "Canon EOS 300D", 0, 0xfa0, { 8197,-2000,-1118,-6714,14335,2592,-2536,3178,8266 } }, { "Canon EOS 350D", 0, 0xfff, -@@ -6298,7 +6319,7 @@ - { "Canon PowerShot SX1 IS", 0, 0, - { 6578,-259,-502,-5974,13030,3309,-308,1058,4970 } }, - { "Canon PowerShot SX110 IS", 0, 0, /* DJC */ -- { 14134,-5576,-1527,-1991,10719,1273,-1158,1929,3581 } }, -+ { 14134,-5576,-1527,-1991,10719,1273,-1158,1929,3581 } }, - { "CASIO EX-S20", 0, 0, /* DJC */ - { 11634,-3924,-1128,-4968,12954,2015,-1588,2648,7206 } }, - { "CASIO EX-Z750", 0, 0, /* DJC */ + { 6018,-617,-965,-8645,15881,2975,-1530,1719,7642 } }, + { "Canon EOS 400D", 0, 0xe8e, + { 7054,-1501,-990,-8156,15544,2812,-1278,1414,7796 } }, +- { "Canon EOS 450D", 0, 0x390d, +- { 5784,-262,-821,-7539,15064,2672,-1982,2681,7427 } }, ++ { "Canon EOS 450D", 0, 0x390d, /* RT */ ++ { 6246,-1272,-523,-5075,12357,3075,-1035,1825,7333 } }, + { "Canon EOS 500D", 0, 0x3479, + { 4763,712,-646,-6821,14399,2640,-1921,3276,6561 } }, + { "Canon EOS 550D", 0, 0x3dd7, @@ -6367,8 +6388,8 @@ { 13690,-5358,-1474,-3369,11600,1998,-132,1554,4395 } }, { "FUJIFILM FinePix F550EXR", 0, 0, @@ -473,7 +474,15 @@ { "Phase One H 20", 0, 0, /* DJC */ { 1313,1855,-109,-6715,15908,808,-327,1840,6020 } }, { "Phase One P 2", 0, 0, -@@ -6765,20 +6790,22 @@ +@@ -6759,26 +6784,28 @@ + { 5932,-1492,-411,-4813,12285,2856,-741,1524,6739 } }, + { "SONY DSLR-A5", 128, 0xfeb, + { 4950,-580,-103,-5228,12542,3029,-709,1435,7371 } }, +- { "SONY DSLR-A700", 126, 0, +- { 5775,-805,-359,-8574,16295,2391,-1943,2341,7249 } }, ++ { "SONY DSLR-A700", 126, 0, /* RT */ ++ { 6509,-1333,-137,-6171,13621,2824,-1490,2226,6952 } }, + { "SONY DSLR-A850", 128, 0, { 5413,-1162,-365,-5665,13098,2866,-608,1179,8440 } }, { "SONY DSLR-A900", 128, 0, { 5209,-1072,-397,-8845,16120,2919,-1618,1803,8654 } },