Commit 05c69f12 authored by Manish Singh's avatar Manish Singh

acinclude.m4 config.guess config.sub ltconfig upgrade to libtool 1.2f

* acinclude.m4
* config.guess
* config.sub
* ltconfig
* ltmain.sh: upgrade to libtool 1.2f

* autogen.sh: libtool is not required to autogen gtk+

* acconfig.h: remove WITH_SYMBOL_UNDERSCORE (not explictly needed)

* app/actionarea.h: made the label in ActionAreaItem const

* app/convert.[ch]: made FOO_PALETTE #defines into an enum

* libgimp/parasite.c
* app/brightness_contrast.c
* app/color_picker.c
* app/colormap_dialog.i.c
* app/curves.c
* app/equalize.c
* app/gimplut.c
* app/histogram_tool.c
* app/invert.c
* app/levels.c
* app/paint_funcs.c
* app/pixel_regions.c
* app/posterize.c
* app/rect_select.c
* app/threshold.c
* app/xcf.c: remove unused vars, other minor code cleanups

* app/procedural_db.h: #include <glib.h>

* Makefile.am: add README.perl to EXTRA_DIST

-Yosh
parent 139811d0
Fri Mar 19 20:24:20 PST 1999 Manish Singh <yosh@gimp.org>
* acinclude.m4
* config.guess
* config.sub
* ltconfig
* ltmain.sh: upgrade to libtool 1.2f
* autogen.sh: libtool is not required to autogen gtk+
* acconfig.h: remove WITH_SYMBOL_UNDERSCORE (not explictly
needed)
* app/actionarea.h: made the label in ActionAreaItem const
* app/convert.[ch]: made FOO_PALETTE #defines into an enum
* libgimp/parasite.c
* app/brightness_contrast.c
* app/color_picker.c
* app/colormap_dialog.i.c
* app/curves.c
* app/equalize.c
* app/gimplut.c
* app/histogram_tool.c
* app/invert.c
* app/levels.c
* app/paint_funcs.c
* app/pixel_regions.c
* app/posterize.c
* app/rect_select.c
* app/threshold.c
* app/xcf.c: remove unused vars, other minor code cleanups
* app/procedural_db.h: #include <glib.h>
* Makefile.am: add README.perl to EXTRA_DIST
Fri Mar 19 04:01:04 EST 1999 Adrian Likins <adrian@gimp.org>
* plug-ins/mail/mail.c: added a from: field, made
......
......@@ -30,6 +30,7 @@ EXTRA_DIST = \
pixmaps/zoom_out.xpm \
README.i18n \
README.win32 \
README.perl \
ChangeLog.pre-1-0 \
MAINTAINERS \
TODO \
......
......@@ -49,8 +49,6 @@
#undef USE_PTHREADS
#undef WITH_SYMBOL_UNDERSCORE
/* Leave that blank line there!! Autoheader needs it.
If you're adding to this file, keep in mind:
......
......@@ -21,11 +21,41 @@
## configuration script generated by Autoconf, you may include it under
## the same distribution terms that you use for the rest of that program.
# serial 30 AC_PROG_LIBTOOL
# serial 35 AC_PROG_LIBTOOL
AC_DEFUN(AC_PROG_LIBTOOL,
[AC_PREREQ(2.12.2)dnl
[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
# Save cache, so that ltconfig can load it
AC_CACHE_SAVE
# Actually configure libtool. ac_aux_dir is where install-sh is found.
CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
LD="$LD" NM="$NM" RANLIB="$RANLIB" LN_S="$LN_S" \
DLLTOOL="$DLLTOOL" AS="$AS" \
${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
|| AC_MSG_ERROR([libtool configure failed])
# Reload cache, that may have been modified by ltconfig
AC_CACHE_LOAD
# This can be used to rebuild libtool when needed
LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
# Always use our own libtool.
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
AC_SUBST(LIBTOOL)dnl
# Redirect the config.log output again, so that the ltconfig log is not
# clobbered by the next message.
exec 5>>./config.log
])
AC_DEFUN(AC_LIBTOOL_SETUP,
[AC_PREREQ(2.13)dnl
AC_REQUIRE([AC_ENABLE_SHARED])dnl
AC_REQUIRE([AC_ENABLE_STATIC])dnl
AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
AC_REQUIRE([AC_CANONICAL_HOST])dnl
AC_REQUIRE([AC_CANONICAL_BUILD])dnl
AC_REQUIRE([AC_PROG_RANLIB])dnl
......@@ -36,14 +66,13 @@ AC_REQUIRE([AC_SYS_NM_PARSE])dnl
AC_REQUIRE([AC_SYS_SYMBOL_UNDERSCORE])dnl
AC_REQUIRE([AC_PROG_LN_S])dnl
dnl
# Always use our own libtool.
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
AC_SUBST(LIBTOOL)dnl
# Check for any special flags to pass to ltconfig.
libtool_flags=
libtool_flags="--cache-file=$cache_file"
test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
test "$lt_dlopen" = yes && libtool_flags="$libtool_flags --enable-dlopen"
test "$silent" = yes && libtool_flags="$libtool_flags --silent"
test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc"
test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
......@@ -82,8 +111,8 @@ case "$host" in
fi
;;
*-*-cygwin32*)
AC_SYS_LIBTOOL_CYGWIN32
*-*-cygwin*)
AC_SYS_LIBTOOL_CYGWIN
;;
esac
......@@ -98,24 +127,11 @@ need_locks=yes)
if test x"$need_locks" = xno; then
libtool_flags="$libtool_flags --disable-lock"
fi
# Actually configure libtool. ac_aux_dir is where install-sh is found.
CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
LD="$LD" NM="$NM" RANLIB="$RANLIB" LN_S="$LN_S" \
DLLTOOL="$DLLTOOL" AS="$AS" \
${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
|| AC_MSG_ERROR([libtool configure failed])
# This can be used to rebuild libtool when needed
LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
# Redirect the config.log output again, so that the ltconfig log is not
# clobbered by the next message.
exec 5>>./config.log
])
# AC_LIBTOOL_DLOPEN - check for dlopen support
AC_DEFUN(AC_LIBTOOL_DLOPEN, [lt_dlopen=yes])
# AC_ENABLE_SHARED - implement the --enable-shared flag
# Usage: AC_ENABLE_SHARED[(DEFAULT)]
# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to
......@@ -149,10 +165,6 @@ enable_shared=AC_ENABLE_SHARED_DEFAULT)dnl
AC_DEFUN(AC_DISABLE_SHARED,
[AC_ENABLE_SHARED(no)])
# AC_DISABLE_STATIC - set the default static flag to --disable-static
AC_DEFUN(AC_DISABLE_STATIC,
[AC_ENABLE_STATIC(no)])
# AC_ENABLE_STATIC - implement the --enable-static flag
# Usage: AC_ENABLE_STATIC[(DEFAULT)]
# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to
......@@ -182,6 +194,44 @@ esac],
enable_static=AC_ENABLE_STATIC_DEFAULT)dnl
])
# AC_DISABLE_STATIC - set the default static flag to --disable-static
AC_DEFUN(AC_DISABLE_STATIC,
[AC_ENABLE_STATIC(no)])
# AC_ENABLE_FAST_INSTALL - implement the --enable-fast-install flag
# Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)]
# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to
# `yes'.
AC_DEFUN(AC_ENABLE_FAST_INSTALL,
[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
AC_ARG_ENABLE(fast-install,
changequote(<<, >>)dnl
<< --enable-fast-install[=PKGS] optimize for fast installation [default=>>AC_ENABLE_FAST_INSTALL_DEFAULT],
changequote([, ])dnl
[p=${PACKAGE-default}
case "$enableval" in
yes) enable_fast_install=yes ;;
no) enable_fast_install=no ;;
*)
enable_fast_install=no
# Look at the argument we got. We use all the common list separators.
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
for pkg in $enableval; do
if test "X$pkg" = "X$p"; then
enable_fast_install=yes
fi
done
IFS="$ac_save_ifs"
;;
esac],
enable_fast_install=AC_ENABLE_FAST_INSTALL_DEFAULT)dnl
])
# AC_ENABLE_FAST_INSTALL - set the default to --disable-fast-install
AC_DEFUN(AC_DISABLE_FAST_INSTALL,
[AC_ENABLE_FAST_INSTALL(no)])
# AC_PROG_LD - find the path to the GNU or non-GNU linker
AC_DEFUN(AC_PROG_LD,
......@@ -199,47 +249,15 @@ if test "$ac_cv_prog_gcc" = yes; then
case "$ac_prog" in
# Accept absolute paths.
changequote(,)dnl
/* | [A-Za-z]:/*)
# Canonicalize the path of ld
/* | [A-Za-z]:[\\/]*)
re_direlt='/[^/][^/]*/\.\./'
sub_uncdrive='s%^\([A-Za-z]\):/%//\1/%'
changequote([,])dnl
while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
done
case "$host_os" in
cygwin*)
# Convert to a UNC path for cygwin
test -z "$LD" && LD=`echo X$ac_prog | sed -e "1s/^X//" -e "$sub_uncdrive"`
;;
*)
test -z "$LD" && LD="$ac_prog"
;;
esac
;;
##
## FIXME: The code fails later on if we try to use an $LD with
## '\\' path separators.
##
changequote(,)dnl
[A-Za-z]:[\\]*)
# Canonicalize the path of ld
re_direlt='\\[^\\][^\\]*\\\.\.\(\\\)'
sub_uncdrive='s%^\([A-Za-z]\):\\%//\1/%'
changequote([,])dnl
sub_uncdir='s%\\%/%g'
ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
ac_prog=`echo $ac_prog| sed "s%$re_direlt%\1%"`
ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
done
case "$host_os" in
cygwin*)
# Convert to a UNC path for cygwin
test -z "$LD" && LD=`echo X$ac_prog | sed -e 's%^X%%' -e "$sub_uncdrive" -e "$sub_uncdir"`
;;
*)
test -z "$LD" && LD="$ac_prog"
;;
esac
test -z "$LD" && LD="$ac_prog"
;;
"")
# If it fails, then pretend we aren't using GCC.
......@@ -332,7 +350,7 @@ AC_MSG_RESULT([$NM])
AC_SUBST(NM)
])
# AC_SYS_NM_PARSE - Check for command ro grab the raw symbol name followed
# AC_SYS_NM_PARSE - Check for command to grab the raw symbol name followed
# by C symbol name from nm.
AC_DEFUN(AC_SYS_NM_PARSE,
[AC_REQUIRE([AC_CANONICAL_HOST])dnl
......@@ -351,16 +369,22 @@ ac_symcode='[BCDEGRST]'
ac_sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
# Transform the above into a raw symbol and a C symbol.
ac_symxfrm='\1 \1'
ac_symxfrm='\1 \2\3 \3'
# Transform an extracted symbol line into a proper C declaration
ac_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern char \1;/p'"
# Define system-specific variables.
case "$host_os" in
aix*)
ac_symcode='[BCDT]'
;;
cygwin32* | mingw32*)
cygwin* | mingw*)
ac_symcode='[ABCDGISTW]'
;;
hpux*)
ac_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^. .* \(.*\)$/extern char \1;/p'"
;;
irix*)
ac_symcode='[BCDEGRST]'
;;
......@@ -378,10 +402,7 @@ changequote([,])dnl
# Try without a prefix undercore, then with it.
for ac_symprfx in "" "_"; do
# Write the raw and C identifiers.
# Unlike in ltconfig.in, we need $ac_symprfx before $ac_symxfrm here,
# otherwise AC_SYS_SYMBOL_UNDERSCORE will always be false
ac_cv_sys_global_symbol_pipe="sed -n -e 's/^.* $ac_symcode $ac_symprfx$ac_sympat$/$ac_symprfx$ac_symxfrm/p'"
ac_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($ac_symcode\)[ ][ ]*\($ac_symprfx\)$ac_sympat$/$ac_symxfrm/p'"
# Check to see that the pipe works correctly.
ac_pipe_works=no
......@@ -421,7 +442,7 @@ extern "C" {
EOF
# Now generate the symbol file.
sed 's/^.* \(.*\)$/extern char \1;/' < "$ac_nlist" >> conftest.c
eval "$ac_global_symbol_to_cdecl"' < "$ac_nlist" >> conftest.c'
cat <<EOF >> conftest.c
#if defined (__STDC__) && __STDC__
......@@ -441,7 +462,7 @@ lt_preloaded_symbols[] =
changequote([,])dnl
{
EOF
sed 's/^\(.*\) \(.*\)$/ {"\1", (lt_ptr_t) \&\2},/' < "$ac_nlist" >> conftest.c
sed 's/^. \(.*\) \(.*\)$/ {"\2", (lt_ptr_t) \&\2},/' < "$ac_nlist" >> conftest.c
cat <<\EOF >> conftest.c
{0, (lt_ptr_t) 0}
};
......@@ -500,8 +521,8 @@ fi
AC_MSG_RESULT($ac_result)
])
# AC_SYS_LIBTOOL_CYGWIN32 - find tools needed on cygwin32
AC_DEFUN(AC_SYS_LIBTOOL_CYGWIN32,
# AC_SYS_LIBTOOL_CYGWIN - find tools needed on cygwin
AC_DEFUN(AC_SYS_LIBTOOL_CYGWIN,
[AC_CHECK_TOOL(DLLTOOL, dlltool, false)
AC_CHECK_TOOL(AS, as, false)
])
......@@ -523,10 +544,10 @@ if AC_TRY_EVAL(ac_compile); then
ac_nlist=conftest.nm
if AC_TRY_EVAL(NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist) && test -s "$ac_nlist"; then
# See whether the symbols have a leading underscore.
if egrep '^_nm_test_func' "$ac_nlist" >/dev/null; then
if egrep '^. _nm_test_func' "$ac_nlist" >/dev/null; then
ac_cv_sys_symbol_underscore=yes
else
if egrep '^nm_test_func ' "$ac_nlist" >/dev/null; then
if egrep '^. nm_test_func ' "$ac_nlist" >/dev/null; then
:
else
echo "configure: cannot find nm_test_func in $ac_nlist" >&AC_FD_CC
......@@ -546,6 +567,51 @@ USE_SYMBOL_UNDERSCORE=${ac_cv_sys_symbol_underscore=no}
AC_SUBST(USE_SYMBOL_UNDERSCORE)dnl
])
# AC_CHECK_LIBM - check for math library
AC_DEFUN(AC_CHECK_LIBM, [
AC_CHECK_LIB(mw, _mwvalidcheckl)
AC_CHECK_LIB(m, cos)
])
# AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for
# the libltdl convenience library, adds --enable-ltdl-convenience to
# the configure arguments. Note that LIBLTDL is not AC_SUBSTed, nor
# is AC_CONFIG_SUBDIRS called. If DIR is not provided, it is assumed
# to be `${top_builddir}/libltdl'. Make sure you start DIR with
# '${top_builddir}/' (note the single quotes!) if your package is not
# flat, and, if you're not using automake, define top_builddir as
# appropriate in the Makefiles.
AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [
case "$enable_ltdl_convenience" in
no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
"") enable_ltdl_convenience=yes
ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
esac
LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdlc.la
])
# AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for
# the libltdl installable library, and adds --enable-ltdl-install to
# the configure arguments. Note that LIBLTDL is not AC_SUBSTed, nor
# is AC_CONFIG_SUBDIRS called. If DIR is not provided, it is assumed
# to be `${top_builddir}/libltdl'. Make sure you start DIR with
# '${top_builddir}/' (note the single quotes!) if your package is not
# flat, and, if you're not using automake, define top_builddir as
# appropriate in the Makefiles.
# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [
AC_CHECK_LIB(ltdl, main, LIBLTDL="-lltdl", [
case "$enable_ltdl_install" in
no) AC_MSG_WARN([libltdl not installed, but installation disabled]) ;;
"") enable_ltdl_install=yes
ac_configure_args="$ac_configure_args --enable-ltdl-install" ;;
esac
])
if test x"$enable_ltdl_install" != x"no"; then
LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdl.la
fi
])
dnl old names
AC_DEFUN(AM_PROG_LIBTOOL, [indir([AC_PROG_LIBTOOL])])dnl
AC_DEFUN(AM_ENABLE_SHARED, [indir([AC_ENABLE_SHARED], $@)])dnl
......@@ -556,4 +622,4 @@ AC_DEFUN(AM_PROG_LD, [indir([AC_PROG_LD])])dnl
AC_DEFUN(AM_PROG_NM, [indir([AC_PROG_NM])])dnl
AC_DEFUN(AM_SYS_NM_PARSE, [indir([AC_SYS_NM_PARSE])])dnl
AC_DEFUN(AM_SYS_SYMBOL_UNDERSCORE, [indir([AC_SYS_SYMBOL_UNDERSCORE])])dnl
AC_DEFUN(AM_SYS_LIBTOOL_CYGWIN32, [indir([AC_SYS_LIBTOOL_CYGWIN32])])dnl
AC_DEFUN(AM_SYS_LIBTOOL_CYGWIN, [indir([AC_SYS_LIBTOOL_CYGWIN])])dnl
......@@ -22,7 +22,7 @@
typedef void (*ActionCallback) (GtkWidget *, gpointer);
typedef struct {
char *label;
const char *label;
ActionCallback callback;
gpointer user_data;
GtkWidget *widget;
......
......@@ -1346,7 +1346,6 @@ curves_spline_invoker (Argument *args)
unsigned char *control_pts;
int x1, y1, x2, y2;
int i, j;
void *pr;
GimpDrawable *drawable;
/* the drawable */
......@@ -1497,7 +1496,6 @@ curves_explicit_invoker (Argument *args)
unsigned char *curve;
int x1, y1, x2, y2;
int i, j;
void *pr;
GimpDrawable *drawable;
/* the drawable */
......
......@@ -86,7 +86,7 @@ gimp_lut_process (GimpLut *lut,
{
int h, width, src_r_i, dest_r_i;
unsigned char *src, *dest;
unsigned char *lut0, *lut1, *lut2, *lut3;
unsigned char *lut0 = NULL, *lut1 = NULL, *lut2 = NULL, *lut3 = NULL;
if (lut->nchannels > 0)
lut0 = lut->luts[0];
......
......@@ -173,18 +173,7 @@ hue_saturation_calculate_transfers (HueSaturationDialog *hsd)
the new behavior is exactly what you want. It's hard for me
to imagine a case in which the old behavior is better.
*/
/* This isn't working properly with an image with 0 saturation
* e.g. a grayscale image. Comment out for now -Yosh
*/
/* #define RAPH */
#ifdef RAPH
saturation_transfer[hue][i] = BOUNDS((i * (255 + value)) / 255, 0, 255);
#else
if (value < 0)
saturation_transfer[hue][i] = (unsigned char) ((i * (255 + value)) / 255);
else
saturation_transfer[hue][i] = (unsigned char) (i + ((255 - i) * value) / 255);
#endif
}
}
......
......@@ -385,11 +385,10 @@ do_parallel_regions(struct parallel_struct *p_s)
void pixel_regions_process_parallel(p_func f, void *data, int num_regions, ...)
{
int i;
PixelRegionIterator *PRI;
struct parallel_struct p_s;
IF_THREAD(pthread_t threads[MAX_THREADS];)
IF_THREAD(pthread_attr_t pthread_attr;)
int nthreads;
IF_THREAD(int nthreads;)
va_list ap;
va_start (ap, num_regions);
......
......@@ -619,7 +619,6 @@ threshold_invoker (args)
int high_threshold;
int int_value;
int x1, y1, x2, y2;
void *pr;
drawable = NULL;
low_threshold = 0;
......
......@@ -679,7 +679,6 @@ brightness_contrast_invoker (Argument *args)
int brightness;
int contrast;
int x1, y1, x2, y2;
void *pr;
GimpDrawable *drawable;
drawable = NULL;
......
......@@ -288,11 +288,7 @@ get_color (GImage *gimage,
int final)
{
unsigned char *color;
unsigned char *src, *cmap, alpha;
int offx, offy;
int width, height;
int bytes;
int index;
int has_alpha;
int is_indexed;
if (!drawable && !sample_merged)
......
......@@ -422,7 +422,7 @@ ipal_clear (GimpColormapDialog* ipal)
int i, j;
int offset;
gint width, height;
guchar* row;
guchar* row = NULL;
GtkWidget* palette;
g_return_if_fail(ipal);
......
......@@ -102,13 +102,6 @@
#define FSDITHER 1
#define NODESTRUCTDITHER 2
/* adam's extra palette stuff */
#define MAKE_PALETTE 0
#define REUSE_PALETTE 1
#define WEB_PALETTE 2
#define MONO_PALETTE 3
#define CUSTOM_PALETTE 4
#define PRECISION_R 6
#define PRECISION_G 6
#define PRECISION_B 5
......
......@@ -22,6 +22,15 @@
#include "gimpimageF.h"
#include "palette_entries.h"
/* adam's extra palette stuff */
typedef enum {
MAKE_PALETTE,
REUSE_PALETTE,
WEB_PALETTE,
MONO_PALETTE,
CUSTOM_PALETTE
} ConvertPaletteType;
/* convert functions */
void convert_to_rgb (GimpImage *);
void convert_to_grayscale (GimpImage *);
......
......@@ -68,17 +68,11 @@ equalize(gimage, drawable, mask_only)
GimpDrawable *drawable;
int mask_only;
{
Channel *sel_mask;
PixelRegion srcPR, destPR, maskPR, *sel_maskPR;
unsigned char *src, *s;
unsigned char *dest, *d;
unsigned char *mask, *m;
int no_mask;
int h, j, b;
PixelRegion srcPR, destPR;
unsigned char *mask;
int has_alpha;
int alpha, bytes;
int x1, y1, x2, y2;
void *pr;
GimpHistogram *hist;
GimpLut *lut;
......
......@@ -76,7 +76,6 @@ static void
invert (GimpDrawable *drawable)
{
PixelRegion srcPR, destPR;
void *pr;
int x1, y1, x2, y2;
GimpLut *lut;
......
......@@ -102,13 +102,6 @@
#define FSDITHER 1
#define NODESTRUCTDITHER 2
/* adam's extra palette stuff */
#define MAKE_PALETTE 0
#define REUSE_PALETTE 1
#define WEB_PALETTE 2
#define MONO_PALETTE 3
#define CUSTOM_PALETTE 4
#define PRECISION_R 6
#define PRECISION_G 6
#define PRECISION_B 5
......
......@@ -22,6 +22,15 @@
#include "gimpimageF.h"
#include "palette_entries.h"
/* adam's extra palette stuff */
typedef enum {
MAKE_PALETTE,
REUSE_PALETTE,
WEB_PALETTE,
MONO_PALETTE,
CUSTOM_PALETTE
} ConvertPaletteType;
/* convert functions */
void convert_to_rgb (GimpImage *);
void convert_to_grayscale (GimpImage *);
......
......@@ -1346,7 +1346,6 @@ curves_spline_invoker (Argument *args)
unsigned char *control_pts;
int x1, y1, x2, y2;
int i, j;
void *pr;
GimpDrawable *drawable;
/* the drawable */
......@@ -1497,7 +1496,6 @@ curves_explicit_invoker (Argument *args)
unsigned char *curve;
int x1, y1, x2, y2;
int i, j;
void *pr;
GimpDrawable *drawable;
/* the drawable */
......
......@@ -68,17 +68,11 @@ equalize(gimage, drawable, mask_only)
GimpDrawable *drawable;
int mask_only;
{
Channel *sel_mask;
PixelRegion srcPR, destPR, maskPR, *sel_maskPR;
unsigned char *src, *s;
unsigned char *dest, *d;
unsigned char *mask, *m;
int no_mask;
int h, j, b;
PixelRegion srcPR, destPR;
unsigned char *mask;
int has_alpha;
int alpha, bytes;
int x1, y1, x2, y2;
void *pr;
GimpHistogram *hist;
GimpLut *lut;
......
......@@ -68,17 +68,11 @@ equalize(gimage, drawable, mask_only)
GimpDrawable *drawable;
int mask_only;
{
Channel *sel_mask;
PixelRegion srcPR, destPR, maskPR, *sel_maskPR;
unsigned char *src, *s;
unsigned char *dest, *d;
unsigned char *mask, *m;
int no_mask;
int h, j, b;
PixelRegion srcPR, destPR;
unsigned char *mask;
int has_alpha;
int alpha, bytes;
int x1, y1, x2, y2;
void *pr;
GimpHistogram *hist;
GimpLut *lut;
......
......@@ -76,7 +76,6 @@ static void
invert (GimpDrawable *drawable)
{
PixelRegion srcPR, destPR;
void *pr;
int x1, y1, x2, y2;
GimpLut *lut;
......
......@@ -102,13 +102,6 @@
#define FSDITHER 1
#define NODESTRUCTDITHER 2
/* adam's extra palette stuff */
#define MAKE_PALETTE 0
#define REUSE_PALETTE 1
#define WEB_PALETTE 2
#define MONO_PALETTE 3
#define CUSTOM_PALETTE 4
#define PRECISION_R 6
#define PRECISION_G 6
#define PRECISION_B 5
......
......@@ -22,6 +22,15 @@
#include "gimpimageF.h"
#include "palette_entries.h"
/* adam's extra palette stuff */
typedef enum {
MAKE_PALETTE,
REUSE_PALETTE,
WEB_PALETTE,
MONO_PALETTE,
CUSTOM_PALETTE
} ConvertPaletteType;
/* convert functions */
void convert_to_rgb (GimpImage *);
void convert_to_grayscale (GimpImage *);
......
......@@ -86,7 +86,7 @@ gimp_lut_process (GimpLut *lut,
{
int h, width, src_r_i, dest_r_i;
unsigned char *src, *dest;
unsigned char *lut0, *lut1, *lut2, *lut3;
unsigned char *lut0 = NULL, *lut1 = NULL, *lut2 = NULL, *lut3 = NULL;
if (lut->nchannels > 0)
lut0 = lut->luts[0];
......
......@@ -609,7 +609,6 @@ histogram_invoker (Argument *args)
int no_mask;
int x1, y1, x2, y2;
int off_x, off_y;
void *pr;
drawable = NULL;
low_range = 0;
......
......@@ -173,18 +173,7 @@ hue_saturation_calculate_transfers (HueSaturationDialog *hsd)
the new behavior is exactly what you want. It's hard for me
to imagine a case in which the old behavior is better.
*/
/* This isn't working properly with an image with 0 saturation
* e.g. a grayscale image. Comment out for now -Yosh
*/
/* #define RAPH */
#ifdef RAPH
saturation_transfer[hue][i] = BOUNDS((i * (255 + value)) / 255, 0, 255);
#else
if (value < 0)
saturation_transfer[hue][i] = (unsigned char) ((i * (255 + value)) / 255);
else
saturation_transfer[hue][i] = (unsigned char) (i + ((255 - i) * value) / 255);
#endif
}
}
......
......@@ -76,7 +76,6 @@ static void
invert (GimpDrawable *drawable)
{
PixelRegion srcPR, destPR;
void *pr;
int x1, y1, x2, y2;
GimpLut *lut;