Update of /cvsroot/ufraw/ufraw
In directory vz-cvs-3.sog:/tmp/cvs-serv31869
Modified Files:
Tag: dcraw-original-branch
dcraw.cc
Log Message:
dcraw original 9.16 (1.451).
Index: dcraw.cc
===================================================================
RCS file: /cvsroot/ufraw/ufraw/dcraw.cc,v
retrieving revision 1.1.2.121
retrieving revision 1.1.2.122
diff -u -d -r1.1.2.121 -r1.1.2.122
--- dcraw.cc 1 Jul 2012 04:35:25 -0000 1.1.2.121
+++ dcraw.cc 5 Jul 2012 11:54:12 -0000 1.1.2.122
@@ -6897,6 +6897,8 @@
{ 8898,-2498,-994,-3144,11328,2066,-760,1381,4576 } },
{ "SAMSUNG NX2", 0, 0xfff, /* NX20, NX200, NX210 */
{ 6933,-2268,-753,-4921,13387,1647,-803,1641,6096 } },
+ { "SAMSUNG NX1000", 0, 0,
+ { 6933,-2268,-753,-4921,13387,1647,-803,1641,6096 } },
{ "SAMSUNG NX", 0, 0, /* NX5, NX10, NX11, NX100 */
{ 10332,-3234,-1168,-6111,14639,1520,-1352,2647,8331 } },
{ "SAMSUNG WB2000", 0, 0xfff,
@@ -6913,6 +6915,8 @@
{ 8512,-2641,-694,-8042,15670,2526,-1821,2117,7414 } },
{ "SONY DSC-V3", 0, 0,
{ 7511,-2571,-692,-7894,15088,3060,-948,1111,8128 } },
+ { "SONY DSC-RX100", 192, 0, /* DJC */
+ { 7329,-2746,-405,-2691,9338,3354,-136,1259,5051 } },
{ "SONY DSLR-A100", 0, 0xfeb,
{ 9437,-2811,-774,-8405,16215,2290,-710,596,7181 } },
{ "SONY DSLR-A290", 0, 0,
@@ -6968,7 +6972,7 @@
{ "SONY SLT-A65", 128, 0,
{ 5491,-1192,-363,-4951,12342,2948,-911,1722,7192 } },
{ "SONY SLT-A77", 128, 0,
- { 5491,-1192,-363,-4951,12342,2948,-911,1722,7192 } }
+ { 5491,-1192,-363,-4951,12342,2948,-911,1722,7192 } },
};
double cam_xyz[4][3];
char name[130];
@@ -8040,11 +8044,11 @@
raw_width = fsize/height/2;
order = 0x4d4d;
load_raw = &CLASS unpacked_load_raw;
- } else if (!strncmp(model,"NX1",3)) {
+ } else if (!strcmp(make,"SAMSUNG") && raw_width == 4704) {
height -= top_margin = 8;
width -= 2 * (left_margin = 8);
load_flags = 32;
- } else if (!strncmp(model,"NX2",3)) {
+ } else if (!strcmp(make,"SAMSUNG") && raw_width == 5632) {
order = 0x4949;
height = 3694;
top_margin = 2;
@@ -8312,6 +8316,8 @@
adobe_coeff ("SONY","DSC-R1");
width = 3925;
order = 0x4d4d;
+ } else if (!strcmp(make,"SONY") && raw_width == 5504) {
+ width -= 8;
} else if (!strcmp(make,"SONY") && raw_width == 6048) {
width -= 24;
} else if (!strcmp(model,"DSLR-A100")) {
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
ufraw-cvs mailing list
ufraw-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ufraw-cvs
