[UFRaw-CVS] ufraw configure.ac,1.162,1.163 dcraw_api.cc,1.86,1.87

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

Update of /cvsroot/ufraw/ufraw
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv30987

Modified Files:
	configure.ac dcraw_api.cc 
Log Message:
Disable support for the FUJIFILM 'X-Trans' sensor. It needs more work. Support can be enabled using the --enable-x-trans configure switch.

Index: configure.ac
===================================================================
RCS file: /cvsroot/ufraw/ufraw/configure.ac,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -d -r1.162 -r1.163
--- configure.ac	20 Jan 2013 06:00:06 -0000	1.162
+++ configure.ac	2 Feb 2013 17:00:17 -0000	1.163
@@ -343,6 +343,13 @@
   enable_contrast=no)
 AC_MSG_RESULT($enable_contrast)
 
+AC_MSG_CHECKING(whether to enable support for the FUJIFILM 'X-Trans' sensor)
+AC_ARG_ENABLE(x_trans,
+  [  --enable-x-trans        enable support for the FUJIFILM 'X-Trans' sensor],
+  AC_DEFINE(UFRAW_X_TRANS, 1, FUJIFILM 'X-Trans' sensor support enabled),
+  enable_x_trans=no)
+AC_MSG_RESULT($enable_x_trans)
+
 AC_MSG_CHECKING(whether to enable 'None' interpolation)
 AC_ARG_ENABLE(interp_none,
   [  --enable-interp-none    enable 'None' interpolation (mostly for debugging)],

Index: dcraw_api.cc
===================================================================
RCS file: /cvsroot/ufraw/ufraw/dcraw_api.cc,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -d -r1.86 -r1.87
--- dcraw_api.cc	1 Jan 2013 04:00:16 -0000	1.86
+++ dcraw_api.cc	2 Feb 2013 17:00:17 -0000	1.87
@@ -91,6 +91,9 @@
             return DCRAW_OPEN_ERROR;
         }
         d->identify();
+#ifndef UFRAW_X_TRANS
+        if (d->filters == 2) d->is_raw = 0;
+#endif
         /* We first check if dcraw recognizes the file, this is equivalent
          * to 'dcraw -i' succeeding */
         if (!d->make[0]) {