[gimp] libgimpbase: move GIMP_REPEAT_TRUNCATE to the end of the enum
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] libgimpbase: move GIMP_REPEAT_TRUNCATE to the end of the enum
- Date: Thu, 24 Apr 2014 21:11:10 +0000 (UTC)
commit 8ce94d23b9efa491b8cec41f65b825e5f4bf85ef
Author: Michael Natterer <mitch gimp org>
Date: Thu Apr 24 23:08:33 2014 +0200
libgimpbase: move GIMP_REPEAT_TRUNCATE to the end of the enum
New values must go to the end to avoid ABI break.
app/pdb/edit-cmds.c | 2 +-
libgimpbase/gimpbaseenums.c | 6 +++---
libgimpbase/gimpbaseenums.h | 6 +++---
tools/pdbgen/enums.pl | 12 ++++++------
4 files changed, 13 insertions(+), 13 deletions(-)
---
diff --git a/app/pdb/edit-cmds.c b/app/pdb/edit-cmds.c
index ce483c9..03ac9c3 100644
--- a/app/pdb/edit-cmds.c
+++ b/app/pdb/edit-cmds.c
@@ -1495,7 +1495,7 @@ register_edit_procs (GimpPDB *pdb)
"repeat",
"Repeat mode",
GIMP_TYPE_REPEAT_MODE,
- GIMP_REPEAT_TRUNCATE,
+ GIMP_REPEAT_NONE,
GIMP_PARAM_READWRITE));
gimp_procedure_add_argument (procedure,
g_param_spec_boolean ("reverse",
diff --git a/libgimpbase/gimpbaseenums.c b/libgimpbase/gimpbaseenums.c
index 85285a6..6f91733 100644
--- a/libgimpbase/gimpbaseenums.c
+++ b/libgimpbase/gimpbaseenums.c
@@ -635,19 +635,19 @@ gimp_repeat_mode_get_type (void)
{
static const GEnumValue values[] =
{
- { GIMP_REPEAT_TRUNCATE, "GIMP_REPEAT_TRUNCATE", "truncate" },
{ GIMP_REPEAT_NONE, "GIMP_REPEAT_NONE", "none" },
{ GIMP_REPEAT_SAWTOOTH, "GIMP_REPEAT_SAWTOOTH", "sawtooth" },
{ GIMP_REPEAT_TRIANGULAR, "GIMP_REPEAT_TRIANGULAR", "triangular" },
+ { GIMP_REPEAT_TRUNCATE, "GIMP_REPEAT_TRUNCATE", "truncate" },
{ 0, NULL, NULL }
};
static const GimpEnumDesc descs[] =
{
- { GIMP_REPEAT_TRUNCATE, NC_("repeat-mode", "Truncate blending"), NULL },
- { GIMP_REPEAT_NONE, NC_("repeat-mode", "None"), NULL },
+ { GIMP_REPEAT_NONE, NC_("repeat-mode", "None (extend)"), NULL },
{ GIMP_REPEAT_SAWTOOTH, NC_("repeat-mode", "Sawtooth wave"), NULL },
{ GIMP_REPEAT_TRIANGULAR, NC_("repeat-mode", "Triangular wave"), NULL },
+ { GIMP_REPEAT_TRUNCATE, NC_("repeat-mode", "Truncate"), NULL },
{ 0, NULL, NULL }
};
diff --git a/libgimpbase/gimpbaseenums.h b/libgimpbase/gimpbaseenums.h
index 56a97be..a63cc2f 100644
--- a/libgimpbase/gimpbaseenums.h
+++ b/libgimpbase/gimpbaseenums.h
@@ -280,10 +280,10 @@ GType gimp_repeat_mode_get_type (void) G_GNUC_CONST;
typedef enum
{
- GIMP_REPEAT_TRUNCATE, /*< desc="Truncate blending" >*/
- GIMP_REPEAT_NONE, /*< desc="None" >*/
+ GIMP_REPEAT_NONE, /*< desc="None (extend)" >*/
GIMP_REPEAT_SAWTOOTH, /*< desc="Sawtooth wave" >*/
- GIMP_REPEAT_TRIANGULAR /*< desc="Triangular wave" >*/
+ GIMP_REPEAT_TRIANGULAR, /*< desc="Triangular wave" >*/
+ GIMP_REPEAT_TRUNCATE /*< desc="Truncate" >*/
} GimpRepeatMode;
diff --git a/tools/pdbgen/enums.pl b/tools/pdbgen/enums.pl
index 8fef2b6..9038e30 100644
--- a/tools/pdbgen/enums.pl
+++ b/tools/pdbgen/enums.pl
@@ -196,12 +196,12 @@ package Gimp::CodeGen::enums;
GimpRepeatMode =>
{ contig => 1,
header => 'libgimpbase/gimpbaseenums.h',
- symbols => [ qw(GIMP_REPEAT_TRUNCATE GIMP_REPEAT_NONE
- GIMP_REPEAT_SAWTOOTH GIMP_REPEAT_TRIANGULAR) ],
- mapping => { GIMP_REPEAT_TRUNCATE => '0',
- GIMP_REPEAT_NONE => '1',
- GIMP_REPEAT_SAWTOOTH => '2',
- GIMP_REPEAT_TRIANGULAR => '3' }
+ symbols => [ qw(GIMP_REPEAT_NONE GIMP_REPEAT_SAWTOOTH
+ GIMP_REPEAT_TRIANGULAR GIMP_REPEAT_TRUNCATE) ],
+ mapping => { GIMP_REPEAT_NONE => '0',
+ GIMP_REPEAT_SAWTOOTH => '1',
+ GIMP_REPEAT_TRIANGULAR => '2',
+ GIMP_REPEAT_TRUNCATE => '3' }
},
GimpRunMode =>
{ contig => 1,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]