[gimp] app: out-of-gamut for grayscale images too in GimpFgBgEditor.
- From: Jehan <jehanp src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] app: out-of-gamut for grayscale images too in GimpFgBgEditor.
- Date: Wed, 13 Feb 2019 14:51:21 +0000 (UTC)
commit 9090de96f2ec1aa48e3f2fb4750b0e4d4227f4e2
Author: Jehan <jehan girinstud io>
Date: Wed Feb 13 15:48:27 2019 +0100
app: out-of-gamut for grayscale images too in GimpFgBgEditor.
I realized that the same issue as for indexed images could also apply to
grayscale. If your fg/bg colors are not gray, it should not be expected
for them to be paintable. So let's give the out-of-gamut hint.
app/widgets/gimpfgbgeditor.c | 58 +++++++++++++++++++++++++++++---------------
1 file changed, 39 insertions(+), 19 deletions(-)
---
diff --git a/app/widgets/gimpfgbgeditor.c b/app/widgets/gimpfgbgeditor.c
index e11d3c6c20..bb56a17d11 100644
--- a/app/widgets/gimpfgbgeditor.c
+++ b/app/widgets/gimpfgbgeditor.c
@@ -44,6 +44,7 @@
#include "gimpfgbgeditor.h"
#include "gimpwidgets-utils.h"
+#define CHANNEL_EPSILON 1e-3
enum
{
@@ -287,18 +288,19 @@ static gboolean
gimp_fg_bg_editor_draw (GtkWidget *widget,
cairo_t *cr)
{
- GimpFgBgEditor *editor = GIMP_FG_BG_EDITOR (widget);
- GtkStyleContext *style = gtk_widget_get_style_context (widget);
- GimpPalette *colormap_palette = NULL;
- GtkBorder border;
- GtkBorder padding;
- GdkRectangle rect;
- gint scale_factor;
- gint width, height;
- gint default_w, default_h;
- gint swap_w, swap_h;
- GimpRGB color;
- GimpRGB transformed_color;
+ GimpFgBgEditor *editor = GIMP_FG_BG_EDITOR (widget);
+ GtkStyleContext *style = gtk_widget_get_style_context (widget);
+ GimpPalette *colormap_palette = NULL;
+ GtkBorder border;
+ GtkBorder padding;
+ GdkRectangle rect;
+ gint scale_factor;
+ gint width, height;
+ gint default_w, default_h;
+ gint swap_w, swap_h;
+ GimpRGB color;
+ GimpRGB transformed_color;
+ GimpImageBaseType base_type = GIMP_RGB;
gtk_style_context_save (style);
@@ -383,9 +385,13 @@ gimp_fg_bg_editor_draw (GtkWidget *widget,
if (! editor->transform)
gimp_fg_bg_editor_create_transform (editor);
- if (gimp_context_get_image (editor->context) &&
- gimp_image_get_base_type (gimp_context_get_image (editor->context)) == GIMP_INDEXED)
- colormap_palette = gimp_image_get_colormap_palette (editor->active_image);
+ if (editor->active_image)
+ {
+ base_type = gimp_image_get_base_type (editor->active_image);
+
+ if (base_type == GIMP_INDEXED)
+ colormap_palette = gimp_image_get_colormap_palette (editor->active_image);
+ }
/* draw the background area */
@@ -413,10 +419,17 @@ gimp_fg_bg_editor_draw (GtkWidget *widget,
if (editor->color_config &&
+ /* Common out-of-gamut case */
((color.r < 0.0 || color.r > 1.0 ||
color.g < 0.0 || color.g > 1.0 ||
color.b < 0.0 || color.b > 1.0) ||
- (colormap_palette && ! gimp_palette_find_entry (colormap_palette, &color, NULL))))
+ /* Indexed images */
+ (colormap_palette && ! gimp_palette_find_entry (colormap_palette, &color, NULL)) ||
+ /* Grayscale images */
+ (base_type == GIMP_GRAY &&
+ (ABS (color.r - color.g) > CHANNEL_EPSILON ||
+ ABS (color.r - color.b) > CHANNEL_EPSILON ||
+ ABS (color.g - color.b) > CHANNEL_EPSILON))))
{
GimpRGB color;
gint side = MIN (rect.width, rect.height) * 2 / 3;
@@ -470,10 +483,17 @@ gimp_fg_bg_editor_draw (GtkWidget *widget,
cairo_fill (cr);
if (editor->color_config &&
+ /* Common out-of-gamut case */
((color.r < 0.0 || color.r > 1.0 ||
- color.g < 0.0 || color.g > 1.0 ||
- color.b < 0.0 || color.b > 1.0) ||
- (colormap_palette && ! gimp_palette_find_entry (colormap_palette, &color, NULL))))
+ color.g < 0.0 || color.g > 1.0 ||
+ color.b < 0.0 || color.b > 1.0) ||
+ /* Indexed images */
+ (colormap_palette && ! gimp_palette_find_entry (colormap_palette, &color, NULL)) ||
+ /* Grayscale images */
+ (base_type == GIMP_GRAY &&
+ (ABS (color.r - color.g) > CHANNEL_EPSILON ||
+ ABS (color.r - color.b) > CHANNEL_EPSILON ||
+ ABS (color.g - color.b) > CHANNEL_EPSILON))))
{
GimpRGB color;
gint side = MIN (rect.width, rect.height) * 2 / 3;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]