Update of /cvsroot/ufraw/ufraw
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv16824
Modified Files:
dcraw_indi.c
Log Message:
Mark code used to support the FUJIFILM 'X-Trans' sensor.
Index: dcraw_indi.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/dcraw_indi.c,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -d -r1.101 -r1.102
--- dcraw_indi.c 1 Jan 2013 04:00:16 -0000 1.101
+++ dcraw_indi.c 3 Feb 2013 16:30:07 -0000 1.102
@@ -89,6 +89,7 @@
{ 2, 1, 3, 2, 3, 1, 2, 1, 0, 3, 0, 2, 0, 2, 0, 2 },
{ 0, 3, 1, 0, 0, 2, 0, 3, 2, 1, 3, 1, 1, 3, 1, 3 }
};
+#ifdef UFRAW_X_TRANS
static const char filter2[6][6] = {
{ 1, 1, 0, 1, 1, 2 },
{ 1, 1, 2, 1, 1, 0 },
@@ -97,12 +98,15 @@
{ 1, 1, 0, 1, 1, 2 },
{ 0, 2, 1, 2, 0, 1 }
};
+#endif
/* Assume that we are handling the Leaf CatchLight with
* top_margin = 8; left_margin = 18; */
// if (filters == 1) return filter[(row+top_margin) & 15][(col+left_margin) &
15];
if (filters == 1) return filter[(row + 8) & 15][(col + 18) & 15];
+#ifdef UFRAW_X_TRANS
if (filters == 2) return filter2[(row + 6) % 6][(col + 6) % 6];
+#endif
return FC(row, col);
}
@@ -294,7 +298,9 @@
ushort *pix;
dcraw_message(dcraw, DCRAW_VERBOSE, _("Bilinear interpolation...\n"));
/*UF*/
+#ifdef UFRAW_X_TRANS
if (filters == 2) size = 6;
+#endif
border_interpolate_INDI(height, width, image, filters, colors, 1);
for (row = 0; row < size; row++) {
for (col = 0; col < size; col++) {
@@ -382,7 +388,9 @@
dcraw_message(dcraw, DCRAW_VERBOSE, _("VNG interpolation...\n")); /*UF*/
if (filters == 1) prow = pcol = 16;
+#ifdef UFRAW_X_TRANS
if (filters == 2) prow = pcol = 6;
+#endif
int *ipalloc = ip = (int *) calloc(prow * pcol, 1280);
merror(ip, "vng_interpolate()");
for (row = 0; row < prow; row++) /* Precalculate for VNG */
------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_d2d_jan
_______________________________________________
ufraw-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ufraw-cvs
