Update of /cvsroot/ufraw/ufraw
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv429
Modified Files:
ufraw_preview.c
Log Message:
Simplify latest commit.
Index: ufraw_preview.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_preview.c,v
retrieving revision 1.367
retrieving revision 1.368
diff -u -d -r1.367 -r1.368
--- ufraw_preview.c 19 May 2013 05:00:09 -0000 1.367
+++ ufraw_preview.c 21 May 2013 14:30:09 -0000 1.368
@@ -37,6 +37,11 @@
#define uf_omp_get_max_threads() 1
#endif
+#ifdef _WIN32 /* GDK threads are not supported on the Windows platform. */
+#define gdk_threads_add_timeout g_timeout_add
+#define gdk_threads_add_idle_full g_idle_add_full
+#endif
+
void ufraw_chooser_toggle(GtkToggleButton *button, GtkFileChooser
*filechooser);
static void update_crop_ranges(preview_data *data, gboolean render);
@@ -704,11 +709,7 @@
{
if (CFG->blinkOverUnder && (CFG->overExp || CFG->underExp)) {
if (!data->BlinkTimer) {
-#ifndef _WIN32
data->BlinkTimer = gdk_threads_add_timeout(500,
-#else
- data->BlinkTimer = g_timeout_add(500,
-#endif
switch_highlights, data);
}
}
@@ -972,11 +973,7 @@
{
while (g_idle_remove_by_data(data))
;
-#ifndef _WIN32
gdk_threads_add_idle_full(G_PRIORITY_DEFAULT_IDLE,
-#else
- g_idle_add_full(G_PRIORITY_DEFAULT_IDLE,
-#endif
(GSourceFunc)(render_preview_now), data, NULL);
}
@@ -1186,23 +1183,11 @@
}
if (!again) {
preview_progress_disable(data);
-#ifndef _WIN32
gdk_threads_add_idle_full(G_PRIORITY_DEFAULT_IDLE,
-#else
- g_idle_add_full(G_PRIORITY_DEFAULT_IDLE,
-#endif
(GSourceFunc)(render_raw_histogram), data,
NULL);
-#ifndef _WIN32
gdk_threads_add_idle_full(G_PRIORITY_DEFAULT_IDLE,
-#else
- g_idle_add_full(G_PRIORITY_DEFAULT_IDLE,
-#endif
(GSourceFunc)(render_live_histogram), data,
NULL);
-#ifndef _WIN32
gdk_threads_add_idle_full(G_PRIORITY_DEFAULT_IDLE,
-#else
- g_idle_add_full(G_PRIORITY_DEFAULT_IDLE,
-#endif
(GSourceFunc)(render_spot), data, NULL);
}
return again;
@@ -1813,11 +1798,7 @@
data->SpotX1 = data->SpotX2 = event->x;
data->SpotY1 = data->SpotY2 = event->y;
if (!is_rendering(data))
-#ifndef _WIN32
gdk_threads_add_idle_full(G_PRIORITY_DEFAULT_IDLE,
-#else
- g_idle_add_full(G_PRIORITY_DEFAULT_IDLE,
-#endif
(GSourceFunc)(render_spot), data, NULL);
return TRUE;
}
@@ -1956,11 +1937,7 @@
data->SpotX2 = event->x;
data->SpotY2 = event->y;
if (!is_rendering(data))
-#ifndef _WIN32
gdk_threads_add_idle_full(G_PRIORITY_DEFAULT_IDLE,
-#else
- g_idle_add_full(G_PRIORITY_DEFAULT_IDLE,
-#endif
(GSourceFunc)(render_spot), data, NULL);
return TRUE;
}
@@ -2091,19 +2068,11 @@
if (CFG->drawLines > 0 && data->BlinkTimer == 0) {
if (data->DrawCropID != 0)
g_source_remove(data->DrawCropID);
-#ifndef _WIN32
data->DrawCropID = gdk_threads_add_idle_full(G_PRIORITY_DEFAULT_IDLE +
30,
-#else
- data->DrawCropID = g_idle_add_full(G_PRIORITY_DEFAULT_IDLE + 30,
-#endif
(GSourceFunc)(preview_draw_crop), data, NULL);
}
if (!is_rendering(data))
-#ifndef _WIN32
gdk_threads_add_idle_full(G_PRIORITY_DEFAULT_IDLE,
-#else
- g_idle_add_full(G_PRIORITY_DEFAULT_IDLE,
-#endif
(GSourceFunc)(render_live_histogram), data,
NULL);
}
@@ -2896,11 +2865,7 @@
if (valuep == &CFG->drawLines) {
if (data->DrawCropID != 0)
g_source_remove(data->DrawCropID);
-#ifndef _WIN32
data->DrawCropID = gdk_threads_add_idle_full(G_PRIORITY_DEFAULT_IDLE +
30,
-#else
- data->DrawCropID = g_idle_add_full(G_PRIORITY_DEFAULT_IDLE + 30,
-#endif
(GSourceFunc)(preview_draw_crop), data, NULL);
}
}
@@ -3940,11 +3905,7 @@
rawHisHeight = data->RawHisto->allocation.height;
if (pixbuf == NULL || gdk_pixbuf_get_height(pixbuf) != rawHisHeight)
if (rawExpanded)
-#ifndef _WIN32
gdk_threads_add_idle_full(G_PRIORITY_DEFAULT_IDLE,
-#else
- g_idle_add_full(G_PRIORITY_DEFAULT_IDLE,
-#endif
(GSourceFunc)(render_raw_histogram),
data, NULL);
@@ -3952,11 +3913,7 @@
liveHisHeight = data->LiveHisto->allocation.height;
if (pixbuf == NULL || gdk_pixbuf_get_height(pixbuf) != liveHisHeight)
if (liveExpanded)
-#ifndef _WIN32
gdk_threads_add_idle_full(G_PRIORITY_DEFAULT_IDLE,
-#else
- g_idle_add_full(G_PRIORITY_DEFAULT_IDLE,
-#endif
(GSourceFunc)(render_live_histogram),
data, NULL);
}
------------------------------------------------------------------------------
Try New Relic Now & We'll Send You this Cool Shirt
New Relic is the only SaaS-based application performance monitoring service
that delivers powerful full stack analytics. Optimize and monitor your
browser, app, & servers with just a few lines of code. Try New Relic
and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_may
_______________________________________________
ufraw-cvs mailing list
ufraw-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ufraw-cvs
