LogoopenSUSE Build Service > Projects
Sign Up | Log In

View File sd990.diff of Package ufraw (Project home:garloff:Photography)

Index: ufraw-0.19.2/dcraw.cc
===================================================================
--- ufraw-0.19.2.orig/dcraw.cc
+++ ufraw-0.19.2/dcraw.cc
@@ -6619,8 +6619,10 @@ void CLASS adobe_coeff (const char *make
     { "Canon PowerShot A640", 0, 0,	/* DJC */
 	{ 13124,-5329,-1390,-3602,11658,1944,-1612,2863,4885 } },
     { "Canon PowerShot A650", 0, 0,	/* DJC */
 	{ 9427,-3036,-959,-2581,10671,1911,-1039,1982,4430 } },
+    { "Canon PowerShot SD990", 0, 0,	/* DJC */
+	{ 8372,-2901,-1282,-1278,6439,530,44,884,2242 } },
     { "Canon PowerShot A720", 0, 0,	/* DJC */
 	{ 14573,-5482,-1546,-1266,9799,1468,-1040,1912,3810 } },
     { "Canon PowerShot S3 IS", 0, 0,	/* DJC */
 	{ 14062,-5199,-1446,-4712,12470,2243,-1286,2028,4836 } },
@@ -7372,8 +7374,9 @@ void CLASS identify()
     { 10341600, "Canon",    "PowerShot A720 IS",0 },
     { 10383120, "Canon",    "PowerShot A630"  ,0 },
     { 12945240, "Canon",    "PowerShot A640"  ,0 },
     { 15636240, "Canon",    "PowerShot A650"  ,0 },
+    { 22498560, "Canon",    "PowerShot SD990" ,0 },
     {  5298000, "Canon",    "PowerShot SD300" ,0 },
     {  7710960, "Canon",    "PowerShot S3 IS" ,0 },
     { 15467760, "Canon",    "PowerShot SX110 IS",0 },
     { 15534576, "Canon",    "PowerShot SX120 IS",0 },
@@ -7839,8 +7842,27 @@ canon_a5:
   } else if (!strcmp(model,"PowerShot Pro90 IS")) {
     width  = 1896;
     colors = 4;
     filters = 0xb4b4b4b4;
+  } else if (!strcmp(model,"PowerShot SD990")) {
+    height = 3312;
+    width  = 4416;
+    raw_height = 3348;
+    raw_width  = 4480;
+    top_margin  = 17;
+    left_margin = 20;
+    tiff_bps = 12;
+    //filters = 0x49494949;
+    filters = 0x94949494;
+    //black = 120;
+    load_flags = 40;
+    zero_is_bad = 1;
+    load_raw = &CLASS packed_load_raw;
+    mask[0][0] = mask[1][0] = top_margin;
+    mask[0][2] = mask[1][2] = top_margin+height;
+    mask[0][3] = 4;
+    mask[1][1] = raw_width-8;
+    mask[1][3] = raw_width;
   } else if (is_canon && raw_width == 2144) {
     height = 1550;
     width  = 2088;
     top_margin  = 8;