Commit fe7e21af authored by Manish Singh's avatar Manish Singh

Made 1.1.7 release

* Made 1.1.7 release

* configure.in: version number bump

* ltconfig
* ltmain.sh: libtool 1.3.3

* app/channel_cmds.c
* tools/pdbgen/pdb/channel.pdb: remove opacity_arg alias for channel new

* Makefile.am: add pixmaps

* borderaverage moved into it's own dir again, to avoid gck problems

-Yosh
parent 2ce4bac5
Sat Jul 17 13:31:40 PDT 1999 Manish Singh <yosh@gimp.org>
* Made 1.1.7 release
* configure.in: version number bump
* ltconfig
* ltmain.sh: libtool 1.3.3
* app/channel_cmds.c
* tools/pdbgen/pdb/channel.pdb: remove opacity_arg alias for channel
new
* Makefile.am: add pixmaps
* borderaverage moved into it's own dir again, to avoid gck problems
Thu Jul 15 10:12:44 MEST 1999 Sven Neumann <sven@gimp.org>
* libgimp/gserialize.c
......
......@@ -50,6 +50,9 @@ EXTRA_DIST = \
pixmaps/penedit.xpm \
pixmaps/pennorm.xpm \
pixmaps/penstroke.xpm \
pixmaps/qmasksel.xpm \
pixmaps/qmasknosel.xpm \
pixmaps/topath.xpm \
pixmaps/toselection.xpm \
pixmaps/yes.xpm \
pixmaps/zoom_in.xpm \
......
......@@ -68,10 +68,9 @@ channel_new_invoker (Argument *args)
gint32 width;
gint32 height;
gchar *name;
gdouble opacity_arg;
gdouble opacity;
guchar *color;
Channel *channel = NULL;
int opacity;
gimage = pdb_id_to_image (args[0].value.pdb_int);
if (gimage == NULL)
......@@ -89,15 +88,15 @@ channel_new_invoker (Argument *args)
if (name == NULL)
success = FALSE;
opacity_arg = args[4].value.pdb_float;
if (opacity_arg < 0.0 || opacity_arg > 100.0)
opacity = args[4].value.pdb_float;
if (opacity < 0.0 || opacity > 100.0)
success = FALSE;
color = (guchar *) args[5].value.pdb_pointer;
if (success)
{
opacity = (int) ((opacity_arg * 255) / 100);
channel_set_opacity (channel, opacity);
channel = channel_new (gimage, width, height, name, opacity, color);
success = channel != NULL;
}
......@@ -642,7 +641,7 @@ channel_set_opacity_invoker (Argument *args)
success = FALSE;
if (success)
channel_set_opacity (channel, opacity);
channel->opacity = (int) ((opacity * 255) / 100);
return procedural_db_return_args (&channel_set_opacity_proc, success);
}
......@@ -745,7 +744,6 @@ channel_set_color_invoker (Argument *args)
gboolean success = TRUE;
Channel *channel;
guchar *color;
int i;
channel = channel_get_ID (args[0].value.pdb_int);
if (channel == NULL)
......
......@@ -4,7 +4,7 @@ AC_INIT(gimprc.in)
dnl Initialize automake stuff
GIMP_MAJOR_VERSION=1
GIMP_MINOR_VERSION=1
GIMP_MICRO_VERSION=6
GIMP_MICRO_VERSION=7
GIMP_INTERFACE_AGE=0
GIMP_BINARY_AGE=0
GIMP_VERSION=$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION.$GIMP_MICRO_VERSION
......@@ -639,6 +639,7 @@ plug-ins/FractalExplorer/fractalexplorer-examples/Makefile
plug-ins/Lighting/Makefile
plug-ins/MapObject/Makefile
plug-ins/bmp/Makefile
plug-ins/borderaverage/Makefile
plug-ins/common/Makefile
plug-ins/faxg3/Makefile
plug-ins/fits/Makefile
......
This diff is collapsed.
......@@ -54,8 +54,8 @@ modename="$progname"
# Constants.
PROGRAM=ltmain.sh
PACKAGE=libtool
VERSION=1.3.2
TIMESTAMP=" (1.385.2.150 1999/05/26 00:28:32)"
VERSION=1.3.3
TIMESTAMP=" (1.385.2.181 1999/07/02 15:49:11)"
default_mode=
help="Try \`$progname --help' for more information."
......@@ -69,7 +69,7 @@ rm="rm -f"
Xsed='sed -e 1s/^X//'
sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
SP2NL='tr \040 \012'
NL2SP='tr \012 \040'
NL2SP='tr \015\012 \040\040'
# NLS nuisances.
# Only set LANG and LC_ALL to C if already set.
......@@ -638,6 +638,12 @@ compiler."
# #undef WIN32_LEAN_AND_MEAN
# #include <stdio.h>
#
# #ifndef __CYGWIN__
# # ifdef __CYGWIN32__
# # define __CYGWIN__ __CYGWIN32__
# # endif
# #endif
#
# #ifdef __cplusplus
# extern "C" {
# #endif
......@@ -646,8 +652,10 @@ compiler."
# }
# #endif
#
# #ifdef __CYGWIN__
# #include <cygwin/cygwin_dll.h>
# DECLARE_CYGWIN_DLL( DllMain );
# #endif
# HINSTANCE __hDllInstance_base;
#
# BOOL APIENTRY
......@@ -893,6 +901,14 @@ compiler."
fi
case "$arg" in
*.la | *.lo) ;; # We handle these cases below.
force)
if test "$dlself" = no; then
dlself=needless
export_dynamic=yes
fi
prev=
continue
;;
self)
if test "$prev" = dlprefiles; then
dlself=yes
......@@ -1222,7 +1238,7 @@ compiler."
fi
if test -n "$dependency_libs"; then
# Extract -R from dependency_libs
# Extract -R and -L from dependency_libs
temp_deplibs=
for deplib in $dependency_libs; do
case "$deplib" in
......@@ -1234,7 +1250,13 @@ compiler."
-L*) case "$compile_command $temp_deplibs " in
*" $deplib "*) ;;
*) temp_deplibs="$temp_deplibs $deplib";;
esac;;
esac
temp_dir=`$echo "X$deplib" | $Xsed -e 's/^-L//'`
case " $lib_search_path " in
*" $temp_dir "*) ;;
*) lib_search_path="$lib_search_path $temp_dir";;
esac
;;
*) temp_deplibs="$temp_deplibs $deplib";;
esac
done
......@@ -2037,51 +2059,6 @@ EOF
# Use standard objects if they are pic
test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
if test -n "$whole_archive_flag_spec"; then
if test -n "$convenience"; then
eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
fi
else
gentop="$output_objdir/${outputname}x"
$show "${rm}r $gentop"
$run ${rm}r "$gentop"
$show "mkdir $gentop"
$run mkdir "$gentop"
status=$?
if test $status -ne 0 && test ! -d "$gentop"; then
exit $status
fi
generated="$generated $gentop"
for xlib in $convenience; do
# Extract the objects.
case "$xlib" in
[\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
*) xabs=`pwd`"/$xlib" ;;
esac
xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
xdir="$gentop/$xlib"
$show "${rm}r $xdir"
$run ${rm}r "$xdir"
$show "mkdir $xdir"
$run mkdir "$xdir"
status=$?
if test $status -ne 0 && test ! -d "$xdir"; then
exit $status
fi
$show "(cd $xdir && $AR x $xabs)"
$run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
libobjs="$libobjs "`find $xdir -name \*.o -print -o -name \*.lo -print | $NL2SP`
done
fi
if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
eval flag=\"$thread_safe_flag_spec\"
linkopts="$linkopts $flag"
fi
# Prepare the list of exported symbols
if test -z "$export_symbols"; then
if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
......@@ -2109,6 +2086,51 @@ EOF
$run eval '$echo "X$include_expsyms" | $SP2NL >> "$export_symbols"'
fi
if test -n "$convenience"; then
if test -n "$whole_archive_flag_spec"; then
eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
else
gentop="$output_objdir/${outputname}x"
$show "${rm}r $gentop"
$run ${rm}r "$gentop"
$show "mkdir $gentop"
$run mkdir "$gentop"
status=$?
if test $status -ne 0 && test ! -d "$gentop"; then
exit $status
fi
generated="$generated $gentop"
for xlib in $convenience; do
# Extract the objects.
case "$xlib" in
[\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
*) xabs=`pwd`"/$xlib" ;;
esac
xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
xdir="$gentop/$xlib"
$show "${rm}r $xdir"
$run ${rm}r "$xdir"
$show "mkdir $xdir"
$run mkdir "$xdir"
status=$?
if test $status -ne 0 && test ! -d "$xdir"; then
exit $status
fi
$show "(cd $xdir && $AR x $xabs)"
$run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
libobjs="$libobjs "`find $xdir -name \*.o -print -o -name \*.lo -print | $NL2SP`
done
fi
fi
if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
eval flag=\"$thread_safe_flag_spec\"
linkopts="$linkopts $flag"
fi
# Do each of the archive commands.
if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
eval cmds=\"$archive_expsym_cmds\"
......@@ -2187,8 +2209,58 @@ EOF
# Delete the old objects.
$run $rm $obj $libobj
# Objects from convenience libraries. This assumes
# single-version convenience libraries. Whenever we create
# different ones for PIC/non-PIC, this we'll have to duplicate
# the extraction.
reload_conv_objs=
gentop=
# reload_cmds runs $LD directly, so let us get rid of
# -Wl from whole_archive_flag_spec
wl=
if test -n "$convenience"; then
if test -n "$whole_archive_flag_spec"; then
eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
else
gentop="$output_objdir/${obj}x"
$show "${rm}r $gentop"
$run ${rm}r "$gentop"
$show "mkdir $gentop"
$run mkdir "$gentop"
status=$?
if test $status -ne 0 && test ! -d "$gentop"; then
exit $status
fi
generated="$generated $gentop"
for xlib in $convenience; do
# Extract the objects.
case "$xlib" in
[\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
*) xabs=`pwd`"/$xlib" ;;
esac
xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
xdir="$gentop/$xlib"
$show "${rm}r $xdir"
$run ${rm}r "$xdir"
$show "mkdir $xdir"
$run mkdir "$xdir"
status=$?
if test $status -ne 0 && test ! -d "$xdir"; then
exit $status
fi
$show "(cd $xdir && $AR x $xabs)"
$run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
reload_conv_objs="$reload_objs "`find $xdir -name \*.o -print -o -name \*.lo -print | $NL2SP`
done
fi
fi
# Create the old-style object.
reload_objs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`
reload_objs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs"
output="$obj"
eval cmds=\"$reload_cmds\"
......@@ -2201,9 +2273,21 @@ EOF
IFS="$save_ifs"
# Exit if we aren't doing a library object file.
test -z "$libobj" && exit 0
if test -z "$libobj"; then
if test -n "$gentop"; then
$show "${rm}r $gentop"
$run ${rm}r $gentop
fi
exit 0
fi
if test "$build_libtool_libs" != yes; then
if test -n "$gentop"; then
$show "${rm}r $gentop"
$run ${rm}r $gentop
fi
# Create an invalid libtool object if no PIC, so that we don't
# accidentally link it into a program.
$show "echo timestamp > $libobj"
......@@ -2213,7 +2297,7 @@ EOF
if test -n "$pic_flag"; then
# Only do commands if we really have different PIC objects.
reload_objs="$libobjs"
reload_objs="$libobjs $reload_conv_objs"
output="$libobj"
eval cmds=\"$reload_cmds\"
IFS="${IFS= }"; save_ifs="$IFS"; IFS='~'
......@@ -2231,6 +2315,11 @@ EOF
$run $LN_S $obj $libobj || exit $?
fi
if test -n "$gentop"; then
$show "${rm}r $gentop"
$run ${rm}r $gentop
fi
exit 0
;;
......@@ -2363,7 +2452,7 @@ EOF
fi
dlsyms=
if test -n "$dlfiles$dlprefiles" || test "$dlself" = yes; then
if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
if test -n "$NM" && test -n "$global_symbol_pipe"; then
dlsyms="${outputname}S.c"
else
......@@ -2776,7 +2865,7 @@ else
fi"
else
echo >> $output "\
program='$outputname'
program='$outputname$exeext'
progdir=\"\$thisdir/$objdir\"
"
fi
......@@ -3201,13 +3290,11 @@ libdir='$install_libdir'\
# Install the shared library and build the symlinks.
$show "$install_prog $dir/$realname $destdir/$realname"
$run eval "$install_prog $dir/$realname $destdir/$realname" || exit $?
test "X$dlname" = "X$realname" && dlname=
if test $# -gt 0; then
# Delete the old symlinks, and create new ones.
for linkname
do
test "X$dlname" = "X$linkname" && dlname=
if test "$linkname" != "$realname"; then
$show "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
$run eval "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
......@@ -3215,12 +3302,6 @@ libdir='$install_libdir'\
done
fi
if test -n "$dlname"; then
# Install the dynamically-loadable library.
$show "$install_prog $dir/$dlname $destdir/$dlname"
$run eval "$install_prog $dir/$dlname $destdir/$dlname" || exit $?
fi
# Do each command in the postinstall commands.
lib="$destdir/$realname"
eval cmds=\"$postinstall_cmds\"
......@@ -3652,9 +3733,7 @@ libdir='$install_libdir'\
# Delete the libtool libraries and symlinks.
for n in $library_names; do
rmfiles="$rmfiles $dir/$n"
test "X$n" = "X$dlname" && dlname=
done
test -n "$dlname" && rmfiles="$rmfiles $dir/$dlname"
test -n "$old_library" && rmfiles="$rmfiles $dir/$old_library"
$show "$rm $rmfiles"
......
......@@ -16,6 +16,7 @@ SUBDIRS = \
Lighting \
MapObject \
bmp \
borderaverage \
faxg3 \
fits \
flame \
......
Makefile.in
Makefile
.deps
_libs
.libs
borderaverage
## Process this file with automake to produce Makefile.in
libexecdir = $(gimpplugindir)/plug-ins
libexec_PROGRAMS = borderaverage
borderaverage_SOURCES = \
borderaverage.c
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/plug-ins/libgck \
$(GTK_CFLAGS) \
-I$(includedir)
AM_CPPFLAGS = \
-DLOCALEDIR=\""$(localedir)"\"
LDADD = \
$(top_builddir)/plug-ins/megawidget/libmegawidget.a \
$(top_builddir)/libgimp/libgimp.la \
$(top_builddir)/plug-ins/libgck/gck/libgck.la \
$(GTK_LIBS) \
$(INTLLIBS)
.PHONY: files
files:
@files=`ls $(DISTFILES) 2> /dev/null`; for p in $$files; do \
echo $$p; \
done
......@@ -21,7 +21,7 @@
#include <stdlib.h>
#include <libgimp/gimp.h>
#include <gtk/gtk.h>
#include <plug-ins/libgck/gck/gck.h>
#include <gck/gck.h>
#include <plug-ins/megawidget/megawidget.h>
#include "config.h"
......
......@@ -24,7 +24,6 @@ libexec_PROGRAMS = \
autostretch_hsv \
blinds \
blur \
borderaverage \
bumpmap \
bz2 \
c_astretch \
......@@ -32,6 +31,7 @@ libexec_PROGRAMS = \
colorify \
compose \
convmatrix \
csource \
cubism \
decompose \
deinterlace \
......@@ -62,7 +62,6 @@ libexec_PROGRAMS = \
guillotine \
gz \
header \
csource \
hot \
hrz \
illusion \
......@@ -235,16 +234,6 @@ blur_LDADD = \
$(GTK_LIBS) \
$(INTLLIBS)
borderaverage_SOURCES = \
borderaverage.c
borderaverage_LDADD = \
$(top_builddir)/plug-ins/megawidget/libmegawidget.a \
$(top_builddir)/plug-ins/libgck/gck/libgck.la \
$(top_builddir)/libgimp/libgimp.la \
$(GTK_LIBS) \
$(INTLLIBS)
bumpmap_SOURCES = \
bumpmap.c
......@@ -303,6 +292,14 @@ convmatrix_LDADD = \
$(GTK_LIBS) \
$(INTLLIBS)
csource_SOURCES = \
csource.c
csource_LDADD = \
$(top_builddir)/libgimp/libgimp.la \
$(GTK_LIBS) \
$(INTLLIBS)
cubism_SOURCES = \
cubism.c
......@@ -547,14 +544,6 @@ header_LDADD = \
$(GLIB_LIBS) \
$(INTLLIBS)
csource_SOURCES = \
csource.c
csource_LDADD = \
$(top_builddir)/libgimp/libgimp.la \
$(GTK_LIBS) \
$(INTLLIBS)
hot_SOURCES = \
hot.c
......
/* borderaverage 0.01 - image processing plug-in for the Gimp 1.0 API
*
* Copyright (C) 1998 Philipp Klaus (webmaster@access.ch)
*
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program 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 General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#include <stdlib.h>
#include <libgimp/gimp.h>
#include <gtk/gtk.h>
#include <gck/gck.h>
#include <plug-ins/megawidget/megawidget.h>
#include "config.h"
#include "libgimp/stdplugins-intl.h"
/* Declare local functions.
*/
static void query (void);
static void run (char *name,
int nparams,
GParam *param,
int *nreturn_vals,
GParam **return_vals);
static void borderaverage(GDrawable *drawable, guchar *res_r, guchar *res_g, guchar *res_b);
static gint borderaverage_dialog(void);
static void add_new_color (gint bytes, guchar* buffer, gint* cube, gint bucket_expo);
void menu_callback(GtkWidget *widget, gpointer client_data);
GPlugInInfo PLUG_IN_INFO =
{
NULL, /* init_proc */
NULL, /* quit_proc */
query, /* query_proc */
run, /* run_proc */
};
static gint borderaverage_thickness = 3;
static gint borderaverage_bucket_exponent = 4;
struct borderaverage_data {
gi