[UFRaw-CVS] ufraw dcraw_api.cc,1.53,1.54

[Udi Fuchs]

Update of /cvsroot/ufraw/ufraw
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv31502

Modified Files:
        dcraw_api.cc 
Log Message:
Fix one pixel wide line artifact on image edge.


Index: dcraw_api.cc
===================================================================
RCS file: /cvsroot/ufraw/ufraw/dcraw_api.cc,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- dcraw_api.cc        27 Sep 2009 22:39:39 -0000      1.53
+++ dcraw_api.cc        29 Sep 2009 03:51:17 -0000      1.54
@@ -357,7 +357,7 @@
                    for (ci=0; ci<scale; ci++) {
                        cl = fc_INDI(f4, r*scale+ri, c*scale+ci);
                        sum[cl] += get_pixel(hh, dark,
-                               r*scale+ri, c*scale+ci, cl, pixels);
+                               (r*scale+ri)/2, (c*scale+ci)/2, cl, pixels);
                        count[cl]++;
                    }
                for (cl=0; cl<hh->raw.colors; cl++)
@@ -368,10 +368,10 @@
            }
        }
     } else {
-       if (hh->filters!=0) scale /= 2;
        /* I'm skiping the last row/column if it is not a full row/column */
-       f->height = h = hh->raw.height / scale;
-       f->width = w = hh->raw.width / scale;
+       f->height = h = hh->height / scale;
+       f->width = w = hh->width / scale;
+       if (hh->filters!=0) scale /= 2;
        fujiWidth = ( (hh->fuji_width+hh->shrink) >> hh->shrink ) / scale;
        f->image = (dcraw_image_type *)g_realloc(
                        f->image, h * w * sizeof(dcraw_image_type));


------------------------------------------------------------------------------
Come build with us! The BlackBerry&reg; Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay 
ahead of the curve. Join us from November 9&#45;12, 2009. Register now&#33;
http://p.sf.net/sfu/devconf
_______________________________________________
ufraw-cvs mailing list
ufraw-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ufraw-cvs