gimptool.1.in app/pdb/image_cmds.c ported changes from stable branch

2001-06-26  Sven Neumann  <sven@gimp.org>

	* gimptool.1.in
	* app/pdb/image_cmds.c
	* tools/pdbgen/pdb/image.pdb: ported changes from stable branch
This commit is contained in:
Sven Neumann 2001-06-26 12:12:41 +00:00 committed by Sven Neumann
parent d26c26686e
commit 2dfedcbd51
5 changed files with 44 additions and 46 deletions

View File

@ -1,3 +1,9 @@
2001-06-26 Sven Neumann <sven@gimp.org>
* gimptool.1.in
* app/pdb/image_cmds.c
* tools/pdbgen/pdb/image.pdb: ported changes from stable branch
2001-06-26 Michael Natterer <mitch@gimp.org>
* app/Makefile.am

View File

@ -1880,16 +1880,12 @@ image_set_cmap_invoker (Argument *args)
if (success)
{
if (gimage->cmap)
{
g_free (gimage->cmap);
gimage->cmap = NULL;
}
if (gimage->cmap == NULL)
gimage->cmap = g_new (guchar, COLORMAP_SIZE);
if (num_bytes)
{
gimage->cmap = g_new (guchar, COLORMAP_SIZE);
memcpy (gimage->cmap, cmap, num_bytes);
}
memcpy (gimage->cmap, cmap, num_bytes);
gimage->num_cols = num_bytes / 3;
/* A colormap alteration affects the whole image */

View File

@ -1,4 +1,4 @@
.TH GIMPTOOL 1 "23 June 2000" "Version @GIMP_VERSION@" "GIMP Manual Pages"
.TH GIMPTOOL 1 "26 June 2001" "Version @GIMP_VERSION@" "GIMP Manual Pages"
.SH NAME
gimptool - script to perform various Gimpy functions
.SH SYNOPSIS
@ -104,55 +104,55 @@ Compile,link, and strip \fIplug-in.c\fP into a \fIGimp\fP plug-in.
.TP 8
.B \-\-install \fIplug-in.c\fP
Compile, link, and install \fIplug-in.c\fP into the user's personal \fIGimp\fP
plug-in directory (\fB$HOME\fP/.gimp/plug-ins)
plug-in directory (\fB$HOME\fP/@gimpdir@/plug-ins)
.TP 8
.B \-\-install\-strip \fIplug-in.c\fP
Compile, link,strip, and install \fIplug-in.c\fP into the user's personal \fIGimp\fP
plug-in directory (\fB$HOME\fP/.gimp/plug-ins)
plug-in directory (\fB$HOME\fP/@gimpdir@/plug-ins)
.TP 8
.B \-\-install\-admin \fIplug-in.c\fP
Compile, link, and install \fIplug-in.c\fP into the system-wide \fIGimp\fP
plug-in directory (\fB$PREFIX\fP/lib/gimp/1.0/plug-ins)
plug-in directory (@gimpplugindir@/plug-ins)
.TP 8
.B \-\-install\-bin \fIplug-in\fP
Install \fIplug-in\fP into the user's personal \fIGimp\fP
plug-in directory (\fB$HOME\fP/.gimp/plug-ins)
plug-in directory (\fB$HOME\fP/@gimpdir@/plug-ins)
.TP 8
.B \-\-install\-admin\-bin \fIplug-in\fP
Install \fIplug-in\fP into the system-wide \fIGimp\fP
plug-in directory (\fB$PREFIX\fP/lib/gimp/1.0/plug-ins)
plug-in directory (@gimpplugindir@/plug-ins)
.TP 8
.B \-\-install\-bin\-strip \fIplug-in\fP
Install stripped \fIplug-in\fP into the user's personal \fIGimp\fP
plug-in directory (\fB$HOME\fP/.gimp/plug-ins)
plug-in directory (\fB$HOME\fP/@gimpdir@/plug-ins)
.TP 8
.B \-\-install\-admin\-bin\-strip \fIplug-in\fP
Install stripped \fIplug-in\fP into the system-wide \fIGimp\fP
plug-in directory (\fB$PREFIX\fP/lib/gimp/1.0/plug-ins)
plug-in directory (@gimpplugindir@/plug-ins)
.TP 8
.B \-\-install\-script \fIscript.scm\fP
Install \fIscript.scm\fP into the user's personal \fIGimp\fP
script directory (\fB$HOME\fP/.gimp/scripts)
script directory (\fB$HOME\fP/@gimpdir@/scripts)
.TP 8
.B \-\-install\-admin\-script \fIscript.scm\fP
Install \fIscript.scm\fP into the system-wide \fIGimp\fP
script directory (\fB$PREFIX\fP/share/gimp/scripts)
script directory (@gimpdatadir@/scripts)
.TP 8
.B \-\-uninstall\-bin \fIplug-in\fP
Uninstall \fIplug-in\fP from the user's personal \fIGimp\fP
plug-in directory (\fB$HOME\fP/.gimp/plug-ins)
plug-in directory (\fB$HOME\fP/@gimpdir@/plug-ins)
.TP 8
.B \-\-uninstall\-admin\-bin \fIplug-in\fP
Uninstall \fIplug-in\fP from the system-wide \fIGimp\fP
plug-in directory (\fB$PREFIX\fP/lib/gimp/1.0/plug-ins)
plug-in directory (@gimpplugindir@/plug-ins)
.TP 8
.B \-\-uninstall\-script \fIscript.scm\fP
Uninstall \fIscript.scm\fP from the user's personal \fIGimp\fP
script directory (\fB$HOME\fP/.gimp/scripts)
script directory (\fB$HOME\fP/@gimpdir@/scripts)
.TP 8
.B \-\-uninstall\-admin\-script \fIscript.scm\fP
Uninstall \fIscript.scm\fP from the system-wide \fIGimp\fP
script directory (\fB$PREFIX\fP/share/gimp/scripts)
script directory (@gimpdatadir@/scripts)
.TP 8
.B \-\-libs
Print the linker flags that are necessary to link a \fIGimp\fP plug-in.

View File

@ -1,4 +1,4 @@
.TH GIMPTOOL 1 "23 June 2000" "Version @GIMP_VERSION@" "GIMP Manual Pages"
.TH GIMPTOOL 1 "26 June 2001" "Version @GIMP_VERSION@" "GIMP Manual Pages"
.SH NAME
gimptool - script to perform various Gimpy functions
.SH SYNOPSIS
@ -104,55 +104,55 @@ Compile,link, and strip \fIplug-in.c\fP into a \fIGimp\fP plug-in.
.TP 8
.B \-\-install \fIplug-in.c\fP
Compile, link, and install \fIplug-in.c\fP into the user's personal \fIGimp\fP
plug-in directory (\fB$HOME\fP/.gimp/plug-ins)
plug-in directory (\fB$HOME\fP/@gimpdir@/plug-ins)
.TP 8
.B \-\-install\-strip \fIplug-in.c\fP
Compile, link,strip, and install \fIplug-in.c\fP into the user's personal \fIGimp\fP
plug-in directory (\fB$HOME\fP/.gimp/plug-ins)
plug-in directory (\fB$HOME\fP/@gimpdir@/plug-ins)
.TP 8
.B \-\-install\-admin \fIplug-in.c\fP
Compile, link, and install \fIplug-in.c\fP into the system-wide \fIGimp\fP
plug-in directory (\fB$PREFIX\fP/lib/gimp/1.0/plug-ins)
plug-in directory (@gimpplugindir@/plug-ins)
.TP 8
.B \-\-install\-bin \fIplug-in\fP
Install \fIplug-in\fP into the user's personal \fIGimp\fP
plug-in directory (\fB$HOME\fP/.gimp/plug-ins)
plug-in directory (\fB$HOME\fP/@gimpdir@/plug-ins)
.TP 8
.B \-\-install\-admin\-bin \fIplug-in\fP
Install \fIplug-in\fP into the system-wide \fIGimp\fP
plug-in directory (\fB$PREFIX\fP/lib/gimp/1.0/plug-ins)
plug-in directory (@gimpplugindir@/plug-ins)
.TP 8
.B \-\-install\-bin\-strip \fIplug-in\fP
Install stripped \fIplug-in\fP into the user's personal \fIGimp\fP
plug-in directory (\fB$HOME\fP/.gimp/plug-ins)
plug-in directory (\fB$HOME\fP/@gimpdir@/plug-ins)
.TP 8
.B \-\-install\-admin\-bin\-strip \fIplug-in\fP
Install stripped \fIplug-in\fP into the system-wide \fIGimp\fP
plug-in directory (\fB$PREFIX\fP/lib/gimp/1.0/plug-ins)
plug-in directory (@gimpplugindir@/plug-ins)
.TP 8
.B \-\-install\-script \fIscript.scm\fP
Install \fIscript.scm\fP into the user's personal \fIGimp\fP
script directory (\fB$HOME\fP/.gimp/scripts)
script directory (\fB$HOME\fP/@gimpdir@/scripts)
.TP 8
.B \-\-install\-admin\-script \fIscript.scm\fP
Install \fIscript.scm\fP into the system-wide \fIGimp\fP
script directory (\fB$PREFIX\fP/share/gimp/scripts)
script directory (@gimpdatadir@/scripts)
.TP 8
.B \-\-uninstall\-bin \fIplug-in\fP
Uninstall \fIplug-in\fP from the user's personal \fIGimp\fP
plug-in directory (\fB$HOME\fP/.gimp/plug-ins)
plug-in directory (\fB$HOME\fP/@gimpdir@/plug-ins)
.TP 8
.B \-\-uninstall\-admin\-bin \fIplug-in\fP
Uninstall \fIplug-in\fP from the system-wide \fIGimp\fP
plug-in directory (\fB$PREFIX\fP/lib/gimp/1.0/plug-ins)
plug-in directory (@gimpplugindir@/plug-ins)
.TP 8
.B \-\-uninstall\-script \fIscript.scm\fP
Uninstall \fIscript.scm\fP from the user's personal \fIGimp\fP
script directory (\fB$HOME\fP/.gimp/scripts)
script directory (\fB$HOME\fP/@gimpdir@/scripts)
.TP 8
.B \-\-uninstall\-admin\-script \fIscript.scm\fP
Uninstall \fIscript.scm\fP from the system-wide \fIGimp\fP
script directory (\fB$PREFIX\fP/share/gimp/scripts)
script directory (@gimpdatadir@/scripts)
.TP 8
.B \-\-libs
Print the linker flags that are necessary to link a \fIGimp\fP plug-in.

View File

@ -812,16 +812,12 @@ HELP
headers => [ qw("gdisplay.h") ],
code => <<'CODE'
{
if (gimage->cmap)
{
g_free (gimage->cmap);
gimage->cmap = NULL;
}
if (gimage->cmap == NULL)
gimage->cmap = g_new (guchar, COLORMAP_SIZE);
if (num_bytes)
{
gimage->cmap = g_new (guchar, COLORMAP_SIZE);
memcpy (gimage->cmap, cmap, num_bytes);
}
memcpy (gimage->cmap, cmap, num_bytes);
gimage->num_cols = num_bytes / 3;
/* A colormap alteration affects the whole image */