Update of /cvsroot/ufraw/ufraw
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv27354
Modified Files:
ufraw.h ufraw_preview.c ufraw_ufraw.c
Log Message:
Show only supported interpolation method(s) for the FUJIFILM 'X-Trans' sensor.
Index: ufraw_preview.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_preview.c,v
retrieving revision 1.370
retrieving revision 1.371
diff -u -d -r1.370 -r1.371
--- ufraw_preview.c 6 Jul 2013 05:00:11 -0000 1.370
+++ ufraw_preview.c 17 Oct 2013 05:30:15 -0000 1.371
@@ -4422,7 +4422,10 @@
gtk_widget_set_tooltip_text(event_box, _("Bayer pattern interpolation"));
combo = GTK_COMBO_BOX(uf_combo_box_new_text());
if (data->UF->HaveFilters) {
- if (data->UF->colors == 4) {
+ if (data->UF->IsXTrans) {
+ uf_combo_box_append_text(combo, _("Bilinear interpolation"),
+ (void*)bilinear_interpolation);
+ } else if (data->UF->colors == 4) {
uf_combo_box_append_text(combo, _("VNG four color interpolation"),
(void*)four_color_interpolation);
uf_combo_box_append_text(combo, _("Bilinear interpolation"),
Index: ufraw_ufraw.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_ufraw.c,v
retrieving revision 1.275
retrieving revision 1.276
diff -u -d -r1.275 -r1.276
--- ufraw_ufraw.c 1 Jun 2013 18:30:58 -0000 1.275
+++ ufraw_ufraw.c 17 Oct 2013 05:30:16 -0000 1.276
@@ -261,6 +261,7 @@
uf->displayProfileSize = 0;
uf->RawHistogram = NULL;
uf->HaveFilters = raw->filters != 0;
+ uf->IsXTrans = raw->filters == 9;
#ifdef HAVE_LENSFUN
uf->modFlags = 0;
uf->TCAmodifier = NULL;
Index: ufraw.h
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw.h,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -d -r1.170 -r1.171
--- ufraw.h 1 Jun 2013 18:30:58 -0000 1.170
+++ ufraw.h 17 Oct 2013 05:30:15 -0000 1.171
@@ -340,6 +340,7 @@
ufraw_image_data thumb;
void *raw;
gboolean HaveFilters;
+ gboolean IsXTrans;
void *unzippedBuf;
gsize unzippedBufLen;
developer_data *developer;
------------------------------------------------------------------------------
October Webinars: Code for Performance
Free Intel webinars can help you accelerate application performance.
Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from
the latest Intel processors and coprocessors. See abstracts and register >
http://pubads.g.doubleclick.net/gampad/clk?id=60135031&iu=/4140/ostg.clktrk
_______________________________________________
ufraw-cvs mailing list
ufraw-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ufraw-cvs
