Update of /cvsroot/ufraw/ufraw
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv31253
Modified Files:
dcraw_indi.c uf_gtk.cc ufraw.h ufraw_lensfun.cc
ufraw_preview.c ufraw_settings.cc ufraw_ufraw.c
Log Message:
Fix build error for MinGW-w64.
Index: uf_gtk.cc
===================================================================
RCS file: /cvsroot/ufraw/ufraw/uf_gtk.cc,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- uf_gtk.cc 1 Jan 2013 04:00:17 -0000 1.31
+++ uf_gtk.cc 1 Jun 2013 18:30:58 -0000 1.32
@@ -97,8 +97,8 @@
// Set combo box data and keep it up to date
void uf_combo_box_set_data(GtkComboBox *combo, int *valuep)
{
- gulong handler_id = reinterpret_cast<gulong>(
- g_object_get_data(G_OBJECT(combo),
"uf-combo-handler-id"));
+ guint64 handler_id = reinterpret_cast<guint64>(
+ g_object_get_data(G_OBJECT(combo),
"uf-combo-handler-id"));
if (handler_id != 0)
g_signal_handler_disconnect(G_OBJECT(combo), handler_id);
Index: dcraw_indi.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/dcraw_indi.c,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -d -r1.108 -r1.109
--- dcraw_indi.c 6 May 2013 18:30:10 -0000 1.108
+++ dcraw_indi.c 1 Jun 2013 18:30:58 -0000 1.109
@@ -105,7 +105,7 @@
// 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];
+ if (filters == 9) return filter2[(row + 6) % 6][(col + 6) % 6];
#endif
return FC(row, col);
}
@@ -299,7 +299,7 @@
dcraw_message(dcraw, DCRAW_VERBOSE, _("Bilinear interpolation...\n"));
/*UF*/
#ifdef UFRAW_X_TRANS
- if (filters == 2) size = 6;
+ if (filters == 9) size = 6;
#endif
border_interpolate_INDI(height, width, image, filters, colors, 1);
for (row = 0; row < size; row++) {
@@ -389,7 +389,7 @@
if (filters == 1) prow = pcol = 16;
#ifdef UFRAW_X_TRANS
- if (filters == 2) prow = pcol = 6;
+ if (filters == 9) prow = pcol = 6;
#endif
int *ipalloc = ip = (int *) calloc(prow * pcol, 1280);
merror(ip, "vng_interpolate()");
Index: ufraw_settings.cc
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_settings.cc,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- ufraw_settings.cc 1 Jan 2013 04:00:17 -0000 1.24
+++ ufraw_settings.cc 1 Jun 2013 18:30:58 -0000 1.25
@@ -354,7 +354,7 @@
return;
dcraw_data *raw = static_cast<dcraw_data *>(uf->raw);
- if (strcmp(uf->conf->make, raw->make) != 0 ||
+ if (strcasecmp(uf->conf->make, raw->make) != 0 ||
strcmp(uf->conf->model, raw->model) != 0)
uf->WBDirty = TRUE; // Re-calculate channel multipliers.
if (uf->LoadingID)
@@ -367,7 +367,7 @@
const wb_data *lastPreset = NULL;
uf->wb_presets_make_model_match = FALSE;
char model[max_name];
- if (strcmp(uf->conf->make, "MINOLTA") == 0 &&
+ if (strcasecmp(uf->conf->make, "Minolta") == 0 &&
(strncmp(uf->conf->model, "ALPHA", 5) == 0 ||
strncmp(uf->conf->model, "MAXXUM", 6) == 0)) {
/* Canonize Minolta model names (copied from dcraw) */
@@ -395,7 +395,7 @@
}
}
wb << new UFString(ufPreset, wb_preset[i].name);
- } else if (strcmp(wb_preset[i].make, uf->conf->make) == 0 &&
+ } else if (strcasecmp(wb_preset[i].make, uf->conf->make) == 0 &&
strcmp(wb_preset[i].model, model) == 0) {
/* Camera specific presets */
uf->wb_presets_make_model_match = TRUE;
Index: ufraw_preview.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_preview.c,v
retrieving revision 1.368
retrieving revision 1.369
diff -u -d -r1.368 -r1.369
--- ufraw_preview.c 21 May 2013 14:30:09 -0000 1.368
+++ ufraw_preview.c 1 Jun 2013 18:30:58 -0000 1.369
@@ -42,6 +42,16 @@
#define gdk_threads_add_idle_full g_idle_add_full
#endif
+#ifdef __MINGW32__
+#ifdef __MINGW64__
+#define uf_long gint64
+#else
+#define uf_long gint32
+#endif
+#else
+#define uf_long long
+#endif
+
void ufraw_chooser_toggle(GtkToggleButton *button, GtkFileChooser
*filechooser);
static void update_crop_ranges(preview_data *data, gboolean render);
@@ -1662,7 +1672,7 @@
static void remove_hue_event(GtkWidget *widget, gpointer user_data)
{
preview_data *data = get_preview_data(widget);
- long i = (long)user_data;
+ uf_long i = (uf_long)user_data;
for (; i < CFG->lightnessAdjustmentCount - 1; i++) {
CFG->lightnessAdjustment[i] = CFG->lightnessAdjustment[i + 1];
@@ -1728,7 +1738,7 @@
static void select_hue_event(GtkWidget *widget, gpointer user_data)
{
preview_data *data = get_preview_data(widget);
- long i = (long)user_data;
+ uf_long i = (uf_long)user_data;
if (data->FreezeDialog) return;
if (data->SpotX1 == -1) return;
@@ -2989,8 +2999,8 @@
return;
}
/* Do nothing if value didn't really change */
- long accuracy =
- (long)g_object_get_data(G_OBJECT(adj), "Adjustment-Accuracy");
+ uf_long accuracy =
+ (uf_long)g_object_get_data(G_OBJECT(adj), "Adjustment-Accuracy");
float change = fabs(*valuep - gtk_adjustment_get_value(adj));
float min_change = pow(10, -accuracy) / 2;
if (change < min_change)
@@ -3219,7 +3229,7 @@
static GtkAdjustment *adjustment_scale(GtkTable *table, int x, int y,
const char *label, double value, void
*valuep, double min, double max,
- double step, double jump, long
accuracy, const gboolean wrap_spinner,
+ double step, double jump, uf_long
accuracy, const gboolean wrap_spinner,
const char *tip, GCallback callback,
GtkWidget **resetButton,
const char *resetTip, GCallback
resetCallback)
{
@@ -3416,11 +3426,11 @@
{
preview_data *data = get_preview_data(widget);
GtkDialog *dialog;
- long type, index;
+ uf_long type, index;
dialog = GTK_DIALOG(gtk_widget_get_ancestor(widget, GTK_TYPE_DIALOG));
- type = (long)g_object_get_data(G_OBJECT(widget), "Type");
- index = (long)user_data;
+ type = (uf_long)g_object_get_data(G_OBJECT(widget), "Type");
+ index = (uf_long)user_data;
if (type < profile_types) {
gtk_combo_box_remove_text(data->ProfileCombo[type], index);
CFG->profileCount[type]--;
@@ -3504,7 +3514,8 @@
GtkTable *baseCurveTable, *curveTable;
GtkTextBuffer *confBuffer, *buffer;
char txt[max_name], *buf;
- long i, j, response;
+ uf_long i, j;
+ long response;
if (data->FreezeDialog) return;
data->OptionsChanged = FALSE;
@@ -3634,7 +3645,7 @@
label = gtk_label_new(txt);
gtk_table_attach_defaults(table, label, 0, 1, i, i + 1);
button = gtk_button_new_from_stock(GTK_STOCK_DELETE);
- g_object_set_data(G_OBJECT(button), "Type", (void*)j);
+ g_object_set_data(G_OBJECT(button), "Type", (gpointer)j);
g_signal_connect(G_OBJECT(button), "clicked",
G_CALLBACK(delete_from_list), (gpointer)i);
gtk_table_attach(table, button, 1, 2, i, i + 1, 0, 0, 0, 0);
@@ -3935,7 +3946,7 @@
data->FreezeDialog = TRUE;
GtkWindow *window = GTK_WINDOW(gtk_widget_get_toplevel(widget));
gtk_widget_set_sensitive(data->Controls, FALSE);
- long response = UFRAW_NO_RESPONSE;
+ uf_long response = UFRAW_NO_RESPONSE;
int status = UFRAW_SUCCESS;
// Switch from preview shrink/size to final shrink/size
@@ -4495,7 +4506,7 @@
static void lightness_fill_interface(preview_data *data, GtkWidget *page)
{
- long i;
+ uf_long i;
/* Start of Lightness Adjustments page */
GtkTable *table = GTK_TABLE(table_with_frame(page, NULL, TRUE));
@@ -4767,7 +4778,7 @@
GtkWidget *label;
GtkComboBox *combo;
int i;
- long j;
+ uf_long j;
/* Start of Color management page */
table = GTK_TABLE(table_with_frame(page, NULL, TRUE));
@@ -4799,7 +4810,7 @@
gtk_table_attach(table, GTK_WIDGET(data->ProfileCombo[j]),
1, 8, 4 * j + 1, 4 * j + 2, GTK_FILL, GTK_FILL, 0, 0);
button = stock_icon_button(GTK_STOCK_OPEN, NULL,
- G_CALLBACK(load_profile), (void *)j);
+ G_CALLBACK(load_profile), (gpointer)j);
gtk_table_attach(table, button, 8, 9, 4 * j + 1, 4 * j + 2,
GTK_SHRINK, GTK_FILL, 0, 0);
}
@@ -5439,7 +5450,8 @@
GdkRectangle screen;
int max_preview_width, max_preview_height;
int preview_width, preview_height, i, c;
- int status, curveeditorHeight;
+ int curveeditorHeight;
+ uf_long status;
preview_data PreviewData;
preview_data *data = &PreviewData;
@@ -5860,8 +5872,8 @@
data->OverUnderTicker = 0;
gtk_main();
- status = (long)g_object_get_data(G_OBJECT(previewWindow),
- "WindowResponse");
+ status = (uf_long)g_object_get_data(G_OBJECT(previewWindow),
+ "WindowResponse");
gtk_container_foreach(GTK_CONTAINER(previewVBox),
(GtkCallback)(expander_state), NULL);
Index: ufraw.h
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw.h,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -d -r1.169 -r1.170
--- ufraw.h 26 Mar 2013 16:30:12 -0000 1.169
+++ ufraw.h 1 Jun 2013 18:30:58 -0000 1.170
@@ -24,6 +24,10 @@
#include "nikon_curve.h"
#include "uf_progress.h"
+#ifndef HAVE_STRCASECMP
+#define strcasecmp stricmp
+#endif
+
/* macro to clamp a number between two values */
#ifndef LIM
#define LIM(x,min,max) MAX(min,MIN(x,max))
Index: ufraw_ufraw.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_ufraw.c,v
retrieving revision 1.274
retrieving revision 1.275
diff -u -d -r1.274 -r1.275
--- ufraw_ufraw.c 12 Mar 2013 04:42:35 -0000 1.274
+++ ufraw_ufraw.c 1 Jun 2013 18:30:58 -0000 1.275
@@ -667,7 +667,7 @@
}
uf->raw_multiplier = ufraw_scale_raw(raw);
/* Canon EOS cameras require special exposure normalization */
- if (strcmp(uf->conf->make, "Canon") == 0 &&
+ if (strcasecmp(uf->conf->make, "Canon") == 0 &&
strncmp(uf->conf->model, "EOS", 3) == 0) {
int c, max = raw->cam_mul[0];
for (c = 1; c < raw->colors; c++) max = MAX(raw->cam_mul[c], max);
@@ -2036,7 +2036,7 @@
} else {
int lastTuning = -1;
char model[max_name];
- if (strcmp(uf->conf->make, "MINOLTA") == 0 &&
+ if (strcasecmp(uf->conf->make, "Minolta") == 0 &&
(strncmp(uf->conf->model, "ALPHA", 5) == 0 ||
strncmp(uf->conf->model, "MAXXUM", 6) == 0)) {
/* Canonize Minolta model names (copied from dcraw) */
@@ -2047,7 +2047,7 @@
}
for (i = 0; i < wb_preset_count; i++) {
if (ufarray_is_equal(wb, wb_preset[i].name) &&
- !strcmp(uf->conf->make, wb_preset[i].make) &&
+ !strcasecmp(uf->conf->make, wb_preset[i].make) &&
!strcmp(model, wb_preset[i].model)) {
if (ufnumber_value(wbTuning) == wb_preset[i].tuning) {
double chanMulArray[4] = {1, 1, 1, 1 };
Index: ufraw_lensfun.cc
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_lensfun.cc,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- ufraw_lensfun.cc 1 Jan 2013 04:00:17 -0000 1.31
+++ ufraw_lensfun.cc 1 Jun 2013 18:30:58 -0000 1.32
@@ -675,7 +675,7 @@
double crop_factor = 1.0;
int count = sscanf(model, "Crop factor %lf", &crop_factor);
if ((strcmp(make, "Generic") == 0 && count == 1) ||
- (strcmp(make, "") == 0 && strcmp(model, "") == 0)) {
+ (strcasecmp(make, "") == 0 && strcmp(model, "") == 0)) {
lfLens cropLens;
cropLens.SetMaker(make);
cropLens.SetModel(model);
------------------------------------------------------------------------------
Get 100% visibility into Java/.NET code with AppDynamics Lite
It's a free troubleshooting tool designed for production
Get down to code-level detail for bottlenecks, with <2% overhead.
Download for free and get started troubleshooting in minutes.
http://p.sf.net/sfu/appdyn_d2d_ap2
_______________________________________________
ufraw-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ufraw-cvs
