Update of /cvsroot/ufraw/ufraw
In directory vz-cvs-3.sog:/tmp/cvs-serv7491
Modified Files:
dcraw.cc
Log Message:
Add preliminary support for the Canon PowerShot G1 X and the FUJIFILM X-S1.
Index: dcraw.cc
===================================================================
RCS file: /cvsroot/ufraw/ufraw/dcraw.cc,v
retrieving revision 1.263
retrieving revision 1.264
diff -u -d -r1.263 -r1.264
--- dcraw.cc 15 May 2012 04:00:21 -0000 1.263
+++ dcraw.cc 16 May 2012 16:45:19 -0000 1.264
@@ -6358,6 +6358,8 @@
{ 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 G1 X", 0, 0,
+ { 0 } },
{ "Canon PowerShot G1", 0, 0,
{ -4778,9467,2172,4743,-1141,4344,-5146,9908,6077,-1566,11051,557 } },
{ "Canon PowerShot G2", 0, 0,
@@ -7660,6 +7662,11 @@
top_margin = 10;
left_margin = 12;
filters = 0x49494949;
+ } else if (is_canon && raw_width == 4496) {
+ height = 3316;
+ width = 4404;
+ top_margin = 50;
+ left_margin = 80;
} else if (is_canon && raw_width == 4832) {
top_margin = unique_id == 0x80000261 ? 51:26;
left_margin = 62;
@@ -7880,7 +7887,7 @@
width = 3262;
left_margin = 34;
}
- if (!strcmp(model,"X10"))
+ if (!strcmp(model,"X10") || !strcmp(model,"X-S1"))
filters = 0x16161616;
if (fuji_layout) raw_width *= is_raw;
if (load_raw == &CLASS fuji_load_raw) {
------------------------------------------------------------------------------
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/ufraw-cvs
