[gimp] Bug 765180 - Hard-coded NTSC parameters in babl/GEGL/GIMP
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] Bug 765180 - Hard-coded NTSC parameters in babl/GEGL/GIMP
- Date: Sun, 17 Apr 2016 16:52:59 +0000 (UTC)
commit f7fc87884e932f920285b999ff74df79bf8cd71b
Author: Michael Natterer <mitch gimp org>
Date: Sun Apr 17 17:51:14 2016 +0100
Bug 765180 - Hard-coded NTSC parameters in babl/GEGL/GIMP
Port GimpColorWheel to GIMP_RGB_LUMINANCE().
modules/gimpcolorwheel.c | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/modules/gimpcolorwheel.c b/modules/gimpcolorwheel.c
index 4030f83..af97e00 100644
--- a/modules/gimpcolorwheel.c
+++ b/modules/gimpcolorwheel.c
@@ -30,9 +30,12 @@
#include "config.h"
+#include <gegl.h>
+
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
+#include <libgimpcolor/gimpcolor.h>
#include <libgimpmath/gimpmath.h>
#include "gimpcolorwheel.h"
@@ -347,8 +350,6 @@ gimp_color_wheel_size_allocate (GtkWidget *widget,
/* Utility functions */
-#define INTENSITY(r, g, b) ((r) * 0.30 + (g) * 0.59 + (b) * 0.11)
-
/* Converts from HSV to RGB */
static void
hsv_to_rgb (gdouble *h,
@@ -875,7 +876,7 @@ paint_ring (GimpColorWheel *wheel,
b = 1.0;
hsv_to_rgb (&r, &g, &b);
- if (INTENSITY (r, g, b) > 0.5)
+ if (GIMP_RGB_LUMINANCE (r, g, b) > 0.5)
cairo_set_source_rgb (source_cr, 0., 0., 0.);
else
cairo_set_source_rgb (source_cr, 1., 1., 1.);
@@ -1099,7 +1100,7 @@ paint_triangle (GimpColorWheel *wheel,
b = priv->v;
hsv_to_rgb (&r, &g, &b);
- if (INTENSITY (r, g, b) > 0.5)
+ if (GIMP_RGB_LUMINANCE (r, g, b) > 0.5)
{
detail = "colorwheel_light";
cairo_set_source_rgb (cr, 0., 0., 0.);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]