dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

added --install-script. Use @INSTALL@ stuff 

* gimptool.in: added --install-script. Use @INSTALL@ stuff

* libgimp/gimpimage.c
* libgimp/gimplayer.c: fixes for silly errors from Marc Lehmann

* libgimp/gimpchannel.c: implemented gimp_channel_set_show_masked and
gimp_channel_get_show_masked (already in gimp.h>

* plug-ins/blinds/blinds.c
* plug-ins/bmp/bmp.h
* plug-ins/mosaic/mosaic.c
* plug-ins/ripple/ripple.c
* plug-ins/tga/tga.c
* plug-ins/tileit/tileit.c: remove definitions of TRUE and FALSE since glib
does it for us

-Yosh
This commit is contained in:
Manish Singh 1998-05-26 08:46:37 +00:00
parent 9b4d32e37a
commit 8024078a3b
20 changed files with 144 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ChangeLog
View File

@ -1,3 +1,21 @@
Tue May 26 01:17:14 PDT 1998 Manish Singh <yosh@gimp.org>
* gimptool.in: added --install-script. Use @INSTALL@ stuff
* libgimp/gimpimage.c
* libgimp/gimplayer.c: fixes for silly errors from Marc Lehmann
* libgimp/gimpchannel.c: implemented gimp_channel_set_show_masked
and gimp_channel_get_show_masked (already in gimp.h>
* plug-ins/blinds/blinds.c
* plug-ins/bmp/bmp.h
* plug-ins/mosaic/mosaic.c
* plug-ins/ripple/ripple.c
* plug-ins/tga/tga.c
* plug-ins/tileit/tileit.c: remove definitions of TRUE and FALSE
since glib does it for us
Sun May 24 08:41:34 EST 1998 Stephen Norris <srn@fn.com.au>
* plug-ins/displace/displace.c: Fix to GUI bug.

29
gimptool-1.2.in
View File

@ -4,9 +4,10 @@ prefix=@prefix@
exec_prefix=@exec_prefix@
exec_prefix_set=no
plug_in_dir=@gimpplugindir@
data_dir=@gimpdatadir@
usage="\
Usage: gimptool [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--cflags] [--build plug-in.c] [--install plug-in.c] [--install-admin plug-in.c]"
Usage: gimptool [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--cflags] [--build plug-in.c] [--install plug-in.c] [--install-admin plug-in.c] [--install-script script.scm] [--install-admin-script script.scm]"
noarg="\
Error: Need a plug-in source file to build"
@ -72,16 +73,32 @@ while test $# -gt 0; do
--libs)
echo -L@libdir@ -lgimpui -lgimp `$gtk_config --libs`
;;
--install-bin | --install-admin-bin)
--install-bin | --install-admin-bin \
| --install-script | --install-admin-script)
case $1 in
--install-bin)
install_dir="$HOME/.gimp/plug-ins" ;;
install_cmd="@INSTALL@ @INSTALL_PROGRAM@"
install_dir="$HOME/.gimp/plug-ins"
;;
--install-admin-bin)
install_dir="$plug_in_dir/plug-ins" ;;
install_cmd="@INSTALL@ @INSTALL_PROGRAM@"
install_dir="$plug_in_dir/plug-ins"
;;
--install-script)
install_cmd="@INSTALL@ @INSTALL_DATA@"
install_dir="$HOME/.gimp/scripts"
;;
--install-admin-script)
install_cmd="@INSTALL@ @INSTALL_DATA@"
install_dir="$data_dir/scripts"
;;
esac
shift
if test "x$1" != "x"; then
if test -e "$1"; then
cp -a "$1" "$install_dir/$1"
cmd="$install_cmd $1 $install_dir/$1"
echo $cmd
exec $cmd
else
echo "${notfound}" 1>&2
echo "${usage}" 1>&2
@ -110,7 +127,7 @@ while test $# -gt 0; do
if test -e "$1"; then
cmd="$cc $cflags $includes `$gtk_config --cflags` -o $install_dir/`echo $1|sed 's/\.[^\.]*$//'` $1 -L@libdir@ -lgimpui -lgimp `$gtk_config --libs`"
echo $cmd
eval $cmd
exec $cmd
else
echo "${notfound}" 1>&2
echo "${usage}" 1>&2

29
gimptool.in
View File

@ -4,9 +4,10 @@ prefix=@prefix@
exec_prefix=@exec_prefix@
exec_prefix_set=no
plug_in_dir=@gimpplugindir@
data_dir=@gimpdatadir@
usage="\
Usage: gimptool [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--cflags] [--build plug-in.c] [--install plug-in.c] [--install-admin plug-in.c]"
Usage: gimptool [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--cflags] [--build plug-in.c] [--install plug-in.c] [--install-admin plug-in.c] [--install-script script.scm] [--install-admin-script script.scm]"
noarg="\
Error: Need a plug-in source file to build"
@ -72,16 +73,32 @@ while test $# -gt 0; do
--libs)
echo -L@libdir@ -lgimpui -lgimp `$gtk_config --libs`
;;
--install-bin | --install-admin-bin)
--install-bin | --install-admin-bin \
| --install-script | --install-admin-script)
case $1 in
--install-bin)
install_dir="$HOME/.gimp/plug-ins" ;;
install_cmd="@INSTALL@ @INSTALL_PROGRAM@"
install_dir="$HOME/.gimp/plug-ins"
;;
--install-admin-bin)
install_dir="$plug_in_dir/plug-ins" ;;
install_cmd="@INSTALL@ @INSTALL_PROGRAM@"
install_dir="$plug_in_dir/plug-ins"
;;
--install-script)
install_cmd="@INSTALL@ @INSTALL_DATA@"
install_dir="$HOME/.gimp/scripts"
;;
--install-admin-script)
install_cmd="@INSTALL@ @INSTALL_DATA@"
install_dir="$data_dir/scripts"
;;
esac
shift
if test "x$1" != "x"; then
if test -e "$1"; then
cp -a "$1" "$install_dir/$1"
cmd="$install_cmd $1 $install_dir/$1"
echo $cmd
exec $cmd
else
echo "${notfound}" 1>&2
echo "${usage}" 1>&2
@ -110,7 +127,7 @@ while test $# -gt 0; do
if test -e "$1"; then
cmd="$cc $cflags $includes `$gtk_config --cflags` -o $install_dir/`echo $1|sed 's/\.[^\.]*$//'` $1 -L@libdir@ -lgimpui -lgimp `$gtk_config --libs`"
echo $cmd
eval $cmd
exec $cmd
else
echo "${notfound}" 1>&2
echo "${usage}" 1>&2

37
libgimp/gimpchannel.c
View File

@ -265,3 +265,40 @@ gimp_channel_set_visible (gint32 channel_ID,
gimp_destroy_params (return_vals, nreturn_vals);
}
gint
gimp_channel_get_show_masked (gint32 channel_ID)
{
GParam *return_vals;
int nreturn_vals;
int show_masked;
return_vals = gimp_run_procedure ("gimp_channel_get_show_masked",
&nreturn_vals,
PARAM_CHANNEL, channel_ID,
PARAM_END);
show_masked = -1;
if (return_vals[0].data.d_status == STATUS_SUCCESS)
show_masked = return_vals[1].data.d_int32;
gimp_destroy_params (return_vals, nreturn_vals);
return show_masked;
}
void
gimp_channel_set_show_masked (gint32 channel_ID,
gint show_masked)
{
GParam *return_vals;
int nreturn_vals;
return_vals = gimp_run_procedure ("gimp_channel_set_show_masked",
&nreturn_vals,
PARAM_CHANNEL, channel_ID,
PARAM_INT32, show_masked,
PARAM_END);
gimp_destroy_params (return_vals, nreturn_vals);
}

37
libgimp/gimpchannel_pdb.c
View File

@ -265,3 +265,40 @@ gimp_channel_set_visible (gint32 channel_ID,
gimp_destroy_params (return_vals, nreturn_vals);
}
gint
gimp_channel_get_show_masked (gint32 channel_ID)
{
GParam *return_vals;
int nreturn_vals;
int show_masked;
return_vals = gimp_run_procedure ("gimp_channel_get_show_masked",
&nreturn_vals,
PARAM_CHANNEL, channel_ID,
PARAM_END);
show_masked = -1;
if (return_vals[0].data.d_status == STATUS_SUCCESS)
show_masked = return_vals[1].data.d_int32;
gimp_destroy_params (return_vals, nreturn_vals);
return show_masked;
}
void
gimp_channel_set_show_masked (gint32 channel_ID,
gint show_masked)
{
GParam *return_vals;
int nreturn_vals;
return_vals = gimp_run_procedure ("gimp_channel_set_show_masked",
&nreturn_vals,
PARAM_CHANNEL, channel_ID,
PARAM_INT32, show_masked,
PARAM_END);
gimp_destroy_params (return_vals, nreturn_vals);
}

4
libgimp/gimpimage.c
View File

@ -301,7 +301,7 @@ gimp_image_merge_visible_layers (gint32 image_ID,
layer_ID = -1;
if (return_vals[0].data.d_status == STATUS_SUCCESS)
layer_ID = return_vals[0].data.d_layer;
layer_ID = return_vals[1].data.d_layer;
gimp_destroy_params (return_vals, nreturn_vals);
@ -326,7 +326,7 @@ gimp_image_pick_correlate_layer (gint32 image_ID,
layer_ID = -1;
if (return_vals[0].data.d_status == STATUS_SUCCESS)
layer_ID = return_vals[0].data.d_layer;
layer_ID = return_vals[1].data.d_layer;
gimp_destroy_params (return_vals, nreturn_vals);

4
libgimp/gimpimage_pdb.c
View File

@ -301,7 +301,7 @@ gimp_image_merge_visible_layers (gint32 image_ID,
layer_ID = -1;
if (return_vals[0].data.d_status == STATUS_SUCCESS)
layer_ID = return_vals[0].data.d_layer;
layer_ID = return_vals[1].data.d_layer;
gimp_destroy_params (return_vals, nreturn_vals);
@ -326,7 +326,7 @@ gimp_image_pick_correlate_layer (gint32 image_ID,
layer_ID = -1;
if (return_vals[0].data.d_status == STATUS_SUCCESS)
layer_ID = return_vals[0].data.d_layer;
layer_ID = return_vals[1].data.d_layer;
gimp_destroy_params (return_vals, nreturn_vals);

2
libgimp/gimplayer.c
View File

@ -516,7 +516,7 @@ gimp_layer_set_opacity (gint32 layer_ID,
return_vals = gimp_run_procedure ("gimp_layer_set_opacity",
&nreturn_vals,
PARAM_LAYER, layer_ID,
PARAM_INT32, opacity,
PARAM_FLOAT, opacity,
PARAM_END);
gimp_destroy_params (return_vals, nreturn_vals);

2
libgimp/gimplayer_pdb.c
View File

@ -516,7 +516,7 @@ gimp_layer_set_opacity (gint32 layer_ID,
return_vals = gimp_run_procedure ("gimp_layer_set_opacity",
&nreturn_vals,
PARAM_LAYER, layer_ID,
PARAM_INT32, opacity,
PARAM_FLOAT, opacity,
PARAM_END);
gimp_destroy_params (return_vals, nreturn_vals);

3
plug-ins/blinds/blinds.c
View File

@ -76,9 +76,6 @@
#define HORIZONTAL 0
#define VERTICAL 1
#define TRUE 1
#define FALSE 0
/* Variables set in dialog box */
typedef struct data {
gint angledsp;

2
plug-ins/bmp/bmp.h
View File

@ -1,7 +1,5 @@
#include <libgimp/gimp.h>
#define TRUE 1
#define FALSE 0
#define MAXCOLORS 256
#define Image gint32

3
plug-ins/common/blinds.c
View File

@ -76,9 +76,6 @@
#define HORIZONTAL 0
#define VERTICAL 1
#define TRUE 1
#define FALSE 0
/* Variables set in dialog box */
typedef struct data {
gint angledsp;

3
plug-ins/common/mosaic.c
View File

@ -43,9 +43,6 @@
#define SQR(x) ((x) * (x))
#define TRUE 1
#define FALSE 0
#define HORIZONTAL 0
#define VERTICAL 1
#define OPAQUE 255

3
plug-ins/common/ripple.c
View File

@ -48,9 +48,6 @@
#define SAWTOOTH 0
#define SINE 1
#define TRUE 1
#define FALSE 0
typedef struct {
gint period;
gint amplitude;

3
plug-ins/common/tga.c
View File

@ -79,9 +79,6 @@
#include <gtk/gtk.h>
#include "libgimp/gimp.h"
#define FALSE 0
#define TRUE 1
/* Round up a division to the nearest integer. */
#define ROUNDUP_DIVIDE(n,d) (((n) + (d - 1)) / (d))

3
plug-ins/common/tileit.c
View File

@ -57,9 +57,6 @@
#define MAX_SEGS 6
#define TRUE 1
#define FALSE 0
#define PREVIEW_MASK GDK_EXPOSURE_MASK | \
GDK_BUTTON_PRESS_MASK | \
GDK_BUTTON_MOTION_MASK

3
plug-ins/mosaic/mosaic.c
View File

@ -43,9 +43,6 @@
#define SQR(x) ((x) * (x))
#define TRUE 1
#define FALSE 0
#define HORIZONTAL 0
#define VERTICAL 1
#define OPAQUE 255

3
plug-ins/ripple/ripple.c
View File

@ -48,9 +48,6 @@
#define SAWTOOTH 0
#define SINE 1
#define TRUE 1
#define FALSE 0
typedef struct {
gint period;
gint amplitude;

3
plug-ins/tga/tga.c
View File

@ -79,9 +79,6 @@
#include <gtk/gtk.h>
#include "libgimp/gimp.h"
#define FALSE 0
#define TRUE 1
/* Round up a division to the nearest integer. */
#define ROUNDUP_DIVIDE(n,d) (((n) + (d - 1)) / (d))

3
plug-ins/tileit/tileit.c
View File

@ -57,9 +57,6 @@
#define MAX_SEGS 6
#define TRUE 1
#define FALSE 0
#define PREVIEW_MASK GDK_EXPOSURE_MASK | \
GDK_BUTTON_PRESS_MASK | \
GDK_BUTTON_MOTION_MASK