made it compile again

This commit is contained in:
Sven Neumann 2001-02-28 15:01:02 +00:00
parent b56e0e1853
commit cde309e45d
12 changed files with 73 additions and 47 deletions

View File

@ -1,3 +1,18 @@
2001-02-28 Sven Neumann <sven@gimp.org>
Please, do not change the files in app/pdb directly, they are
autogenerated. And, please, whatever you change, type make in
the toplevel srcdir, since pdbgen might decide it has to change
some more files because of your changes.
* app/pdb/layer_cmds.c
* app/pdb/tools_cmds.c
* app/tools/crop.c
* libgimp/gimpenums.h
* plug-ins/script-fu/script-fu-constants.c
* tools/pdbgen/enums.pl
* tools/pdbgen/pdb/tools.pdb: made everything compile again
2001-02-27 Jay Cox <jaycox@gimp.org>
* app/appenums.h

View File

@ -304,7 +304,7 @@ layer_create_mask_invoker (Argument *args)
success = FALSE;
mask_type = args[1].value.pdb_int;
if (mask_type < ADD_WHITE_MASK || mask_type > ADD_ALPHA_MASK)
if (mask_type < ADD_WHITE_MASK || mask_type > ADD_INV_SELECTION_MASK)
success = FALSE;
if (success)
@ -328,7 +328,7 @@ static ProcArg layer_create_mask_inargs[] =
{
PDB_INT32,
"mask_type",
"The type of mask: { WHITE_MASK (0), BLACK_MASK (1), ALPHA_MASK (2) }"
"The type of mask: { WHITE_MASK (0), BLACK_MASK (1), ALPHA_MASK (2), SELECTION_MASK (3), INV_SELECTION_MASK (4) }"
}
};

View File

@ -34,7 +34,6 @@
#include "tools/bucket_fill.h"
#include "tools/by_color_select.h"
#include "tools/clone.h"
#include "tools/gimpcolorpickertool.h"
#include "tools/convolve.h"
#include "tools/crop.h"
#include "tools/dodgeburn.h"
@ -43,6 +42,7 @@
#include "tools/flip_tool.h"
#include "tools/free_select.h"
#include "tools/fuzzy_select.h"
#include "tools/gimpcolorpickertool.h"
#include "tools/gimppaintbrushtool.h"
#include "tools/pencil.h"
#include "tools/perspective_tool.h"
@ -1928,8 +1928,8 @@ paintbrush_invoker (Argument *args)
success = FALSE;
if (success)
success = gimp_paintbrush_tool_non_gui (drawable, num_strokes, strokes, fade_out,
method, gradient_length);
success = gimp_paintbrush_tool_non_gui (drawable, num_strokes, strokes,
fade_out, method, gradient_length);
return procedural_db_return_args (&paintbrush_proc, success);
}

View File

@ -1658,11 +1658,12 @@ gimp_crop_tool_destroy (GtkObject *object)
void
gimp_crop_tool_register (void)
{
tool_manager_register_tool(GIMP_TYPE_CROP_TOOL,
"gimp:crop_tool",
_("Crop Tool"),
_("Crop or Resize an image"),
N_("/Tools/Crop Tool"), "<shift>C",
NULL, "tools/crop_tool.html",
(const gchar **) crop_bits);
tool_manager_register_tool (GIMP_TYPE_CROP_TOOL,
FALSE,
"gimp:crop_tool",
_("Crop Tool"),
_("Crop or Resize an image"),
N_("/Tools/Crop Tool"), "<shift>C",
NULL, "tools/crop_tool.html",
(const gchar **) crop_bits);
}

View File

@ -1658,11 +1658,12 @@ gimp_crop_tool_destroy (GtkObject *object)
void
gimp_crop_tool_register (void)
{
tool_manager_register_tool(GIMP_TYPE_CROP_TOOL,
"gimp:crop_tool",
_("Crop Tool"),
_("Crop or Resize an image"),
N_("/Tools/Crop Tool"), "<shift>C",
NULL, "tools/crop_tool.html",
(const gchar **) crop_bits);
tool_manager_register_tool (GIMP_TYPE_CROP_TOOL,
FALSE,
"gimp:crop_tool",
_("Crop Tool"),
_("Crop or Resize an image"),
N_("/Tools/Crop Tool"), "<shift>C",
NULL, "tools/crop_tool.html",
(const gchar **) crop_bits);
}

View File

@ -30,7 +30,9 @@ typedef enum
{
GIMP_WHITE_MASK,
GIMP_BLACK_MASK,
GIMP_ALPHA_MASK
GIMP_ALPHA_MASK,
GIMP_SELECTION_MASK,
GIMP_INV_SELECTION_MASK
} GimpAddMaskType;
typedef enum

View File

@ -26,6 +26,8 @@ init_generated_constants (void)
setvar (cintern ("WHITE-MASK"), flocons (0), NIL);
setvar (cintern ("BLACK-MASK"), flocons (1), NIL);
setvar (cintern ("ALPHA-MASK"), flocons (2), NIL);
setvar (cintern ("SELECTION-MASK"), flocons (3), NIL);
setvar (cintern ("INV-SELECTION-MASK"), flocons (4), NIL);
setvar (cintern ("FG-BG-RGB"), flocons (0), NIL);
setvar (cintern ("FG-BG-HSV"), flocons (1), NIL);

View File

@ -125,13 +125,18 @@ package Gimp::CodeGen::enums;
AddMaskType =>
{ contig => 1,
header => 'appenums.h',
symbols => [ qw(ADD_WHITE_MASK ADD_BLACK_MASK ADD_ALPHA_MASK) ],
symbols => [ qw(ADD_WHITE_MASK ADD_BLACK_MASK ADD_ALPHA_MASK
ADD_SELECTION_MASK ADD_INV_SELECTION_MASK) ],
mapping => { ADD_WHITE_MASK => '0',
ADD_BLACK_MASK => '1',
ADD_ALPHA_MASK => '2' },
ADD_ALPHA_MASK => '2',
ADD_SELECTION_MASK => '3',
ADD_INV_SELECTION_MASK => '4' },
nicks => { ADD_WHITE_MASK => 'WHITE_MASK',
ADD_BLACK_MASK => 'BLACK_MASK',
ADD_ALPHA_MASK => 'ALPHA_MASK' }
ADD_ALPHA_MASK => 'ALPHA_MASK',
ADD_SELECTION_MASK => 'SELECTION_MASK',
ADD_INV_SELECTION_MASK => 'INV_SELECTION_MASK' }
},
GradientPaintMode =>
{ contig => 1,

View File

@ -412,7 +412,7 @@ HELP
);
%invoke = (
headers => [ qw("tools/color_picker.h") ],
headers => [ qw("tools/gimpcolorpickertool.h") ],
code => <<'CODE'
{
if (!sample_merged)
@ -865,10 +865,10 @@ HELP
);
%invoke = (
headers => [ qw("tools/paintbrush.h") ],
headers => [ qw("tools/gimppaintbrushtool.h") ],
code => <<'CODE'
success = paintbrush_non_gui (drawable, num_strokes, strokes, fade_out,
method, gradient_length);
success = gimp_paintbrush_tool_non_gui (drawable, num_strokes, strokes,
fade_out, method, gradient_length);
CODE
);
}
@ -902,9 +902,9 @@ HELP
);
%invoke = (
headers => [ qw("tools/paintbrush.h") ],
headers => [ qw("tools/gimppaintbrushtool.h") ],
code => <<'CODE'
success = paintbrush_non_gui_default (drawable, num_strokes, strokes);
success = gimp_paintbrush_tool_non_gui_default (drawable, num_strokes, strokes);
CODE
);
}

View File

@ -412,7 +412,7 @@ HELP
);
%invoke = (
headers => [ qw("tools/color_picker.h") ],
headers => [ qw("tools/gimpcolorpickertool.h") ],
code => <<'CODE'
{
if (!sample_merged)
@ -865,10 +865,10 @@ HELP
);
%invoke = (
headers => [ qw("tools/paintbrush.h") ],
headers => [ qw("tools/gimppaintbrushtool.h") ],
code => <<'CODE'
success = paintbrush_non_gui (drawable, num_strokes, strokes, fade_out,
method, gradient_length);
success = gimp_paintbrush_tool_non_gui (drawable, num_strokes, strokes,
fade_out, method, gradient_length);
CODE
);
}
@ -902,9 +902,9 @@ HELP
);
%invoke = (
headers => [ qw("tools/paintbrush.h") ],
headers => [ qw("tools/gimppaintbrushtool.h") ],
code => <<'CODE'
success = paintbrush_non_gui_default (drawable, num_strokes, strokes);
success = gimp_paintbrush_tool_non_gui_default (drawable, num_strokes, strokes);
CODE
);
}

View File

@ -412,7 +412,7 @@ HELP
);
%invoke = (
headers => [ qw("tools/color_picker.h") ],
headers => [ qw("tools/gimpcolorpickertool.h") ],
code => <<'CODE'
{
if (!sample_merged)
@ -865,10 +865,10 @@ HELP
);
%invoke = (
headers => [ qw("tools/paintbrush.h") ],
headers => [ qw("tools/gimppaintbrushtool.h") ],
code => <<'CODE'
success = paintbrush_non_gui (drawable, num_strokes, strokes, fade_out,
method, gradient_length);
success = gimp_paintbrush_tool_non_gui (drawable, num_strokes, strokes,
fade_out, method, gradient_length);
CODE
);
}
@ -902,9 +902,9 @@ HELP
);
%invoke = (
headers => [ qw("tools/paintbrush.h") ],
headers => [ qw("tools/gimppaintbrushtool.h") ],
code => <<'CODE'
success = paintbrush_non_gui_default (drawable, num_strokes, strokes);
success = gimp_paintbrush_tool_non_gui_default (drawable, num_strokes, strokes);
CODE
);
}

View File

@ -412,7 +412,7 @@ HELP
);
%invoke = (
headers => [ qw("tools/color_picker.h") ],
headers => [ qw("tools/gimpcolorpickertool.h") ],
code => <<'CODE'
{
if (!sample_merged)
@ -865,10 +865,10 @@ HELP
);
%invoke = (
headers => [ qw("tools/paintbrush.h") ],
headers => [ qw("tools/gimppaintbrushtool.h") ],
code => <<'CODE'
success = paintbrush_non_gui (drawable, num_strokes, strokes, fade_out,
method, gradient_length);
success = gimp_paintbrush_tool_non_gui (drawable, num_strokes, strokes,
fade_out, method, gradient_length);
CODE
);
}
@ -902,9 +902,9 @@ HELP
);
%invoke = (
headers => [ qw("tools/paintbrush.h") ],
headers => [ qw("tools/gimppaintbrushtool.h") ],
code => <<'CODE'
success = paintbrush_non_gui_default (drawable, num_strokes, strokes);
success = gimp_paintbrush_tool_non_gui_default (drawable, num_strokes, strokes);
CODE
);
}