procyberian/gimp
2
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gimp.git synced 2025-07-04 01:43:24 +00:00
Code Issues 1 Projects 1 Releases Packages Wiki Activity Actions

app: rename "Color (HSV) (legacy)" mode to "Color (HSL) (legacy)"

Browse source 
The color-space qualification is, in fact, a 2.9 thing, so there's no
historic reason to keep the wrong name for the legacy mode.
This commit is contained in:
Ell 2017-03-16 06:17:05 -04:00
parent da9c4270a6
commit 03756d0980
15 changed files with 45 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/core/gimpimage.c
View file

@ -2407,7 +2407,7 @@ gimp_image_get_xcf_version (GimpImage *image,
case GIMP_LAYER_MODE_LIGHTEN_ONLY_LEGACY:
case GIMP_LAYER_MODE_HSV_HUE_LEGACY:
case GIMP_LAYER_MODE_HSV_SATURATION_LEGACY:
case GIMP_LAYER_MODE_HSV_COLOR_LEGACY:
case GIMP_LAYER_MODE_HSL_COLOR_LEGACY:
case GIMP_LAYER_MODE_HSV_VALUE_LEGACY:
case GIMP_LAYER_MODE_DIVIDE_LEGACY:
case GIMP_LAYER_MODE_DODGE_LEGACY:

4
app/operations/gimp-operations.c
View file

@ -73,7 +73,7 @@
#include "layer-modes-legacy/gimpoperationgrainextractlegacy.h"
#include "layer-modes-legacy/gimpoperationgrainmergelegacy.h"
#include "layer-modes-legacy/gimpoperationhardlightlegacy.h"
#include "layer-modes-legacy/gimpoperationhsvcolorlegacy.h"
#include "layer-modes-legacy/gimpoperationhslcolorlegacy.h"
#include "layer-modes-legacy/gimpoperationhsvhuelegacy.h"
#include "layer-modes-legacy/gimpoperationhsvsaturationlegacy.h"
#include "layer-modes-legacy/gimpoperationhsvvaluelegacy.h"
@ -139,7 +139,7 @@ gimp_operations_init (void)
g_type_class_ref (GIMP_TYPE_OPERATION_LIGHTEN_ONLY_LEGACY);
g_type_class_ref (GIMP_TYPE_OPERATION_HSV_HUE_LEGACY);
g_type_class_ref (GIMP_TYPE_OPERATION_HSV_SATURATION_LEGACY);
g_type_class_ref (GIMP_TYPE_OPERATION_HSV_COLOR_LEGACY);
g_type_class_ref (GIMP_TYPE_OPERATION_HSL_COLOR_LEGACY);
g_type_class_ref (GIMP_TYPE_OPERATION_HSV_VALUE_LEGACY);
g_type_class_ref (GIMP_TYPE_OPERATION_DIVIDE_LEGACY);
g_type_class_ref (GIMP_TYPE_OPERATION_DODGE_LEGACY);

4
app/operations/layer-modes-legacy/Makefile.am
View file

@ -33,8 +33,8 @@ libapplayermodeslegacy_a_SOURCES = \
gimpoperationgrainmergelegacy.h \
gimpoperationhardlightlegacy.c \
gimpoperationhardlightlegacy.h \
gimpoperationhsvcolorlegacy.c \
gimpoperationhsvcolorlegacy.h \
gimpoperationhslcolorlegacy.c \
gimpoperationhslcolorlegacy.h \
gimpoperationhsvhuelegacy.c \
gimpoperationhsvhuelegacy.h \
gimpoperationhsvsaturationlegacy.c \

14
app/operations/layer-modes-legacy/gimpoperationhsvcolorlegacy.c → app/operations/layer-modes-legacy/gimpoperationhslcolorlegacy.c
View file

@ -29,15 +29,15 @@
#include "../operations-types.h"
#include "gimpoperationhsvcolorlegacy.h"
#include "gimpoperationhslcolorlegacy.h"
G_DEFINE_TYPE (GimpOperationHsvColorLegacy, gimp_operation_hsv_color_legacy,
G_DEFINE_TYPE (GimpOperationHslColorLegacy, gimp_operation_hsl_color_legacy,
GIMP_TYPE_OPERATION_LAYER_MODE)
static void
gimp_operation_hsv_color_legacy_class_init (GimpOperationHsvColorLegacyClass *klass)
gimp_operation_hsl_color_legacy_class_init (GimpOperationHslColorLegacyClass *klass)
{
GeglOperationClass *operation_class;
GeglOperationPointComposer3Class *point_class;
@ -46,20 +46,20 @@ gimp_operation_hsv_color_legacy_class_init (GimpOperationHsvColorLegacyClass *kl
point_class = GEGL_OPERATION_POINT_COMPOSER3_CLASS (klass);
gegl_operation_class_set_keys (operation_class,
"name", "gimp:hsv-color-legacy",
"name", "gimp:hsl-color-legacy",
"description", "GIMP color mode operation",
NULL);
point_class->process = gimp_operation_hsv_color_legacy_process;
point_class->process = gimp_operation_hsl_color_legacy_process;
}
static void
gimp_operation_hsv_color_legacy_init (GimpOperationHsvColorLegacy *self)
gimp_operation_hsl_color_legacy_init (GimpOperationHslColorLegacy *self)
{
}
gboolean
gimp_operation_hsv_color_legacy_process (GeglOperation *op,
gimp_operation_hsl_color_legacy_process (GeglOperation *op,
void *in_p,
void *layer_p,
void *mask_p,

32
app/operations/layer-modes-legacy/gimpoperationhsvcolorlegacy.h → app/operations/layer-modes-legacy/gimpoperationhslcolorlegacy.h
View file

@ -1,7 +1,7 @@
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* gimpoperationhsvcolorlegacy.h
* gimpoperationhslcolorlegacy.h
* Copyright (C) 2008 Michael Natterer <mitch@gimp.org>
*
* This program is free software: you can redistribute it and/or modify
@ -18,38 +18,38 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __GIMP_OPERATION_HSV_COLOR_LEGACY_H__
#define __GIMP_OPERATION_HSV_COLOR_LEGACY_H__
#ifndef __GIMP_OPERATION_HSL_COLOR_LEGACY_H__
#define __GIMP_OPERATION_HSL_COLOR_LEGACY_H__
#include "operations/layer-modes/gimpoperationlayermode.h"
#define GIMP_TYPE_OPERATION_HSV_COLOR_LEGACY (gimp_operation_hsv_color_legacy_get_type ())
#define GIMP_OPERATION_HSV_COLOR_LEGACY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_OPERATION_HSV_COLOR_LEGACY, GimpOperationHsvColorLegacy))
#define GIMP_OPERATION_HSV_COLOR_LEGACY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_OPERATION_HSV_COLOR_LEGACY, GimpOperationHsvColorLegacyClass))
#define GIMP_IS_OPERATION_HSV_COLOR_LEGACY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_OPERATION_HSV_COLOR_LEGACY))
#define GIMP_IS_OPERATION_HSV_COLOR_LEGACY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_OPERATION_HSV_COLOR_LEGACY))
#define GIMP_OPERATION_HSV_COLOR_LEGACY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_OPERATION_HSV_COLOR_LEGACY, GimpOperationHsvColorLegacyClass))
#define GIMP_TYPE_OPERATION_HSL_COLOR_LEGACY (gimp_operation_hsl_color_legacy_get_type ())
#define GIMP_OPERATION_HSL_COLOR_LEGACY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_OPERATION_HSL_COLOR_LEGACY, GimpOperationHslColorLegacy))
#define GIMP_OPERATION_HSL_COLOR_LEGACY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_OPERATION_HSL_COLOR_LEGACY, GimpOperationHslColorLegacyClass))
#define GIMP_IS_OPERATION_HSL_COLOR_LEGACY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_OPERATION_HSL_COLOR_LEGACY))
#define GIMP_IS_OPERATION_HSL_COLOR_LEGACY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_OPERATION_HSL_COLOR_LEGACY))
#define GIMP_OPERATION_HSL_COLOR_LEGACY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_OPERATION_HSL_COLOR_LEGACY, GimpOperationHslColorLegacyClass))
typedef struct _GimpOperationHsvColorLegacy GimpOperationHsvColorLegacy;
typedef struct _GimpOperationHsvColorLegacyClass GimpOperationHsvColorLegacyClass;
typedef struct _GimpOperationHslColorLegacy GimpOperationHslColorLegacy;
typedef struct _GimpOperationHslColorLegacyClass GimpOperationHslColorLegacyClass;
struct _GimpOperationHsvColorLegacy
struct _GimpOperationHslColorLegacy
{
GimpOperationLayerMode parent_instance;
};
struct _GimpOperationHsvColorLegacyClass
struct _GimpOperationHslColorLegacyClass
{
GimpOperationLayerModeClass parent_class;
};
GType gimp_operation_hsv_color_legacy_get_type (void) G_GNUC_CONST;
GType gimp_operation_hsl_color_legacy_get_type (void) G_GNUC_CONST;
gboolean gimp_operation_hsv_color_legacy_process (GeglOperation *op,
gboolean gimp_operation_hsl_color_legacy_process (GeglOperation *op,
void *in,
void *layer,
void *mask,
@ -59,4 +59,4 @@ gboolean gimp_operation_hsv_color_legacy_process (GeglOperation *op,
gint level);
#endif /* __GIMP_OPERATION_HSV_COLOR_LEGACY_H__ */
#endif /* __GIMP_OPERATION_HSL_COLOR_LEGACY_H__ */

13
app/operations/layer-modes/gimp-layer-modes.c
View file

@ -34,7 +34,7 @@
#include "operations/layer-modes-legacy/gimpoperationgrainextractlegacy.h"
#include "operations/layer-modes-legacy/gimpoperationgrainmergelegacy.h"
#include "operations/layer-modes-legacy/gimpoperationhardlightlegacy.h"
#include "operations/layer-modes-legacy/gimpoperationhsvcolorlegacy.h"
#include "operations/layer-modes-legacy/gimpoperationhslcolorlegacy.h"
#include "operations/layer-modes-legacy/gimpoperationhsvhuelegacy.h"
#include "operations/layer-modes-legacy/gimpoperationhsvsaturationlegacy.h"
#include "operations/layer-modes-legacy/gimpoperationhsvvaluelegacy.h"
@ -266,10 +266,10 @@ static const GimpLayerModeInfo layer_mode_infos[] =
.blend_space = GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL
},
{ GIMP_LAYER_MODE_HSV_COLOR_LEGACY,
{ GIMP_LAYER_MODE_HSL_COLOR_LEGACY,
.op_name = "gimp:hsv-color-legacy",
.function = gimp_operation_hsv_color_legacy_process,
.op_name = "gimp:hsl-color-legacy",
.function = gimp_operation_hsl_color_legacy_process,
.flags = GIMP_LAYER_MODE_FLAG_LEGACY |
GIMP_LAYER_MODE_FLAG_BLEND_SPACE_IMMUTABLE |
GIMP_LAYER_MODE_FLAG_COMPOSITE_SPACE_IMMUTABLE |
@ -977,7 +977,7 @@ static const GimpLayerMode layer_mode_group_legacy[] =
GIMP_LAYER_MODE_HSV_HUE_LEGACY,
GIMP_LAYER_MODE_HSV_SATURATION_LEGACY,
GIMP_LAYER_MODE_HSV_COLOR_LEGACY,
GIMP_LAYER_MODE_HSL_COLOR_LEGACY,
GIMP_LAYER_MODE_HSV_VALUE_LEGACY
};
@ -1036,8 +1036,7 @@ static const GimpLayerMode layer_mode_groups[][2] =
},
{ [GIMP_LAYER_MODE_GROUP_DEFAULT] = GIMP_LAYER_MODE_HSL_COLOR,
[GIMP_LAYER_MODE_GROUP_LEGACY ] = GIMP_LAYER_MODE_HSV_COLOR_LEGACY
/* HSV_COLOR_LEGACY actually uses HSL */
[GIMP_LAYER_MODE_GROUP_LEGACY ] = GIMP_LAYER_MODE_HSL_COLOR_LEGACY
},
{ [GIMP_LAYER_MODE_GROUP_DEFAULT] = GIMP_LAYER_MODE_HSV_VALUE,

2
app/operations/layer-modes/gimpoperationlayermode.c
View file

@ -2500,7 +2500,7 @@ gimp_layer_mode_get_blend_fun (GimpLayerMode mode)
case GIMP_LAYER_MODE_LIGHTEN_ONLY_LEGACY:
case GIMP_LAYER_MODE_HSV_HUE_LEGACY:
case GIMP_LAYER_MODE_HSV_SATURATION_LEGACY:
case GIMP_LAYER_MODE_HSV_COLOR_LEGACY:
case GIMP_LAYER_MODE_HSL_COLOR_LEGACY:
case GIMP_LAYER_MODE_HSV_VALUE_LEGACY:
case GIMP_LAYER_MODE_DIVIDE_LEGACY:
case GIMP_LAYER_MODE_DODGE_LEGACY:

4
app/operations/operations-enums.c
View file

@ -94,7 +94,7 @@ gimp_layer_mode_get_type (void)
{ GIMP_LAYER_MODE_LIGHTEN_ONLY_LEGACY, "GIMP_LAYER_MODE_LIGHTEN_ONLY_LEGACY", "lighten-only-legacy" },
{ GIMP_LAYER_MODE_HSV_HUE_LEGACY, "GIMP_LAYER_MODE_HSV_HUE_LEGACY", "hsv-hue-legacy" },
{ GIMP_LAYER_MODE_HSV_SATURATION_LEGACY, "GIMP_LAYER_MODE_HSV_SATURATION_LEGACY", "hsv-saturation-legacy" },
{ GIMP_LAYER_MODE_HSV_COLOR_LEGACY, "GIMP_LAYER_MODE_HSV_COLOR_LEGACY", "hsv-color-legacy" },
{ GIMP_LAYER_MODE_HSL_COLOR_LEGACY, "GIMP_LAYER_MODE_HSL_COLOR_LEGACY", "hsl-color-legacy" },
{ GIMP_LAYER_MODE_HSV_VALUE_LEGACY, "GIMP_LAYER_MODE_HSV_VALUE_LEGACY", "hsv-value-legacy" },
{ GIMP_LAYER_MODE_DIVIDE_LEGACY, "GIMP_LAYER_MODE_DIVIDE_LEGACY", "divide-legacy" },
{ GIMP_LAYER_MODE_DODGE_LEGACY, "GIMP_LAYER_MODE_DODGE_LEGACY", "dodge-legacy" },
@ -162,7 +162,7 @@ gimp_layer_mode_get_type (void)
{ GIMP_LAYER_MODE_LIGHTEN_ONLY_LEGACY, NC_("layer-mode", "Lighten only (legacy)"), NULL },
{ GIMP_LAYER_MODE_HSV_HUE_LEGACY, NC_("layer-mode", "Hue (HSV) (legacy)"), NULL },
{ GIMP_LAYER_MODE_HSV_SATURATION_LEGACY, NC_("layer-mode", "Saturation (HSV) (legacy)"), NULL },
{ GIMP_LAYER_MODE_HSV_COLOR_LEGACY, NC_("layer-mode", "Color (HSV) (legacy)"), NULL },
{ GIMP_LAYER_MODE_HSL_COLOR_LEGACY, NC_("layer-mode", "Color (HSL) (legacy)"), NULL },
{ GIMP_LAYER_MODE_HSV_VALUE_LEGACY, NC_("layer-mode", "Value (HSV) (legacy)"), NULL },
{ GIMP_LAYER_MODE_DIVIDE_LEGACY, NC_("layer-mode", "Divide (legacy)"), NULL },
{ GIMP_LAYER_MODE_DODGE_LEGACY, NC_("layer-mode", "Dodge (legacy)"), NULL },

2
app/operations/operations-enums.h
View file

@ -68,7 +68,7 @@ typedef enum
GIMP_LAYER_MODE_LIGHTEN_ONLY_LEGACY, /*< desc="Lighten only (legacy)" >*/
GIMP_LAYER_MODE_HSV_HUE_LEGACY, /*< desc="Hue (HSV) (legacy)" >*/
GIMP_LAYER_MODE_HSV_SATURATION_LEGACY, /*< desc="Saturation (HSV) (legacy)">*/
GIMP_LAYER_MODE_HSV_COLOR_LEGACY, /*< desc="Color (HSV) (legacy)" >*/
GIMP_LAYER_MODE_HSL_COLOR_LEGACY, /*< desc="Color (HSL) (legacy)" >*/
GIMP_LAYER_MODE_HSV_VALUE_LEGACY, /*< desc="Value (HSV) (legacy)" >*/
GIMP_LAYER_MODE_DIVIDE_LEGACY, /*< desc="Divide (legacy)" >*/
GIMP_LAYER_MODE_DODGE_LEGACY, /*< desc="Dodge (legacy)" >*/

2
libgimp/gimpenums.h
View file

@ -108,7 +108,7 @@ typedef enum
GIMP_LAYER_MODE_LIGHTEN_ONLY_LEGACY,
GIMP_LAYER_MODE_HSV_HUE_LEGACY,
GIMP_LAYER_MODE_HSV_SATURATION_LEGACY,
GIMP_LAYER_MODE_HSV_COLOR_LEGACY,
GIMP_LAYER_MODE_HSL_COLOR_LEGACY,
GIMP_LAYER_MODE_HSV_VALUE_LEGACY,
GIMP_LAYER_MODE_DIVIDE_LEGACY,
GIMP_LAYER_MODE_DODGE_LEGACY,

2
libgimp/gimptypes.h
View file

@ -59,7 +59,7 @@ typedef GimpLayerMode GimpLayerModeEffects;
#define GIMP_LIGHTEN_ONLY_MODE GIMP_LAYER_MODE_LIGHTEN_ONLY_LEGACY
#define GIMP_HUE_MODE GIMP_LAYER_MODE_HSV_HUE_LEGACY
#define GIMP_SATURATION_MODE GIMP_LAYER_MODE_HSV_SATURATION_LEGACY
#define GIMP_COLOR_MODE GIMP_LAYER_MODE_HSV_COLOR_LEGACY
#define GIMP_COLOR_MODE GIMP_LAYER_MODE_HSL_COLOR_LEGACY
#define GIMP_VALUE_MODE GIMP_LAYER_MODE_HSV_VALUE_LEGACY
#define GIMP_DIVIDE_MODE GIMP_LAYER_MODE_DIVIDE_LEGACY
#define GIMP_DODGE_MODE GIMP_LAYER_MODE_DODGE_LEGACY

2
plug-ins/common/file-psp.c
View file

@ -1007,7 +1007,7 @@ gimp_layer_mode_from_psp_blend_mode (PSPBlendModes mode)
return GIMP_LAYER_MODE_HSV_SATURATION_LEGACY;
case PSP_BLEND_COLOR:
return GIMP_LAYER_MODE_HSV_COLOR_LEGACY;
return GIMP_LAYER_MODE_HSL_COLOR_LEGACY;
case PSP_BLEND_LUMINOSITY:
return GIMP_LAYER_MODE_HSV_VALUE_LEGACY; /* ??? */

2
plug-ins/file-psd/psd-save.c
View file

@ -217,7 +217,7 @@ psd_lmode_layer (gint32 idLayer,
strcpy (psdMode, "sat ");
break;
case GIMP_LAYER_MODE_LCH_COLOR:
case GIMP_LAYER_MODE_HSV_COLOR_LEGACY:
case GIMP_LAYER_MODE_HSL_COLOR_LEGACY:
strcpy (psdMode, "colr");
break;
case GIMP_LAYER_MODE_ADDITION:

2
plug-ins/file-psd/psd-util.c
View file

@ -845,7 +845,7 @@ gimp_to_psd_blend_mode (GimpLayerMode layer_mode,
break;
case GIMP_LAYER_MODE_LCH_COLOR:
case GIMP_LAYER_MODE_HSV_COLOR_LEGACY:
case GIMP_LAYER_MODE_HSL_COLOR_LEGACY:
psd_mode = g_strndup ("colr", 4); /* Color (ps3) */
break;

4
tools/pdbgen/enums.pl
View file

@ -710,7 +710,7 @@ package Gimp::CodeGen::enums;
GIMP_LAYER_MODE_LIGHTEN_ONLY_LEGACY
GIMP_LAYER_MODE_HSV_HUE_LEGACY
GIMP_LAYER_MODE_HSV_SATURATION_LEGACY
GIMP_LAYER_MODE_HSV_COLOR_LEGACY
GIMP_LAYER_MODE_HSL_COLOR_LEGACY
GIMP_LAYER_MODE_HSV_VALUE_LEGACY
GIMP_LAYER_MODE_DIVIDE_LEGACY
GIMP_LAYER_MODE_DODGE_LEGACY
@ -762,7 +762,7 @@ package Gimp::CodeGen::enums;
GIMP_LAYER_MODE_LIGHTEN_ONLY_LEGACY => '10',
GIMP_LAYER_MODE_HSV_HUE_LEGACY => '11',
GIMP_LAYER_MODE_HSV_SATURATION_LEGACY => '12',
GIMP_LAYER_MODE_HSV_COLOR_LEGACY => '13',
GIMP_LAYER_MODE_HSL_COLOR_LEGACY => '13',
GIMP_LAYER_MODE_HSV_VALUE_LEGACY => '14',
GIMP_LAYER_MODE_DIVIDE_LEGACY => '15',
GIMP_LAYER_MODE_DODGE_LEGACY => '16',