small cosmetic changes, such as removing tabs.

This commit is contained in:
David Odin 2003-12-23 22:07:06 +00:00
parent 0632251cff
commit 39bf72558c
18 changed files with 2858 additions and 2847 deletions

View File

@ -1,3 +1,24 @@
2003-12-22 DindinX <david@dindinx.org>
* plug-ins/common/AlienMap.c:
* plug-ins/common/AlienMap2.c:
* plug-ins/common/CEL.c:
* plug-ins/common/aa.c:
* plug-ins/common/align_layers.c:
* plug-ins/common/animationplay.c:
* plug-ins/common/animoptimize.c:
* plug-ins/common/apply_lens.c:
* plug-ins/common/autocrop.c:
* plug-ins/common/blinds.c:
* plug-ins/common/blur.c:
* plug-ins/common/borderaverage.c:
* plug-ins/common/bumpmap.c:
* plug-ins/common/bz2.c:
* plug-ins/common/c_astretch.c:
* plug-ins/common/channel_mixer.c:
* plug-ins/common/nova.c: small cosmetic changes, such as removing
tabs.
2003-12-22 DindinX <david@dindinx.org> 2003-12-22 DindinX <david@dindinx.org>
* app/gui/user-install-dialog.c (user_install_dialog_run): added a * app/gui/user-install-dialog.c (user_install_dialog_run): added a

View File

@ -164,7 +164,7 @@ run (const gchar *name,
gimp_get_data ("file_cel_save:length", &data_length); gimp_get_data ("file_cel_save:length", &data_length);
if (data_length > 0) if (data_length > 0)
{ {
palette_file = (char *) g_malloc(data_length); palette_file = g_malloc(data_length);
gimp_get_data ("file_cel_save:data", palette_file); gimp_get_data ("file_cel_save:data", palette_file);
} }
else else

View File

@ -99,8 +99,8 @@ typedef struct
gint h_base; gint h_base;
gint v_style; gint v_style;
gint v_base; gint v_base;
gint ignore_bottom; gboolean ignore_bottom;
gint base_is_bottom_layer; gboolean base_is_bottom_layer;
gint grid_size; gint grid_size;
} ValueType; } ValueType;

View File

@ -211,9 +211,13 @@ static gint ncolours;
static GtkWidget *psbutton; static GtkWidget *psbutton;
/* for shaping */ /* for shaping */
typedef struct
{
gint x, y;
} CursorOffset;
static gchar *shape_preview_mask; static gchar *shape_preview_mask;
static GtkWidget *shape_window; static GtkWidget *shape_window;
typedef struct _cursoroffset {gint x,y;} CursorOffset;
static gint shaping = 0; static gint shaping = 0;
static GdkWindow *root_win = NULL; static GdkWindow *root_win = NULL;
@ -363,8 +367,6 @@ shape_motion (GtkWidget *widget,
gdk_window_get_pointer (root_win, &xp, &yp, &mask); gdk_window_get_pointer (root_win, &xp, &yp, &mask);
/* printf("%u %d\n", mask, event->state);fflush(stdout); */
/* if a button is still held by the time we process this event... */ /* if a button is still held by the time we process this event... */
if (mask & (GDK_BUTTON1_MASK| if (mask & (GDK_BUTTON1_MASK|
GDK_BUTTON2_MASK| GDK_BUTTON2_MASK|
@ -392,7 +394,6 @@ repaint_da (GtkWidget *darea,
GdkEventExpose *event, GdkEventExpose *event,
gpointer data) gpointer data)
{ {
/* printf("Repaint! Woohoo!\n");*/
gdk_draw_rgb_image (drawing_area->window, gdk_draw_rgb_image (drawing_area->window,
drawing_area->style->white_gc, drawing_area->style->white_gc,
0, 0, width, height, 0, 0, width, height,
@ -408,7 +409,6 @@ repaint_sda (GtkWidget *darea,
GdkEventExpose *event, GdkEventExpose *event,
gpointer data) gpointer data)
{ {
/*printf("Repaint! Woohoo!\n");*/
gdk_draw_rgb_image (shape_drawing_area->window, gdk_draw_rgb_image (shape_drawing_area->window,
shape_drawing_area->style->white_gc, shape_drawing_area->style->white_gc,
0, 0, width, height, 0, 0, width, height,
@ -494,19 +494,13 @@ build_dialog (GimpImageBaseType basetype,
{ {
/* The 'playback' half of the dialog */ /* The 'playback' half of the dialog */
windowname = g_malloc (strlen (_("Playback: ")) + strlen (imagename) + 1);
if (total_frames > 1) if (total_frames > 1)
{ windowname = g_strconcat (_("Playback: "), imagename);
strcpy (windowname, _("Playback: "));
strcat (windowname, imagename);
}
else else
{ windowname = g_strdup (imagename);
strcpy (windowname, imagename);
}
frame = gtk_frame_new (windowname); frame = gtk_frame_new (windowname);
g_free (windowname); g_free (windowname);
gtk_container_set_border_width (GTK_CONTAINER (frame), 3); gtk_container_set_border_width (GTK_CONTAINER (frame), 3);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox),
frame, TRUE, TRUE, 0); frame, TRUE, TRUE, 0);
@ -708,7 +702,6 @@ render_frame (gint32 whichframe)
gint i, j, k; /* imaginative loop variables */ gint i, j, k; /* imaginative loop variables */
DisposeType dispose; DisposeType dispose;
if (whichframe >= total_frames) if (whichframe >= total_frames)
{ {
printf( "playback: Asked for frame number %d in a %d-frame animation!\n", printf( "playback: Asked for frame number %d in a %d-frame animation!\n",
@ -747,7 +740,8 @@ render_frame (gint32 whichframe)
gimp_drawable_height(drawable->drawable_id)* gimp_drawable_height(drawable->drawable_id)*
gimp_drawable_bpp(drawable->drawable_id)))) gimp_drawable_bpp(drawable->drawable_id))))
{ {
if (rawframe != NULL) g_free(rawframe); if (rawframe != NULL)
g_free(rawframe);
rawframe = g_malloc((gimp_drawable_width(drawable->drawable_id)) * rawframe = g_malloc((gimp_drawable_width(drawable->drawable_id)) *
(gimp_drawable_height(drawable->drawable_id)) * (gimp_drawable_height(drawable->drawable_id)) *
(gimp_drawable_bpp(drawable->drawable_id))); (gimp_drawable_bpp(drawable->drawable_id)));
@ -832,7 +826,6 @@ render_frame (gint32 whichframe)
{ {
if ((rawwidth==width)&&(rawheight==height)) if ((rawwidth==width)&&(rawheight==height))
{ {
/*printf("quickie\n");fflush(stdout);*/
memcpy(preview_data, rawframe, width*height*3); memcpy(preview_data, rawframe, width*height*3);
} }
@ -989,8 +982,8 @@ render_frame (gint32 whichframe)
gdk_draw_rgb_image (drawing_area->window, gdk_draw_rgb_image (drawing_area->window,
drawing_area->style->white_gc, drawing_area->style->white_gc,
0, 0, width, height, 0, 0, width, height,
(total_frames==1)?GDK_RGB_DITHER_MAX: (total_frames==1)?GDK_RGB_DITHER_MAX
DITHERTYPE, :DITHERTYPE,
preview_data, width * 3); preview_data, width * 3);
} }
} }
@ -1074,8 +1067,8 @@ render_frame (gint32 whichframe)
gdk_draw_rgb_image (shape_drawing_area->window, gdk_draw_rgb_image (shape_drawing_area->window,
shape_drawing_area->style->white_gc, shape_drawing_area->style->white_gc,
0, 0, width, height, 0, 0, width, height,
(total_frames==1)?GDK_RGB_DITHER_MAX: (total_frames==1)?GDK_RGB_DITHER_MAX
DITHERTYPE, :DITHERTYPE,
preview_data, width * 3); preview_data, width * 3);
} }
else else
@ -1083,8 +1076,8 @@ render_frame (gint32 whichframe)
gdk_draw_rgb_image (drawing_area->window, gdk_draw_rgb_image (drawing_area->window,
drawing_area->style->white_gc, drawing_area->style->white_gc,
0, 0, width, height, 0, 0, width, height,
(total_frames==1)?GDK_RGB_DITHER_MAX: (total_frames==1)?GDK_RGB_DITHER_MAX
DITHERTYPE, :DITHERTYPE,
preview_data, width * 3); preview_data, width * 3);
} }
} }
@ -1577,3 +1570,4 @@ parse_disposal_tag (const char *str)
return (DISPOSE_UNDEFINED); /* FIXME */ return (DISPOSE_UNDEFINED); /* FIXME */
} }

View File

@ -1301,7 +1301,7 @@ is_disposal_tag (const gchar *str,
return TRUE; return TRUE;
} }
return 0; return FALSE;
} }

View File

@ -197,7 +197,7 @@ find_min_max (const guchar *src,
gint bpp, gint bpp,
gpointer data) gpointer data)
{ {
AutoStretchParam_t *param = (AutoStretchParam_t*) data; AutoStretchParam_t *param = data;
gint b; gint b;
for (b = 0; b < param->alpha; b++) for (b = 0; b < param->alpha; b++)
@ -218,7 +218,7 @@ c_astretch_func (const guchar *src,
gint bpp, gint bpp,
gpointer data) gpointer data)
{ {
AutoStretchParam_t *param = (AutoStretchParam_t*) data; AutoStretchParam_t *param = data;
gint b; gint b;
for (b = 0; b < param->alpha; b++) for (b = 0; b < param->alpha; b++)

View File

@ -61,10 +61,8 @@
#include "config.h" #include "config.h"
#include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <time.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>
@ -647,9 +645,7 @@ nova_center_preview_expose (GtkWidget *widget,
GdkEvent *event, GdkEvent *event,
gpointer data) gpointer data)
{ {
printf("Before\n");
nova_center_draw ((NovaCenter*) data, ALL); nova_center_draw ((NovaCenter*) data, ALL);
printf("After\n");
return FALSE; return FALSE;
} }