[UFRaw-CVS] ufraw dcraw_api.cc,1.81,1.82

[Niels K. B. J. <nk...@us...>]

Update of /cvsroot/ufraw/ufraw
In directory vz-cvs-3.sog:/tmp/cvs-serv14170

Modified Files:
	dcraw_api.cc 
Log Message:
Remove experimental support for the FUJIFILM X-Pro1 because it made four-color interpolation unstable.

Index: dcraw_api.cc
===================================================================
RCS file: /cvsroot/ufraw/ufraw/dcraw_api.cc,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -d -r1.81 -r1.82
--- dcraw_api.cc	23 May 2012 13:45:32 -0000	1.81
+++ dcraw_api.cc	25 May 2012 02:30:50 -0000	1.82
@@ -34,8 +34,6 @@
 #define FORC3 FORC(3)
 #define FORC4 FORC(4)
 #define FORCC FORC(colors)
-#define FC(filters,row,col) \
-    (filters >> ((((row) << 1 & 14) + ((col) & 1)) << 1) & 3)
 extern "C" {
     int fc_INDI(const unsigned filters, const int row, const int col);
     void wavelet_denoise_INDI(gushort(*image)[4], const int black,
@@ -705,9 +703,9 @@
 
         /* It might be better to report an error here: */
         /* (dcraw also forbids AHD for Fuji rotated images) */
-        if (interpolation == dcraw_ahd_interpolation && (h->colors > 3 || ff < 1000))
+        if (interpolation == dcraw_ahd_interpolation && h->colors > 3)
             interpolation = dcraw_vng_interpolation;
-        if (interpolation == dcraw_ppg_interpolation && (h->colors > 3 || ff < 1000))
+        if (interpolation == dcraw_ppg_interpolation && h->colors > 3)
             interpolation = dcraw_vng_interpolation;
         f4 = h->fourColorFilters;
         for (r = 0; r < h->height; r++)