Commit b07e1466 authored by Manish Singh's avatar Manish Singh
Browse files

Applied gimp-jbuhler-980315-0

-Yosh
parent 03a31a18
Wed Mar 18 20:57:55 EST 1998 Adrian Likins <adraiN@gimp.org>
Thu Mar 19 01:04:56 PST 1998 Manish Singh <yosh@gimp.org>
* applied gimp-jbuhler-980315-0
Wed Mar 18 20:57:55 EST 1998 Adrian Likins <adrian@gimp.org>
*AlienMap/AlienMap.c CEL/CEL.c CML_explorer/CML_explorer.c
align_layers/align_layers.c animationplay/animationplay.c
......
......@@ -1362,11 +1362,15 @@ curves_spline_invoker (Argument *args)
if (success)
{
if (drawable_gray (drawable))
if (int_value != 0)
success = FALSE;
{
if (int_value != 0)
success = FALSE;
}
else if (drawable_color (drawable))
if (int_value < 0 || int_value > 3)
success = FALSE;
{
if (int_value < 0 || int_value > 3)
success = FALSE;
}
else
success = FALSE;
}
......@@ -1514,11 +1518,15 @@ curves_explicit_invoker (Argument *args)
if (success)
{
if (drawable_gray (drawable))
if (int_value != 0)
success = FALSE;
{
if (int_value != 0)
success = FALSE;
}
else if (drawable_color (drawable))
if (int_value < 0 || int_value > 3)
success = FALSE;
{
if (int_value < 0 || int_value > 3)
success = FALSE;
}
else
success = FALSE;
}
......
......@@ -1362,11 +1362,15 @@ curves_spline_invoker (Argument *args)
if (success)
{
if (drawable_gray (drawable))
if (int_value != 0)
success = FALSE;
{
if (int_value != 0)
success = FALSE;
}
else if (drawable_color (drawable))
if (int_value < 0 || int_value > 3)
success = FALSE;
{
if (int_value < 0 || int_value > 3)
success = FALSE;
}
else
success = FALSE;
}
......@@ -1514,11 +1518,15 @@ curves_explicit_invoker (Argument *args)
if (success)
{
if (drawable_gray (drawable))
if (int_value != 0)
success = FALSE;
{
if (int_value != 0)
success = FALSE;
}
else if (drawable_color (drawable))
if (int_value < 0 || int_value > 3)
success = FALSE;
{
if (int_value < 0 || int_value > 3)
success = FALSE;
}
else
success = FALSE;
}
......
......@@ -137,11 +137,14 @@ drawable_apply_image (GimpDrawable *drawable,
TileManager *tiles, int sparse)
{
if (drawable)
if (! tiles)
undo_push_image (gimage_get_ID (drawable->gimage_ID), drawable, x1, y1, x2, y2);
else
undo_push_image_mod (gimage_get_ID (drawable->gimage_ID), drawable, x1, y1, x2, y2, tiles, sparse);
{
if (! tiles)
undo_push_image (gimage_get_ID (drawable->gimage_ID), drawable,
x1, y1, x2, y2);
else
undo_push_image_mod (gimage_get_ID (drawable->gimage_ID), drawable,
x1, y1, x2, y2, tiles, sparse);
}
}
......
......@@ -999,10 +999,12 @@ void
CloseOutputBitFile (BIT_FILE *bit_file )
{
if ( bit_file->mask != 0x80 )
if ( putc( bit_file->rack, bit_file->file ) != bit_file->rack )
g_error( "Fatal error in CloseOutputBitFile!\n" );
else
(*(bit_file->cp)) += 1;
{
if ( putc( bit_file->rack, bit_file->file ) != bit_file->rack )
g_error( "Fatal error in CloseOutputBitFile!\n" );
else
(*(bit_file->cp)) += 1;
}
/* fclose (bit_file->file );
free ((char *) bit_file); */
}
......
......@@ -2606,19 +2606,23 @@ control_move(grad_segment_t *range_l, grad_segment_t *range_r, double delta)
/* Fix the segments that surround the range */
if (!is_first)
{
if (!g_editor->control_compress)
range_l->prev->right = range_l->left;
else
control_compress_range(range_l->prev, range_l->prev,
range_l->prev->left, range_l->left);
}
if (!is_last)
{
if (!g_editor->control_compress)
range_r->next->left = range_r->right;
else
control_compress_range(range_r->next, range_r->next,
range_r->right, range_r->next->right);
}
return delta;
} /* control_move */
......
......@@ -2606,19 +2606,23 @@ control_move(grad_segment_t *range_l, grad_segment_t *range_r, double delta)
/* Fix the segments that surround the range */
if (!is_first)
{
if (!g_editor->control_compress)
range_l->prev->right = range_l->left;
else
control_compress_range(range_l->prev, range_l->prev,
range_l->prev->left, range_l->left);
}
if (!is_last)
{
if (!g_editor->control_compress)
range_r->next->left = range_r->right;
else
control_compress_range(range_r->next, range_r->next,
range_r->right, range_r->next->right);
}
return delta;
} /* control_move */
......
......@@ -2606,19 +2606,23 @@ control_move(grad_segment_t *range_l, grad_segment_t *range_r, double delta)
/* Fix the segments that surround the range */
if (!is_first)
{
if (!g_editor->control_compress)
range_l->prev->right = range_l->left;
else
control_compress_range(range_l->prev, range_l->prev,
range_l->prev->left, range_l->left);
}
if (!is_last)
{
if (!g_editor->control_compress)
range_r->next->left = range_r->right;
else
control_compress_range(range_r->next, range_r->next,
range_r->right, range_r->next->right);
}
return delta;
} /* control_move */
......
......@@ -1362,11 +1362,15 @@ curves_spline_invoker (Argument *args)
if (success)
{
if (drawable_gray (drawable))
if (int_value != 0)
success = FALSE;
{
if (int_value != 0)
success = FALSE;
}
else if (drawable_color (drawable))
if (int_value < 0 || int_value > 3)
success = FALSE;
{
if (int_value < 0 || int_value > 3)
success = FALSE;
}
else
success = FALSE;
}
......@@ -1514,11 +1518,15 @@ curves_explicit_invoker (Argument *args)
if (success)
{
if (drawable_gray (drawable))
if (int_value != 0)
success = FALSE;
{
if (int_value != 0)
success = FALSE;
}
else if (drawable_color (drawable))
if (int_value < 0 || int_value > 3)
success = FALSE;
{
if (int_value < 0 || int_value > 3)
success = FALSE;
}
else
success = FALSE;
}
......
......@@ -1362,11 +1362,15 @@ curves_spline_invoker (Argument *args)
if (success)
{
if (drawable_gray (drawable))
if (int_value != 0)
success = FALSE;
{
if (int_value != 0)
success = FALSE;
}
else if (drawable_color (drawable))
if (int_value < 0 || int_value > 3)
success = FALSE;
{
if (int_value < 0 || int_value > 3)
success = FALSE;
}
else
success = FALSE;
}
......@@ -1514,11 +1518,15 @@ curves_explicit_invoker (Argument *args)
if (success)
{
if (drawable_gray (drawable))
if (int_value != 0)
success = FALSE;
{
if (int_value != 0)
success = FALSE;
}
else if (drawable_color (drawable))
if (int_value < 0 || int_value > 3)
success = FALSE;
{
if (int_value < 0 || int_value > 3)
success = FALSE;
}
else
success = FALSE;
}
......
......@@ -2606,19 +2606,23 @@ control_move(grad_segment_t *range_l, grad_segment_t *range_r, double delta)
/* Fix the segments that surround the range */
if (!is_first)
{
if (!g_editor->control_compress)
range_l->prev->right = range_l->left;
else
control_compress_range(range_l->prev, range_l->prev,
range_l->prev->left, range_l->left);
}
if (!is_last)
{
if (!g_editor->control_compress)
range_r->next->left = range_r->right;
else
control_compress_range(range_r->next, range_r->next,
range_r->right, range_r->next->right);
}
return delta;
} /* control_move */
......
......@@ -178,7 +178,7 @@ process_cla (int argc, char **argv, int warnflag)
{
int k;
char *ptr;
static siod_lib_set = 0;
static int siod_lib_set = 0;
#if !defined(vms)
if (!siod_lib_set)
{
......@@ -1885,12 +1885,13 @@ user_gc (LISP args)
flag = no_interrupt (1);
errjmp_ok = 0;
old_status_flag = gc_status_flag;
if NNULLP
(args)
if NULLP
(car (args)) gc_status_flag = 0;
else
gc_status_flag = 1;
if NNULLP (args)
{
if NULLP (car (args))
gc_status_flag = 0;
else
gc_status_flag = 1;
}
gc_mark_and_sweep ();
gc_status_flag = old_status_flag;
errjmp_ok = 1;
......@@ -1921,12 +1922,14 @@ LISP
gc_status (LISP args)
{
long n, m;
if NNULLP
(args)
if NULLP
(car (args)) gc_status_flag = 0;
else
gc_status_flag = 1;
if NNULLP (args)
{
if NULLP (car (args))
gc_status_flag = 0;
else
gc_status_flag = 1;
}
if (gc_kind_copying == 1)
{
if (gc_status_flag)
......@@ -2805,10 +2808,13 @@ flush_ws (struct gen_readio *f, char *eoferr)
{
c = GETC_FCN (f);
if (c == EOF)
if (eoferr)
err (eoferr, NIL);
else
return (c);
{
if (eoferr)
err (eoferr, NIL);
else
return (c);
}
if (commentp)
{
if (c == '\n')
......
......@@ -1511,7 +1511,7 @@ string2number (LISP x, LISP b)
{
char *str;
long base, value = 0;
double result;
double result = 0.0;
str = get_c_string (x);
if NULLP
(b)
......@@ -1646,7 +1646,7 @@ init_base64_table (void)
base64_decode_table = (char *) malloc (256);
memset (base64_decode_table, -1, 256);
for (j = 0; j < 65; ++j)
base64_decode_table[base64_encode_table[j]] = j;
base64_decode_table[(unsigned char) base64_encode_table[j]] = j;
}
#define BITMSK(N) ((1 << (N)) - 1)
......@@ -1712,10 +1712,12 @@ base64decode (LISP in)
if (n % 4)
err ("illegal base64 data length", in);
if (s[n - 1] == base64_encode_table[64])
if (s[n - 2] == base64_encode_table[64])
leftover = 1;
else
leftover = 2;
{
if (s[n - 2] == base64_encode_table[64])
leftover = 1;
else
leftover = 2;
}
else
leftover = 0;
chunks = (n / 4) - ((leftover) ? 1 : 0);
......@@ -1947,13 +1949,13 @@ butlast (LISP l)
STACK_CHECK (&l);
if NULLP
(l) err ("list is empty", l);
if CONSP
(l)
if NULLP
(CDR (l))
if CONSP (l)
{
if NULLP (CDR (l))
return (NIL);
else
return (cons (CAR (l), butlast (CDR (l))));
else
return (cons (CAR (l), butlast (CDR (l))));
}
return (err ("not a list", l));
}
......@@ -2052,7 +2054,7 @@ LISP
benchmark_funcall1 (LISP ln, LISP f, LISP a1)
{
long j, n;
LISP value;
LISP value = NIL;
n = get_c_long (ln);
for (j = 0; j < n; ++j)
value = funcall1 (f, a1);
......@@ -2067,7 +2069,7 @@ benchmark_funcall2 (LISP l)
LISP f = car (cdr (l));
LISP a1 = car (cdr (cdr (l)));
LISP a2 = car (cdr (cdr (cdr (l))));
LISP value;
LISP value = NULL;
n = get_c_long (ln);
for (j = 0; j < n; ++j)
value = funcall2 (f, a1, a2);
......@@ -2078,7 +2080,7 @@ LISP
benchmark_eval (LISP ln, LISP exp, LISP env)
{
long j, n;
LISP value;
LISP value = NIL;
n = get_c_long (ln);
for (j = 0; j < n; ++j)
value = leval (exp, env);
......
......@@ -28,6 +28,7 @@
#include "libgimp/gimpui.h"
#include "siod.h"
#include "script-fu-console.h"
#include <plug-ins/dbbrowser/dbbrowser.h>
#define TEXT_WIDTH 400
#define TEXT_HEIGHT 400
......
......@@ -549,7 +549,7 @@ script_fu_script_proc (char *name,
if (status == STATUS_SUCCESS)
{
gint err_msg;
char *text;
char *text = NULL;
char *command, *c;
char buffer[32];
int length;
......@@ -966,7 +966,7 @@ script_fu_ok_callback (GtkWidget *widget,
{
SFScript *script;
gint err_msg;
char *text;
char *text = NULL;
char *command, *c;
char buffer[32];
int length;
......
......@@ -549,7 +549,7 @@ script_fu_script_proc (char *name,
if (status == STATUS_SUCCESS)
{
gint err_msg;
char *text;
char *text = NULL;
char *command, *c;
char buffer[32];
int length;
......@@ -966,7 +966,7 @@ script_fu_ok_callback (GtkWidget *widget,
{
SFScript *script;
gint err_msg;
char *text;
char *text = NULL;
char *command, *c;
char buffer[32];
int length;
......
......@@ -494,7 +494,7 @@ marshall_proc_db_call (LISP a)
int success = TRUE;
LISP color_list;
LISP intermediate_val;
LISP return_val;
LISP return_val = NIL;
char *string;
int string_len;
LISP a_saved;
......
......@@ -178,7 +178,7 @@ process_cla (int argc, char **argv, int warnflag)
{
int k;
char *ptr;
static siod_lib_set = 0;
static int siod_lib_set = 0;
#if !defined(vms)
if (!siod_lib_set)
{
......@@ -1885,12 +1885,13 @@ user_gc (LISP args)
flag = no_interrupt (1);
errjmp_ok = 0;
old_status_flag = gc_status_flag;
if NNULLP
(args)
if NULLP
(car (args)) gc_status_flag = 0;
else
gc_status_flag = 1;
if NNULLP (args)
{
if NULLP (car (args))
gc_status_flag = 0;
else
gc_status_flag = 1;
}
gc_mark_and_sweep ();
gc_status_flag = old_status_flag;
errjmp_ok = 1;
......@@ -1921,12 +1922,14 @@ LISP
gc_status (LISP args)
{
long n, m;
if NNULLP
(args)
if NULLP
(car (args)) gc_status_flag = 0;
else
gc_status_flag = 1;
if NNULLP (args)
{
if NULLP (car (args))
gc_status_flag = 0;
else
gc_status_flag = 1;
}
if (gc_kind_copying == 1)
{
if (gc_status_flag)
......@@ -2805,10 +2808,13 @@ flush_ws (struct gen_readio *f, char *eoferr)
{
c = GETC_FCN (f);
if (c == EOF)
if (eoferr)
err (eoferr, NIL);
else
return (c);
{
if (eoferr)
err (eoferr, NIL);
else
return (c);
}
if (commentp)
{
if (c == '\n')
......
......@@ -1511,7 +1511,7 @@ string2number (LISP x, LISP b)
{
char *str;
long base, value = 0;
double result;
double result = 0.0;
str = get_c_string (x);
if NULLP
(b)
......@@ -1646,7 +1646,7 @@ init_base64_table (void)
base64_decode_table = (char *) malloc (256);
memset (base64_decode_table, -1, 256);
for (j = 0; j < 65; ++j)
base64_decode_table[base64_encode_table[j]] = j;
base64_decode_table[(unsigned char) base64_encode_table[j]] = j;
}
#define BITMSK(N) ((1 << (N)) - 1)
......@@ -1712,10 +1712,12 @@ base64decode (LISP in)
if (n % 4)
err ("illegal base64 data length", in);
if (s[n - 1] == base64_encode_table[64])
if (s[n - 2] == base64_encode_table[64])
leftover = 1;
else
leftover = 2;
{
if (s[n - 2] == base64_encode_table[64])
leftover = 1;
else
leftover = 2;
}
else
leftover = 0;