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

added --install-bin options for installing already built plugins 

* gimptool.in: added --install-bin options for installing already built plugins

* app/convolve.c: check for indexed images properly

* app/layer.c: fix tile refcount oversight

* app/text_tool.c: fix for unlikely memleak

* libgimp/gimpimage.c: stupid ytpo ;)

* plug-ins/gfli/gfli.c: applied gimp-wh-980507-0 to fix "chunk-type-7-bug"

-Yosh
This commit is contained in:
Manish Singh 1998-05-12 00:12:47 +00:00
parent c943c163e7
commit 343aef675b
16 changed files with 87 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ChangeLog
View File

@ -1,3 +1,19 @@
Mon May 11 16:59:18 PDT 1998 Manish Singh <yosh@gimp.org>
* gimptool.in: added --install-bin options for installing already
built plugins
* app/convolve.c: check for indexed images properly
* app/layer.c: fix tile refcount oversight
* app/text_tool.c: fix for unlikely memleak
* libgimp/gimpimage.c: stupid ytpo ;)
* plug-ins/gfli/gfli.c: applied gimp-wh-980507-0 to fix
"chunk-type-7-bug"
Mon May 11 23:28:20 MEST 1998 Sven Neumanns <sven@gimp.org>
* added two new scripts from Hrvoje Horvat

3
app/convolve.c
View File

@ -243,7 +243,8 @@ convolve_motion (PaintCore *paint_core,
return;
/* If the image type is indexed, don't convolve */
if (drawable_type (drawable) == INDEXED_GIMAGE)
if ((drawable_type (drawable) == INDEXED_GIMAGE) ||
(drawable_type (drawable) == INDEXEDA_GIMAGE))
return;
/* Get a region which can be used to paint to */

1
app/core/gimplayer.c
View File

@ -953,6 +953,7 @@ layer_pick_correlate (layer, x, y)
mask_tile = tile_manager_get_tile (GIMP_DRAWABLE(layer->mask)->tiles, x, y, 0);
tile_ref (mask_tile);
val = (val * mask_tile->data[mask_tile->ewidth * (y % TILE_HEIGHT) + (x % TILE_WIDTH)]) / 255;
tile_unref (mask_tile, FALSE);
}
tile_unref (tile, FALSE);

1
app/gimplayer.c
View File

@ -953,6 +953,7 @@ layer_pick_correlate (layer, x, y)
mask_tile = tile_manager_get_tile (GIMP_DRAWABLE(layer->mask)->tiles, x, y, 0);
tile_ref (mask_tile);
val = (val * mask_tile->data[mask_tile->ewidth * (y % TILE_HEIGHT) + (x % TILE_WIDTH)]) / 255;
tile_unref (mask_tile, FALSE);
}
tile_unref (tile, FALSE);

1
app/layer.c
View File

@ -953,6 +953,7 @@ layer_pick_correlate (layer, x, y)
mask_tile = tile_manager_get_tile (GIMP_DRAWABLE(layer->mask)->tiles, x, y, 0);
tile_ref (mask_tile);
val = (val * mask_tile->data[mask_tile->ewidth * (y % TILE_HEIGHT) + (x % TILE_WIDTH)]) / 255;
tile_unref (mask_tile, FALSE);
}
tile_unref (tile, FALSE);

3
app/paint/gimpconvolve.c
View File

@ -243,7 +243,8 @@ convolve_motion (PaintCore *paint_core,
return;
/* If the image type is indexed, don't convolve */
if (drawable_type (drawable) == INDEXED_GIMAGE)
if ((drawable_type (drawable) == INDEXED_GIMAGE) ||
(drawable_type (drawable) == INDEXEDA_GIMAGE))
return;
/* Get a region which can be used to paint to */

5
app/text_tool.c
View File

@ -1922,7 +1922,10 @@ text_render (GImage *gimage,
else
{
if (newmask)
warning("text_render: could not allocate image");
{
warning("text_render: could not allocate image");
tile_manager_destroy (newmask);
}
layer = NULL;
}

3
app/tools/convolve.c
View File

@ -243,7 +243,8 @@ convolve_motion (PaintCore *paint_core,
return;
/* If the image type is indexed, don't convolve */
if (drawable_type (drawable) == INDEXED_GIMAGE)
if ((drawable_type (drawable) == INDEXED_GIMAGE) ||
(drawable_type (drawable) == INDEXEDA_GIMAGE))
return;
/* Get a region which can be used to paint to */

3
app/tools/gimpconvolvetool.c
View File

@ -243,7 +243,8 @@ convolve_motion (PaintCore *paint_core,
return;
/* If the image type is indexed, don't convolve */
if (drawable_type (drawable) == INDEXED_GIMAGE)
if ((drawable_type (drawable) == INDEXED_GIMAGE) ||
(drawable_type (drawable) == INDEXEDA_GIMAGE))
return;
/* Get a region which can be used to paint to */

5
app/tools/gimptexttool.c
View File

@ -1922,7 +1922,10 @@ text_render (GImage *gimage,
else
{
if (newmask)
warning("text_render: could not allocate image");
{
warning("text_render: could not allocate image");
tile_manager_destroy (newmask);
}
layer = NULL;
}

5
app/tools/text_tool.c
View File

@ -1922,7 +1922,10 @@ text_render (GImage *gimage,
else
{
if (newmask)
warning("text_render: could not allocate image");
{
warning("text_render: could not allocate image");
tile_manager_destroy (newmask);
}
layer = NULL;
}

21
gimptool-1.2.in
View File

@ -72,6 +72,27 @@ while test $# -gt 0; do
--libs)
echo -L@libdir@ -lgimpui -lgimp `$gtk_config --libs`
;;
--install-bin | --install-admin-bin)
case $1 in
--install-bin)
install_dir="$HOME/.gimp/plug-ins" ;;
--install-admin-bin)
install_dir="$plug_in_dir/plug-ins" ;;
esac
if test "x$1" != "x"; then
if test -e "$1"; then
cp -a "$1" "$install_dir/$1"
else
echo "${notfound}" 1>&2
echo "${usage}" 1>&2
exit 1
fi
else
echo "${noarg}" 1>&2
echo "${usage}" 1>&2
exit 1
fi
;;
--build | --install | --install-admin)
case $1 in
--build)

21
gimptool.in
View File

@ -72,6 +72,27 @@ while test $# -gt 0; do
--libs)
echo -L@libdir@ -lgimpui -lgimp `$gtk_config --libs`
;;
--install-bin | --install-admin-bin)
case $1 in
--install-bin)
install_dir="$HOME/.gimp/plug-ins" ;;
--install-admin-bin)
install_dir="$plug_in_dir/plug-ins" ;;
esac
if test "x$1" != "x"; then
if test -e "$1"; then
cp -a "$1" "$install_dir/$1"
else
echo "${notfound}" 1>&2
echo "${usage}" 1>&2
exit 1
fi
else
echo "${noarg}" 1>&2
echo "${usage}" 1>&2
exit 1
fi
;;
--build | --install | --install-admin)
case $1 in
--build)

4
libgimp/gimpimage.c
View File

@ -554,8 +554,8 @@ gimp_image_get_component_active (gint32 image_ID,
}
gint
gimp_image_get_component_visibile (gint32 image_ID,
gint component)
gimp_image_get_component_visible (gint32 image_ID,
gint component)
{
GParam *return_vals;
int nreturn_vals;

4
libgimp/gimpimage_pdb.c
View File

@ -554,8 +554,8 @@ gimp_image_get_component_active (gint32 image_ID,
}
gint
gimp_image_get_component_visibile (gint32 image_ID,
gint component)
gimp_image_get_component_visible (gint32 image_ID,
gint component)
{
GParam *return_vals;
int nreturn_vals;

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

@ -332,7 +332,8 @@ void fli_read_frame(FILE *f, s_fli_header *fli_header, guchar *framebuf, guchar
lpf=0; lpn=0;
while (pc & 0x8000) {
if (pc & 0x4000) {
yc+=pc & 0x3FFF;
/* yc+=pc & 0x3FFF; */ /* BANG! */
yc+=0x10000-pc; /* better */
} else {
lpf=1;lpn=pc&0xFF;
}