dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Jehan 2019-02-13 15:48:27 +01:00
parent 7b4c96d03d
commit 9090de96f2
1 changed files with 39 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
app/widgets/gimpfgbgeditor.c
View File

@ -44,6 +44,7 @@
#include "gimpfgbgeditor.h" #include "gimpfgbgeditor.h"
#include "gimpwidgets-utils.h" #include "gimpwidgets-utils.h"
#define CHANNEL_EPSILON 1e-3
enum enum
{ {
@ -287,18 +288,19 @@ static gboolean
gimp_fg_bg_editor_draw (GtkWidget *widget, gimp_fg_bg_editor_draw (GtkWidget *widget,
cairo_t *cr) cairo_t *cr)
{ {
GimpFgBgEditor *editor = GIMP_FG_BG_EDITOR (widget); GimpFgBgEditor *editor = GIMP_FG_BG_EDITOR (widget);
GtkStyleContext *style = gtk_widget_get_style_context (widget); GtkStyleContext *style = gtk_widget_get_style_context (widget);
GimpPalette *colormap_palette = NULL; GimpPalette *colormap_palette = NULL;
GtkBorder border; GtkBorder border;
GtkBorder padding; GtkBorder padding;
GdkRectangle rect; GdkRectangle rect;
gint scale_factor; gint scale_factor;
gint width, height; gint width, height;
gint default_w, default_h; gint default_w, default_h;
gint swap_w, swap_h; gint swap_w, swap_h;
GimpRGB color; GimpRGB color;
GimpRGB transformed_color; GimpRGB transformed_color;
GimpImageBaseType base_type = GIMP_RGB;
gtk_style_context_save (style); gtk_style_context_save (style);
@ -383,9 +385,13 @@ gimp_fg_bg_editor_draw (GtkWidget *widget,
if (! editor->transform) if (! editor->transform)
gimp_fg_bg_editor_create_transform (editor); gimp_fg_bg_editor_create_transform (editor);
if (gimp_context_get_image (editor->context) && if (editor->active_image)
gimp_image_get_base_type (gimp_context_get_image (editor->context)) == GIMP_INDEXED) {
colormap_palette = gimp_image_get_colormap_palette (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 */ /* draw the background area */
@ -413,10 +419,17 @@ gimp_fg_bg_editor_draw (GtkWidget *widget,
if (editor->color_config && if (editor->color_config &&
/* Common out-of-gamut case */
((color.r < 0.0 || color.r > 1.0 || ((color.r < 0.0 || color.r > 1.0 ||
color.g < 0.0 || color.g > 1.0 || color.g < 0.0 || color.g > 1.0 ||
color.b < 0.0 || color.b > 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; GimpRGB color;
gint side = MIN (rect.width, rect.height) * 2 / 3; gint side = MIN (rect.width, rect.height) * 2 / 3;
@ -470,10 +483,17 @@ gimp_fg_bg_editor_draw (GtkWidget *widget,
cairo_fill (cr); cairo_fill (cr);
if (editor->color_config && if (editor->color_config &&
/* Common out-of-gamut case */
((color.r < 0.0 || color.r > 1.0 || ((color.r < 0.0 || color.r > 1.0 ||
color.g < 0.0 || color.g > 1.0 || color.g < 0.0 || color.g > 1.0 ||
color.b < 0.0 || color.b > 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; GimpRGB color;
gint side = MIN (rect.width, rect.height) * 2 / 3; gint side = MIN (rect.width, rect.height) * 2 / 3;