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

added spec file to EXTRA_DIST

Browse source 
* Makefile.am: added spec file to EXTRA_DIST

* docs/Makefile.am: added undo.txt to EXTRA_DIST

* app/interface.c: removed the DODGY warning, doesn't look dodgy to me

* libgimp/*.h: missed an s/Library/Lesser/

* tools/pdbgen/*: lots of work on the libgimp portion

-Yosh
This commit is contained in:
Manish Singh 1999-12-26 07:54:39 +00:00
parent a9f0061c70
commit b8e03bd1c7
72 changed files with 223 additions and 128 deletions
Download patch file Download diff file Expand all files Collapse all files

12
ChangeLog
View file

@ -1,3 +1,15 @@
Sat Dec 25 23:15:46 PST 1999 Manish Singh <yosh@gimp.org>
* Makefile.am: added spec file to EXTRA_DIST
* docs/Makefile.am: added undo.txt to EXTRA_DIST
* app/interface.c: removed the DODGY warning, doesn't look dodgy to me
* libgimp/*.h: missed an s/Library/Lesser/
* tools/pdbgen/*: lots of work on the libgimp portion
1999-12-26 Shirasaki Yasuhiro <yasuhiro@gnome.gr.jp>
* plug-ins/common/gbr.c

3
Makefile.am
View file

@ -84,7 +84,8 @@ EXTRA_DIST = \
gtkrc.forest2 \
gimp.m4 \
gimprc.win32 \
config.h.win32
config.h.win32 \
gimp.spec
gimpdata_DATA = \
gimprc \

4
app/display/gimpdisplayshell-draw.c
View file

@ -1010,9 +1010,7 @@ create_display_shell (GDisplay* gdisp,
gtk_widget_show (vbox);
gtk_widget_show (gdisp->shell);
#ifdef __GNUC__
#warning DODGY?
#endif /*__GNUC__ */
gtk_widget_realize (gdisp->canvas);
gdk_window_set_back_pixmap (gdisp->canvas->window, NULL, 0);

4
app/display/gimpdisplayshell.c
View file

@ -1010,9 +1010,7 @@ create_display_shell (GDisplay* gdisp,
gtk_widget_show (vbox);
gtk_widget_show (gdisp->shell);
#ifdef __GNUC__
#warning DODGY?
#endif /*__GNUC__ */
gtk_widget_realize (gdisp->canvas);
gdk_window_set_back_pixmap (gdisp->canvas->window, NULL, 0);

4
app/interface.c
View file

@ -1010,9 +1010,7 @@ create_display_shell (GDisplay* gdisp,
gtk_widget_show (vbox);
gtk_widget_show (gdisp->shell);
#ifdef __GNUC__
#warning DODGY?
#endif /*__GNUC__ */
gtk_widget_realize (gdisp->canvas);
gdk_window_set_back_pixmap (gdisp->canvas->window, NULL, 0);

2
docs/Makefile.am
View file

@ -6,7 +6,7 @@ EXTRA_DIST = \
architecture.eps logo.eps \
net-fu.eps timeline.eps \
pdb_dump.texi gimp_quick_reference.ps \
gimp_quick_reference.tar.gz
gimp_quick_reference.tar.gz undo.txt
BUILT_SOURCES = pdb_dump.texi

2
libgimp/gimp.h
View file

@ -9,7 +9,7 @@
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the

2
libgimp/gimpchainbutton.h
View file

@ -9,7 +9,7 @@
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the

2
libgimp/gimpcolorbutton.h
View file

@ -12,7 +12,7 @@
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the

12
libgimp/gimpcompat.h
View file

@ -9,7 +9,7 @@
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the
@ -46,6 +46,16 @@ extern "C" {
#define gimp_image_freeze_undo gimp_image_undo_freeze
#define gimp_image_thaw_undo gimp_image_undo_thaw
/*
#define gimp_get_data gimp_procedural_db_get_data
#define gimp_get_data_size gimp_procedural_db_get_data_size
#define gimp_set_data(id, data, bytes) \
(gimp_procedural_db_set_data (id, bytes, data))
#define gimp_query_images gimp_image_list
*/
#endif /* GIMP_DISABLE_COMPAT_H */
#ifdef __cplusplus

2
libgimp/gimpenums.h
View file

@ -9,7 +9,7 @@
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the

2
libgimp/gimpenv.h
View file

@ -10,7 +10,7 @@
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the

2
libgimp/gimpexport.h
View file

@ -9,7 +9,7 @@
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the

2
libgimp/gimpfileselection.h
View file

@ -12,7 +12,7 @@
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the

2
libgimp/gimplimits.h
View file

@ -12,7 +12,7 @@
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the

2
libgimp/gimpmath.h
View file

@ -10,7 +10,7 @@
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the

2
libgimp/gimpmatrix.h
View file

@ -9,7 +9,7 @@
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the

2
libgimp/gimpmenu.h
View file

@ -9,7 +9,7 @@
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the

2
libgimp/gimpparasite.h
View file

@ -9,7 +9,7 @@
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the

2
libgimp/gimpparasiteF.h
View file

@ -9,7 +9,7 @@
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the

2
libgimp/gimpparasiteP.h
View file

@ -9,7 +9,7 @@
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the

2
libgimp/gimpparasiteio.h
View file

@ -9,7 +9,7 @@
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the

2
libgimp/gimppatheditor.h
View file

@ -12,7 +12,7 @@
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the

2
libgimp/gimpprotocol.h
View file

@ -9,7 +9,7 @@
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the

2
libgimp/gimpsizeentry.h
View file

@ -9,7 +9,7 @@
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the

2
libgimp/gimpui.h
View file

@ -9,7 +9,7 @@
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the

2
libgimp/gimpunit.h
View file

@ -12,7 +12,7 @@
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the

2
libgimp/gimpunitmenu.h
View file

@ -12,7 +12,7 @@
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the

2
libgimp/gimpwire.h
View file

@ -9,7 +9,7 @@
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the

2
libgimp/gserialize.h
View file

@ -9,7 +9,7 @@
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the

2
libgimp/parasite.h
View file

@ -9,7 +9,7 @@
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the

2
libgimp/parasiteF.h
View file

@ -9,7 +9,7 @@
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the

2
libgimp/parasiteP.h
View file

@ -9,7 +9,7 @@
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the

2
libgimp/parasiteio.h
View file

@ -9,7 +9,7 @@
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the

2
libgimpbase/gimpenv.h
View file

@ -10,7 +10,7 @@
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the

2
libgimpbase/gimplimits.h
View file

@ -12,7 +12,7 @@
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the

2
libgimpbase/gimpparasite.h
View file

@ -9,7 +9,7 @@
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the

2
libgimpbase/gimpparasiteio.h
View file

@ -9,7 +9,7 @@
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the

2
libgimpbase/gimpprotocol.h
View file

@ -9,7 +9,7 @@
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the

2
libgimpbase/gimpunit.h
View file

@ -12,7 +12,7 @@
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the

2
libgimpbase/gimpwire.h
View file

@ -9,7 +9,7 @@
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the

2
libgimpwidgets/gimpchainbutton.h
View file

@ -9,7 +9,7 @@
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the

2
libgimpwidgets/gimpcolorbutton.h
View file

@ -12,7 +12,7 @@
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the

2
libgimpwidgets/gimpfileentry.h
View file

@ -12,7 +12,7 @@
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the

2
libgimpwidgets/gimpfileselection.h
View file

@ -12,7 +12,7 @@
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the

2
libgimpwidgets/gimppatheditor.h
View file

@ -12,7 +12,7 @@
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the

2
libgimpwidgets/gimpsizeentry.h
View file

@ -9,7 +9,7 @@
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the

2
libgimpwidgets/gimpunitmenu.h
View file

@ -12,7 +12,7 @@
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the

6
tools/pdbgen/enumcode.pl
View file

@ -93,16 +93,16 @@ print ENUMFILE <<'LGPL';
* Copyright (C) 1995-1999 Peter Mattis and Spencer Kimball
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.

79
tools/pdbgen/lib.pl
View file

@ -34,7 +34,7 @@ sub generate {
sub libtype {
my ($arg, $type) = @_;
$type =~ s/\d+// unless exists $arg->{keep_size};
$type =~ s/int32/int/ unless exists $arg->{keep_size};
$type;
}
@ -52,11 +52,17 @@ sub generate {
# Find the return argument (defaults to the first arg if not
# explicity set
my $retarg;
my $retarg = undef; $retvoid = 0;
foreach (@outargs) { $retarg = $_, last if exists $_->{retval} }
unless ($retarg) {
if (scalar @outargs) {
$retarg = exists $outargs[0]->{num} ? $outargs[1] : $outargs[0];
if (exists $outargs[0]->{void_ret}) {
$retvoid = 1;
}
else {
$retarg = exists $outargs[0]->{num} ? $outargs[1]
: $outargs[0];
}
}
}
@ -84,13 +90,16 @@ sub generate {
}
# The parameters to the function
my $arglist = ""; my $argpass = ""; my $color = "";
my $arglist = ""; my $argpass = ""; my $color = ""; my $privatevars = 0;
foreach (@inargs) {
my ($type) = &arg_parse($_->{type});
my $arg = $arg_types{$type};
my $id = exists $arg->{id_func};
if ($type ne 'color') {
if (exists $_->{implicit_fill}) {
$privatevars++;
}
elsif ($type ne 'color') {
$arglist .= do {
if ($id) { 'gint32 ' }
else { &libtype($_, $arg->{type}) }
@ -116,8 +125,16 @@ CODE
# This is what's passed into gimp_run_procedure
$argpass .= "\n\t\t\t\t" . ' ' x 4;
$argpass .= "PARAM_$arg->{name}, $_->{name}";
$argpass .= "PARAM_$arg->{name}, ";
if (exists $_->{implicit_fill}) {
$argpass .= $_->{implicit_fill};
}
else {
$argpass .= "$_->{name}";
$argpass .= '_ID' if $id;
}
$argpass .= ',';
}
@ -126,7 +143,7 @@ CODE
my $return_marshal = "gimp_destroy_params (return_vals, nreturn_vals);";
# We only need to bother with this if we have to return a value
if ($rettype ne 'void' || $retcol) {
if ($rettype ne 'void' || $retcol || $retvoid) {
my $once = 0;
my $firstvar;
my @arraynums;
@ -145,7 +162,7 @@ CODE
push @arraynums, $_;
}
}
elsif ($type ne 'color') {
elsif (exists $_->{retval} && $type ne 'color') {
$return_args .= "\n" . ' ' x 2;
$return_args .= do {
if ($id) { 'gint32 ' }
@ -195,6 +212,13 @@ CODE
$head = 'g_strdup (';
$foot = ')';
}
elsif ($type =~ /parasite/) {
$head = 'parasite_copy (&';
$foot = ')';
}
elsif ($type =~ /boolean|enum/) {
$type = 'int32';
}
if (exists $_->{num}) {
$numpos = $argc;
@ -219,7 +243,23 @@ CODE
}
elsif ($type ne 'color') {
# The return value variable
$var = $_->{name};
$var = "";
unless (exists $_->{retval}) {
$var .= '*';
$arglist .= do {
if ($id) { 'gint32 ' }
else { &libtype($_, $arg->{type}) }
};
$arglist .= "*$_->{name}";
$arglist .= '_ID' if $id;
$arglist .= ', ';
}
$var = exists $_->{retval} ? "" : '*';
$var .= $_->{name};
$var .= '_ID' if $id;
$return_marshal .= ' ' x 2 if $#outargs;
@ -249,8 +289,12 @@ CODE
gimp_destroy_params (return_vals, nreturn_vals);
CODE
$return_marshal .= ' ' x 2 . "return $firstvar;" unless $retcol;
$return_marshal =~ s/\n\n$//s if $retcol;
unless ($retcol || $retvoid) {
$return_marshal .= ' ' x 2 . "return $firstvar;";
}
else {
$return_marshal =~ s/\n\n$//s;
}
}
if ($arglist) {
@ -317,16 +361,16 @@ CODE
* Copyright (C) 1995-1999 Peter Mattis and Spencer Kimball
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
@ -342,6 +386,9 @@ LGPL
my $hfile = "$destdir/gimp${group}.h$FILE_EXT";
my $cfile = "$destdir/gimp${group}.c$FILE_EXT";
$hfile =~ s/_//g;
$cfile =~ s/_//g;
my $extra = {};
if (exists $main::grp{$group}->{extra}->{lib}) {
$extra = $main::grp{$group}->{extra}->{lib}
@ -394,10 +441,9 @@ LGPL
my $body;
$body = $extra->{decls} if exists $extra->{decls};
foreach (@{$out->{proto}}) { $body .= $_ }
$body .= $extra->{protos} if exists $extra->{protos};
chomp $body;
open HFILE, "> $hfile" or die "Can't open $cfile: $!\n";
open HFILE, "> $hfile" or die "Can't open $hfile: $!\n";
print HFILE $lgpl;
my $guard = "__GIMP_\U$group\E_H__";
print HFILE <<HEADER;
@ -430,6 +476,7 @@ HEADER
open CFILE, "> $cfile" or die "Can't open $cfile: $!\n";
print CFILE $lgpl;
print CFILE qq/#include "gimp${group}.h"\n/;
print CFILE qq/#include "gimpprivate.h"\n/ if $privatevars;
print CFILE "\n", $extra->{code} if exists $extra->{code};
print CFILE $out->{code};
close CFILE;

2
tools/pdbgen/pdb/brush_select.pdb
View file

@ -176,7 +176,7 @@ brush_get_brushselect (gchar *name)
CODE
@procs = qw(brushes_popup brushes_close_popup brushes_set_popup);
%exports = (app => [@procs]);
%exports = (app => [@procs], lib => [@procs]);
$desc = 'Brush UI';

2
tools/pdbgen/pdb/brushes.pdb
View file

@ -359,7 +359,7 @@ CODE
brushes_get_opacity brushes_set_opacity brushes_get_spacing
brushes_set_spacing brushes_get_paint_mode brushes_set_paint_mode
brushes_list brushes_get_brush_data);
%exports = (app => [@procs]);
%exports = (app => [@procs], lib => [$procs[10]]);
$desc = 'Brushes';

2
tools/pdbgen/pdb/channel.pdb
View file

@ -229,7 +229,7 @@ $#procs--;
@headers = qw("channel.h" "channel_pvt.h");
unshift @procs, qw(channel_new channel_copy channel_delete);
%exports = (app => [@procs]);
%exports = (app => [@procs], lib => [@procs]);
$desc = 'Channel';

2
tools/pdbgen/pdb/convert.pdb
View file

@ -166,7 +166,7 @@ CODE
@headers = qw("gimage.h" "convert.h");
@procs = qw(convert_rgb convert_grayscale convert_indexed);
%exports = (app => [@procs]);
%exports = (app => [@procs], lib => [@procs]);
$desc = 'Convert';

6
tools/pdbgen/pdb/drawable.pdb
View file

@ -307,7 +307,7 @@ HELP
foreach (qw(x y)) {
push @outargs, { name => "offset_$_", type => 'int32',
desc => "$_ offset of drawable" }
desc => "$_ offset of drawable", void_ret => 1 }
}
%invoke = ( code => 'drawable_offsets (drawable, &offset_x, &offset_y);' );
@ -466,7 +466,7 @@ HELP
@outargs = (
&dim_args,
{ name => 'thumbnail_data', type => 'int8array',
desc => 'The thumbnail data', init => 1,
desc => 'The thumbnail data', init => 1, retval => 1,
array => { name => 'thumbnail_data_count',
desc => 'The number of pixels in thumbnail data',
alias => 'num_pixels', init => 1 } }
@ -516,7 +516,7 @@ CODE
drawable_height drawable_offsets drawable_is_layer
drawable_is_layer_mask drawable_is_channel drawable_get_pixel
drawable_set_pixel drawable_set_image drawable_thumbnail);
%exports = (app => [@procs], lib => [@procs]);
%exports = (app => [@procs], lib => [@procs[0..17,21]]);
$desc = 'Drawable procedures';

7
tools/pdbgen/pdb/fileops.pdb
View file

@ -409,9 +409,10 @@ CODE
@headers = qw("fileops.h" "plug_in.h" "config.h" "libgimp/gimpintl.h"
<unistd.h>);
@procs = qw(file_load file_save file_load_thumbnail file_save_thumbnail temp_name
register_magic_load_handler register_load_handler register_save_handler);
%exports = (app => [@procs]);
@procs = qw(file_load file_save file_load_thumbnail file_save_thumbnail
temp_name register_magic_load_handler register_load_handler
register_save_handler);
%exports = (app => [@procs], lib => [@procs[5..7]]);
$desc = 'File Operations';

3
tools/pdbgen/pdb/gimage.pdb
View file

@ -1351,7 +1351,8 @@ unshift @procs, qw(image_list image_new image_resize image_scale image_delete
image_undo_disable image_undo_freeze image_undo_thaw
image_clean_all image_floating_selection
image_floating_sel_attached_to image_thumbnail);
%exports = (app => [@procs]);
%exports = (app => [@procs],
lib => [@procs[0..4,6..11,14,16..24,26..35,37..$#procs]]);
$desc = 'Image';

2
tools/pdbgen/pdb/gimage_mask.pdb
View file

@ -364,7 +364,7 @@ HELP
selection_invert selection_sharpen selection_all selection_none
selection_feather selection_border selection_grow selection_shrink
selection_layer_alpha selection_load selection_save);
%exports = (app => [@procs]);
%exports = (app => [@procs], lib => [@procs[2,4]]);
$desc = 'Image mask';

3
tools/pdbgen/pdb/gradient.pdb-21477
View file

@ -73,7 +73,8 @@ HELP
@outargs = (
{ name => 'name', type => 'string',
desc => 'The name of the active gradient',
alias => 'g_strdup (gimp_context_get_gradient (NULL)->name)', no_declare => 1 }
alias => 'g_strdup (gimp_context_get_gradient (NULL)->name)',
no_declare => 1 }
);
%invoke = ( code => 'success = gimp_context_get_gradient (NULL) != NULL;' );

2
tools/pdbgen/pdb/gradient_select.pdb
View file

@ -259,7 +259,7 @@ CODE
@procs = qw(gradients_popup gradients_close_popup gradients_set_popup
gradients_get_gradient_data);
%exports = (app => [@procs]);
%exports = (app => [@procs], lib => [@procs]);
$desc = 'Gradient UI';

3
tools/pdbgen/pdb/gradients.pdb
View file

@ -73,7 +73,8 @@ HELP
@outargs = (
{ name => 'name', type => 'string',
desc => 'The name of the active gradient',
alias => 'g_strdup (gimp_context_get_gradient (NULL)->name)', no_declare => 1 }
alias => 'g_strdup (gimp_context_get_gradient (NULL)->name)',
no_declare => 1 }
);
%invoke = ( code => 'success = gimp_context_get_gradient (NULL) != NULL;' );

2
tools/pdbgen/pdb/guides.pdb
View file

@ -297,7 +297,7 @@ CODE
@procs = qw(image_add_hguide image_add_vguide image_delete_guide
image_find_next_guide image_get_guide_orientation
image_get_guide_position);
%exports = (app => [@procs]);
%exports = (app => [@procs], lib => [@procs]);
$desc = 'Guide procedures';

3
tools/pdbgen/pdb/image.pdb
View file

@ -1351,7 +1351,8 @@ unshift @procs, qw(image_list image_new image_resize image_scale image_delete
image_undo_disable image_undo_freeze image_undo_thaw
image_clean_all image_floating_selection
image_floating_sel_attached_to image_thumbnail);
%exports = (app => [@procs]);
%exports = (app => [@procs],
lib => [@procs[0..4,6..11,14,16..24,26..35,37..$#procs]]);
$desc = 'Image';

4
tools/pdbgen/pdb/interface.pdb
View file

@ -32,7 +32,7 @@ HELP
&pdb_misc;
@inargs = (
{ name => 'message', type => 'string',
{ name => 'message', type => 'string', const => 1,
desc => 'Message to display in the dialog' }
);
@ -77,7 +77,7 @@ HELP
}
@procs = qw(message message_get_handler message_set_handler);
%exports = (app => [@procs]);
%exports = (app => [@procs], lib => [@procs]);
$desc = 'Interface';

2
tools/pdbgen/pdb/layer.pdb
View file

@ -547,7 +547,7 @@ $#procs--;
unshift @procs, qw(layer_new layer_copy layer_create_mask layer_scale
layer_resize layer_delete layer_translate layer_add_alpha
layer_set_offsets layer_mask layer_is_floating_sel);
%exports = (app => [@procs]);
%exports = (app => [@procs], lib => [@procs]);
$desc = 'Layer';

34
tools/pdbgen/pdb/parasite.pdb
View file

@ -165,19 +165,24 @@ sub parasite_list {
"gimpimage.h");
$extra{lib}->{protos} = <<'CODE';
void gimp_attach_new_parasite (const char *name, int flags, int size
const void *data);
void gimp_parasite_attach_new (const gchar *name,
guint32 flags,
guint32 size,
gconstpoiner data);
CODE
$extra{lib}->{code} = <<'CODE';
void
gimp_attach_new_parasite (const char *name, int flags, int size,
const void *data)
gimp_parasite_attach_new (const gchar *name,
guint32 flags,
guint32 size,
gconstpointer data)
{
Parasite *p = parasite_new (name, flags, size, data);
gimp_parasite_attach (p);
parasite_free (p);
}
CODE
@procs = qw(parasite_new parasite_find parasite_attach parasite_detach
@ -188,6 +193,8 @@ CODE
['image' , '&std_image_arg', 'gimage' ]
);
my %code;
foreach $type (@types) {
foreach (@procs[1..4]) {
my $desc = ($type->[0] =~ /^[aeiou]/ ? 'an ' : 'a ') . $type->[0];
@ -213,9 +220,26 @@ SUB
push @procs, "$type->[0]_$_";
}
foreach (qw(protos code)) {
my $code = $extra{lib}->{$_};
$code =~ s/\t/' ' x 8/eg;
$code =~ s/gimp/gimp_$type->[0]/g;
$code =~ s/^ {8}/' ' x (length($type->[0]) + 9)/meg;
while ($code =~ /^\t* {8}/m) { $code =~ s/^(\t*) {8}/$1\t/mg }
$code{$_} .= $code;
}
}
%exports = (app => [@procs], lib => [@procs[1..3]]);
foreach (qw(protos code)) {
$extra{lib}->{$_} .= $code{$_};
}
chop $extra{lib}->{code};
%exports = (app => [@procs], lib => [@procs]);
$desc = 'Parasite procedures';

2
tools/pdbgen/pdb/patterns.pdb
View file

@ -215,7 +215,7 @@ CODE
@procs = qw(patterns_get_pattern patterns_set_pattern patterns_list
patterns_get_pattern_data);
%exports = (app => [@procs]);
%exports = (app => [@procs], lib => [$procs[3]]);
$desc = 'Patterns';

4
tools/pdbgen/pdb/plug_in.pdb
View file

@ -40,7 +40,7 @@ HELP
{ name => 'gdisplay', type => 'int32',
desc => 'GDisplay to update progressbar in, or -1 for a seperate
window',
no_id_lookup => 1 }
implicit_fill => '_gdisp_ID', no_id_lookup => 1 }
);
%invoke = (
@ -253,7 +253,7 @@ match_strings (regex_t *preg,
CODE
@procs = qw(progress_init progress_update temp_PDB_name plugins_query);
%exports = (app => [@procs]);
%exports = (app => [@procs], lib => [@procs[0..2]]);
$desc = 'Plug-in';

2
tools/pdbgen/pdb/procedural_db.pdb
View file

@ -216,7 +216,7 @@ HELP
@inargs = ( &proc_name_arg );
@outargs = (
{ name => 'blurb', type => 'string',
{ name => 'blurb', type => 'string', void_ret => 1,
desc => 'A short blurb' },
{ name => 'help', type => 'string',
desc => 'Detailed procedure help' },

2
tools/pdbgen/pdb/selection.pdb
View file

@ -364,7 +364,7 @@ HELP
selection_invert selection_sharpen selection_all selection_none
selection_feather selection_border selection_grow selection_shrink
selection_layer_alpha selection_load selection_save);
%exports = (app => [@procs]);
%exports = (app => [@procs], lib => [@procs[2,4]]);
$desc = 'Image mask';

2
tools/pdbgen/pdbgen.pl
View file

@ -169,6 +169,8 @@ sub arrayexpand {
$arg->{type} = '0 < ' . $arg->{type};
}
$arg->{void_ret} = 1 if exists $_->{void_ret};
$arg->{num} = 1;
push @$newargs, $arg;