mirror of https://github.com/GNOME/gimp.git
libgimp/Makefile.am fix --disable-static compilation
* libgimp/Makefile.am * configure.in: fix --disable-static compilation * gimptool.in: use the right dir for scripts. Strip out path from the compiled bin * app/colormaps.c: comment out unused gamma_correct function * app/layer.c: #include "libgimp/parasite.h" * app/paint_funcs.c: convert icky C++ comments * plug-ins/mosaic/mosaic.c * plug-ins/cubism/cubism.c: cleanups * plug-ins/libgck/gck/gckcolor.c: fix adaptive supersampling bug -Yosh
This commit is contained in:
Manish Singh
parent
80c62daae7
commit
76d4ba7101
18
ChangeLog
18
ChangeLog
|
|
@ -1,3 +1,21 @@
|
|||
Thu Oct 22 02:30:38 PDT 1998 Manish Singh <yosh@gimp.org>
|
||||
|
||||
* libgimp/Makefile.am
|
||||
* configure.in: fix --disable-static compilation
|
||||
|
||||
* gimptool.in: use the right dir for scripts. Strip out path
|
||||
from the compiled bin
|
||||
|
||||
* app/colormaps.c: comment out unused gamma_correct function
|
||||
|
||||
* app/layer.c: #include "libgimp/parasite.h"
|
||||
|
||||
* app/paint_funcs.c: convert icky C++ comments
|
||||
|
||||
* plug-ins/mosaic/mosaic.c
|
||||
* plug-ins/cubism/cubism.c: cleanups
|
||||
|
||||
* plug-ins/libgck/gck/gckcolor.c: fix adaptive supersampling bug
|
||||
|
||||
Wed Oct 21 23:37:01 BST 1998 Andy Thomas <alt@picnic.demon.co.uk>
|
||||
|
||||
|
|
|
|||
|
|
@ -91,7 +91,7 @@ set_app_colors ()
|
|||
}
|
||||
|
||||
/* This probably doesn't belong here - RLL*/
|
||||
static unsigned int
|
||||
/* static unsigned int
|
||||
gamma_correct (int intensity, double gamma)
|
||||
{
|
||||
unsigned int val;
|
||||
|
|
@ -107,7 +107,7 @@ gamma_correct (int intensity, double gamma)
|
|||
val = (int) (256 * pow (ind, one_over_gamma));
|
||||
|
||||
return val;
|
||||
}
|
||||
} */
|
||||
|
||||
|
||||
/*************************************************************************/
|
||||
|
|
|
|||
|
|
@ -32,6 +32,8 @@
|
|||
#include "temp_buf.h"
|
||||
#include "undo.h"
|
||||
|
||||
#include "libgimp/parasite.h"
|
||||
|
||||
#include "layer_pvt.h"
|
||||
#include "tile_manager_pvt.h"
|
||||
#include "tile.h" /* ick. */
|
||||
|
|
|
|||
|
|
@ -32,6 +32,8 @@
|
|||
#include "temp_buf.h"
|
||||
#include "undo.h"
|
||||
|
||||
#include "libgimp/parasite.h"
|
||||
|
||||
#include "layer_pvt.h"
|
||||
#include "tile_manager_pvt.h"
|
||||
#include "tile.h" /* ick. */
|
||||
|
|
|
|||
|
|
@ -32,6 +32,8 @@
|
|||
#include "temp_buf.h"
|
||||
#include "undo.h"
|
||||
|
||||
#include "libgimp/parasite.h"
|
||||
|
||||
#include "layer_pvt.h"
|
||||
#include "tile_manager_pvt.h"
|
||||
#include "tile.h" /* ick. */
|
||||
|
|
|
|||
|
|
@ -348,14 +348,14 @@ paint_funcs_setup ()
|
|||
}
|
||||
|
||||
for (j = 0; j < 256; j++)
|
||||
{ //rows
|
||||
{ /* rows */
|
||||
for (k = 0; k < 256; k++)
|
||||
{ //column
|
||||
{ /* column */
|
||||
tmp_sum = j + k;
|
||||
// printf("tmp_sum: %d", tmp_sum);
|
||||
/* printf("tmp_sum: %d", tmp_sum); */
|
||||
if(tmp_sum > 255)
|
||||
tmp_sum = 255;
|
||||
// printf(" max: %d \n", add_lut[j][k]);
|
||||
/* printf(" max: %d \n", add_lut[j][k]); */
|
||||
add_lut[j][k] = tmp_sum;
|
||||
}
|
||||
}
|
||||
|
|
@ -847,7 +847,7 @@ add_pixels (const unsigned char *src1,
|
|||
int has_alpha2)
|
||||
{
|
||||
int alpha, b;
|
||||
int sum;
|
||||
/* int sum; */
|
||||
|
||||
alpha = (has_alpha1 || has_alpha2) ? MAXIMUM (bytes1, bytes2) - 1 : bytes1;
|
||||
|
||||
|
|
@ -855,9 +855,9 @@ add_pixels (const unsigned char *src1,
|
|||
{
|
||||
for (b = 0; b < alpha; b++)
|
||||
{
|
||||
// sum = src1[b] + src2[b];
|
||||
/* sum = src1[b] + src2[b]; */
|
||||
dest[b] = add_lut[ (src1[b])] [(src2[b])];
|
||||
// dest[b] = MAX255 (sum);
|
||||
/* dest[b] = MAX255 (sum); */
|
||||
/* dest[b] = sum | ((sum&256) - ((sum&256) >> 8)); */
|
||||
/* dest[b] = (sum > 255) ? 255 : sum; */ /* older, little slower */
|
||||
}
|
||||
|
|
|
|||
|
|
@ -348,14 +348,14 @@ paint_funcs_setup ()
|
|||
}
|
||||
|
||||
for (j = 0; j < 256; j++)
|
||||
{ //rows
|
||||
{ /* rows */
|
||||
for (k = 0; k < 256; k++)
|
||||
{ //column
|
||||
{ /* column */
|
||||
tmp_sum = j + k;
|
||||
// printf("tmp_sum: %d", tmp_sum);
|
||||
/* printf("tmp_sum: %d", tmp_sum); */
|
||||
if(tmp_sum > 255)
|
||||
tmp_sum = 255;
|
||||
// printf(" max: %d \n", add_lut[j][k]);
|
||||
/* printf(" max: %d \n", add_lut[j][k]); */
|
||||
add_lut[j][k] = tmp_sum;
|
||||
}
|
||||
}
|
||||
|
|
@ -847,7 +847,7 @@ add_pixels (const unsigned char *src1,
|
|||
int has_alpha2)
|
||||
{
|
||||
int alpha, b;
|
||||
int sum;
|
||||
/* int sum; */
|
||||
|
||||
alpha = (has_alpha1 || has_alpha2) ? MAXIMUM (bytes1, bytes2) - 1 : bytes1;
|
||||
|
||||
|
|
@ -855,9 +855,9 @@ add_pixels (const unsigned char *src1,
|
|||
{
|
||||
for (b = 0; b < alpha; b++)
|
||||
{
|
||||
// sum = src1[b] + src2[b];
|
||||
/* sum = src1[b] + src2[b]; */
|
||||
dest[b] = add_lut[ (src1[b])] [(src2[b])];
|
||||
// dest[b] = MAX255 (sum);
|
||||
/* dest[b] = MAX255 (sum); */
|
||||
/* dest[b] = sum | ((sum&256) - ((sum&256) >> 8)); */
|
||||
/* dest[b] = (sum > 255) ? 255 : sum; */ /* older, little slower */
|
||||
}
|
||||
|
|
|
|||
|
|
@ -456,6 +456,8 @@ if test $ac_cv_path_LPC_COMMAND != ":"; then
|
|||
LPC_DEF="-DLPC_COMMAND=\\\"$ac_cv_path_LPC_COMMAND\\\""
|
||||
fi
|
||||
|
||||
AM_CONDITIONAL(STATICLIBS, test x$enable_static = xyes)
|
||||
|
||||
AC_SUBST(GIMP_MAJOR_VERSION)
|
||||
AC_SUBST(GIMP_MINOR_VERSION)
|
||||
AC_SUBST(GIMP_MICRO_VERSION)
|
||||
|
|
|
|||
|
|
@ -215,7 +215,7 @@ while test $# -gt 0; do
|
|||
;;
|
||||
--install-script)
|
||||
install_cmd="@INSTALL_DATA@"
|
||||
install_dir="$HOME/.gimp/scripts"
|
||||
install_dir="$HOME/@gimpdir@/scripts"
|
||||
;;
|
||||
--install-admin-script)
|
||||
install_cmd="@INSTALL_DATA@"
|
||||
|
|
@ -270,7 +270,8 @@ while test $# -gt 0; do
|
|||
shift
|
||||
if test "x$1" != "x"; then
|
||||
if test -r "$1"; then
|
||||
cmd="$cc $cflags $gimp_cflags -o $install_dir/`echo $1 | sed 's/\.[^\.]*$//'` $1 $ldflags $gimp_libs $libs"
|
||||
dest=`echo $1 | sed -e 's#.*/\([^/].*\)$#\1#' -e 's/\.[^.]*$//'`
|
||||
cmd="$cc $cflags $gimp_cflags -o $install_dir/$dest $1 $ldflags $gimp_libs $libs"
|
||||
test $quiet = "yes" || echo $cmd
|
||||
test $donothing = "yes" || exec $cmd
|
||||
else
|
||||
|
|
|
|||
|
|
@ -215,7 +215,7 @@ while test $# -gt 0; do
|
|||
;;
|
||||
--install-script)
|
||||
install_cmd="@INSTALL_DATA@"
|
||||
install_dir="$HOME/.gimp/scripts"
|
||||
install_dir="$HOME/@gimpdir@/scripts"
|
||||
;;
|
||||
--install-admin-script)
|
||||
install_cmd="@INSTALL_DATA@"
|
||||
|
|
@ -270,7 +270,8 @@ while test $# -gt 0; do
|
|||
shift
|
||||
if test "x$1" != "x"; then
|
||||
if test -r "$1"; then
|
||||
cmd="$cc $cflags $gimp_cflags -o $install_dir/`echo $1 | sed 's/\.[^\.]*$//'` $1 $ldflags $gimp_libs $libs"
|
||||
dest=`echo $1 | sed -e 's#.*/\([^/].*\)$#\1#' -e 's/\.[^.]*$//'`
|
||||
cmd="$cc $cflags $gimp_cflags -o $install_dir/$dest $1 $ldflags $gimp_libs $libs"
|
||||
test $quiet = "yes" || echo $cmd
|
||||
test $donothing = "yes" || exec $cmd
|
||||
else
|
||||
|
|
|
|||
|
|
@ -21,8 +21,10 @@ libgimpi_a_SOURCES = \
|
|||
parasiteF.h \
|
||||
parasiteP.h
|
||||
|
||||
if STATICLIBS
|
||||
## Evil hack to insure all deps are satisfied on first-run make
|
||||
libgimpi_a_DEPENDENCIES = libgimp.la
|
||||
endif
|
||||
|
||||
libgimp_la_SOURCES = \
|
||||
gimp.c \
|
||||
|
|
|
|||
|
|
@ -27,6 +27,8 @@
|
|||
#include "gtk/gtk.h"
|
||||
#include "libgimp/gimp.h"
|
||||
|
||||
#include "config.h"
|
||||
|
||||
/* Some useful macros */
|
||||
#define SQR(a) ((a) * (a))
|
||||
|
||||
|
|
@ -502,7 +504,7 @@ render_cubism (GDrawable *drawable)
|
|||
free (random_indices);
|
||||
}
|
||||
|
||||
G_INLINE_FUNC gdouble
|
||||
static inline gdouble
|
||||
calc_alpha_blend (gdouble *vec,
|
||||
gdouble one_over_dist,
|
||||
gdouble x,
|
||||
|
|
@ -536,8 +538,8 @@ fill_poly_color (Polygon *poly,
|
|||
gint min_x, min_y;
|
||||
gint max_x, max_y;
|
||||
gint size_x, size_y;
|
||||
gint * max_scanlines, *max_scanlines_iter, *max_scanlines_end;
|
||||
gint * min_scanlines, *min_scanlines_iter, *min_scanlines_end;
|
||||
gint * max_scanlines, *max_scanlines_iter;
|
||||
gint * min_scanlines, *min_scanlines_iter;
|
||||
gint val;
|
||||
gint alpha;
|
||||
gint bytes;
|
||||
|
|
@ -552,7 +554,6 @@ fill_poly_color (Polygon *poly,
|
|||
gint supersample2;
|
||||
gint x1, y1, x2, y2;
|
||||
gint *vals, *vals_iter, *vals_end;
|
||||
gint pixel_gen_on_next_pass = -1;
|
||||
|
||||
sx = poly->pts[0].x;
|
||||
sy = poly->pts[0].y;
|
||||
|
|
|
|||
|
|
@ -827,7 +827,6 @@ find_gradients (GDrawable *drawable,
|
|||
gint bytes;
|
||||
gint width, height;
|
||||
gint i, j;
|
||||
gdouble gradient;
|
||||
guchar *gr, * dh, * dv;
|
||||
gint hmax, vmax;
|
||||
gint row, rows;
|
||||
|
|
@ -912,7 +911,6 @@ find_max_gradient (GPixelRgn *src_rgn,
|
|||
guchar *s, *d, *s_iter, *s_end;
|
||||
gpointer pr;
|
||||
gint i, j;
|
||||
gint b;
|
||||
gint val;
|
||||
gint max;
|
||||
|
||||
|
|
|
|||
|
|
@ -27,6 +27,8 @@
|
|||
#include "gtk/gtk.h"
|
||||
#include "libgimp/gimp.h"
|
||||
|
||||
#include "config.h"
|
||||
|
||||
/* Some useful macros */
|
||||
#define SQR(a) ((a) * (a))
|
||||
|
||||
|
|
@ -502,7 +504,7 @@ render_cubism (GDrawable *drawable)
|
|||
free (random_indices);
|
||||
}
|
||||
|
||||
G_INLINE_FUNC gdouble
|
||||
static inline gdouble
|
||||
calc_alpha_blend (gdouble *vec,
|
||||
gdouble one_over_dist,
|
||||
gdouble x,
|
||||
|
|
@ -536,8 +538,8 @@ fill_poly_color (Polygon *poly,
|
|||
gint min_x, min_y;
|
||||
gint max_x, max_y;
|
||||
gint size_x, size_y;
|
||||
gint * max_scanlines, *max_scanlines_iter, *max_scanlines_end;
|
||||
gint * min_scanlines, *min_scanlines_iter, *min_scanlines_end;
|
||||
gint * max_scanlines, *max_scanlines_iter;
|
||||
gint * min_scanlines, *min_scanlines_iter;
|
||||
gint val;
|
||||
gint alpha;
|
||||
gint bytes;
|
||||
|
|
@ -552,7 +554,6 @@ fill_poly_color (Polygon *poly,
|
|||
gint supersample2;
|
||||
gint x1, y1, x2, y2;
|
||||
gint *vals, *vals_iter, *vals_end;
|
||||
gint pixel_gen_on_next_pass = -1;
|
||||
|
||||
sx = poly->pts[0].x;
|
||||
sy = poly->pts[0].y;
|
||||
|
|
|
|||
|
|
@ -2963,7 +2963,7 @@ gulong gck_adaptive_supersample_area(int x1, int y1, int x2, int y2, int max_dep
|
|||
/* Copy samples from top row to block */
|
||||
/* ================================== */
|
||||
|
||||
for (xtt = 0, xt = x * sub_pixel_size; xtt < (sub_pixel_size + 1); xtt++, xt++)
|
||||
for (xtt = 0, xt = (x - x1) * sub_pixel_size; xtt < (sub_pixel_size + 1); xtt++, xt++)
|
||||
block[0][xtt] = top_row[xt];
|
||||
|
||||
/* Render pixel on (x, y) */
|
||||
|
|
@ -2977,9 +2977,9 @@ gulong gck_adaptive_supersample_area(int x1, int y1, int x2, int y2, int max_dep
|
|||
/* Copy block information to rows */
|
||||
/* ============================== */
|
||||
|
||||
top_row[(x + 1) * sub_pixel_size] = block[0][sub_pixel_size];
|
||||
top_row[(x - x1 + 1) * sub_pixel_size] = block[0][sub_pixel_size];
|
||||
|
||||
for (xtt = 0, xt = x * sub_pixel_size; xtt < (sub_pixel_size + 1); xtt++, xt++)
|
||||
for (xtt = 0, xt = (x - x1) * sub_pixel_size; xtt < (sub_pixel_size + 1); xtt++, xt++)
|
||||
bot_row[xt] = block[sub_pixel_size][xtt];
|
||||
|
||||
/* Swap first and last columns */
|
||||
|
|
|
|||
|
|
@ -827,7 +827,6 @@ find_gradients (GDrawable *drawable,
|
|||
gint bytes;
|
||||
gint width, height;
|
||||
gint i, j;
|
||||
gdouble gradient;
|
||||
guchar *gr, * dh, * dv;
|
||||
gint hmax, vmax;
|
||||
gint row, rows;
|
||||
|
|
@ -912,7 +911,6 @@ find_max_gradient (GPixelRgn *src_rgn,
|
|||
guchar *s, *d, *s_iter, *s_end;
|
||||
gpointer pr;
|
||||
gint i, j;
|
||||
gint b;
|
||||
gint val;
|
||||
gint max;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue