[gimp] libgimpwidgets: return an opaque color from gimp_pick_button_pick()'s OSX code
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] libgimpwidgets: return an opaque color from gimp_pick_button_pick()'s OSX code
- Date: Fri, 11 Oct 2013 20:53:38 +0000 (UTC)
commit 5466caa0646ad8da028d189088ed3b21f48ecc3f
Author: Michael Natterer <mitch gimp org>
Date: Fri Oct 11 22:52:38 2013 +0200
libgimpwidgets: return an opaque color from gimp_pick_button_pick()'s OSX code
and fiddle with whitespace a bit.
libgimpwidgets/gimppickbutton.c | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/libgimpwidgets/gimppickbutton.c b/libgimpwidgets/gimppickbutton.c
index ddc073d..968a2d3 100644
--- a/libgimpwidgets/gimppickbutton.c
+++ b/libgimpwidgets/gimppickbutton.c
@@ -357,7 +357,8 @@ gimp_pick_button_pick (GdkScreen *screen,
gint y_root,
GimpPickButton *button)
{
- #ifndef GDK_WINDOWING_QUARTZ
+#ifndef GDK_WINDOWING_QUARTZ
+
GdkWindow *root_window = gdk_screen_get_root_window (screen);
cairo_surface_t *image;
cairo_t *cr;
@@ -381,7 +382,8 @@ gimp_pick_button_pick (GdkScreen *screen,
gimp_rgba_set_uchar (&rgb, color[0], color[1], color[2], 1.0);
- #else /* GDK_WINDOWING_QUARTZ */
+#else /* GDK_WINDOWING_QUARTZ */
+
CGImageRef root_image_ref;
CFDataRef pixel_data;
const guchar *data;
@@ -395,11 +397,12 @@ gimp_pick_button_pick (GdkScreen *screen,
pixel_data = CGDataProviderCopyData(CGImageGetDataProvider(root_image_ref));
data = CFDataGetBytePtr(pixel_data);
- gimp_rgba_set_uchar (&rgb, data[2], data[1], data[0], 1.0);
+ gimp_rgba_set_uchar (&rgb, data[2], data[1], data[0], 255);
CGImageRelease (root_image_ref);
CFRelease (pixel_data);
- #endif /* GDK_WINDOWING_QUARTZ */
+
+#endif /* GDK_WINDOWING_QUARTZ */
g_signal_emit (button, pick_button_signals[COLOR_PICKED], 0, &rgb);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]