callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

free the memory allocated for the GimpLut structure. Removed trailing

Browse Source 
2003-09-05  Sven Neumann  <sven@gimp.org>

	* app/base/gimplut.[ch] (gimp_lut_free): free the memory allocated
	for the GimpLut structure. Removed trailing whitespace.

	* app/core/gimpbuffer.c: cosmetics.

	* app/core/gimpedit.[ch]: let gimp_edit_cut() and gimp_edit_copy()
	return a pointer to the global cut buffer instead of creating a
	GimpBuffer which was leaked by most callers.

	* app/gui/edit-commands.c: changed accordingly.

	* libgimpwidgets/gimpquerybox.[ch] (string_query_box_ok_callback):
	removed a superfluous g_strdup(); made GimpQueryStringCallback take
	a const gchar* pointer.

	* app/gui/edit-commands.c
	* app/gui/file-commands.c
	* app/gui/palettes-commands.c: changed accordingly.
This commit is contained in:
Sven Neumann
2003-09-05 01:40:29 +00:00
committed by Sven Neumann
parent 7dc961ad50
commit 8e38f70b96
16 changed files with 170 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
ChangeLog
View File

@ -1,3 +1,24 @@
2003-09-05 Sven Neumann <sven@gimp.org>
* app/base/gimplut.[ch] (gimp_lut_free): free the memory allocated
for the GimpLut structure. Removed trailing whitespace.
* app/core/gimpbuffer.c: cosmetics.
* app/core/gimpedit.[ch]: let gimp_edit_cut() and gimp_edit_copy()
return a pointer to the global cut buffer instead of creating a
GimpBuffer which was leaked by most callers.
* app/gui/edit-commands.c: changed accordingly.
* libgimpwidgets/gimpquerybox.[ch] (string_query_box_ok_callback):
removed a superfluous g_strdup(); made GimpQueryStringCallback take
a const gchar* pointer.
* app/gui/edit-commands.c
* app/gui/file-commands.c
* app/gui/palettes-commands.c: changed accordingly.
2003-09-05 Sven Neumann <sven@gimp.org> 2003-09-05 Sven Neumann <sven@gimp.org>
* plug-ins/script-fu/script-fu-scripts.c (script_fu_interface): * plug-ins/script-fu/script-fu-scripts.c (script_fu_interface):

26
app/actions/edit-commands.c
View File

@ -71,12 +71,12 @@
/* local function prototypes */ /* local function prototypes */
static void cut_named_buffer_callback (GtkWidget *widget, static void cut_named_buffer_callback (GtkWidget *widget,
gchar *name, const gchar *name,
gpointer data); gpointer data);
static void copy_named_buffer_callback (GtkWidget *widget, static void copy_named_buffer_callback (GtkWidget *widget,
gchar *name, const gchar *name,
gpointer data); gpointer data);
/* public functions */ /* public functions */
@ -288,8 +288,8 @@ cut_named_buffer_callback (GtkWidget *widget,
gchar *name, gchar *name,
gpointer data) gpointer data)
{ {
GimpBuffer *cut_buffer; const GimpBuffer *cut_buffer;
GimpImage *gimage; GimpImage *gimage;
gimage = (GimpImage *) data; gimage = (GimpImage *) data;
@ -313,12 +313,12 @@ cut_named_buffer_callback (GtkWidget *widget,
} }
static void static void
copy_named_buffer_callback (GtkWidget *widget, copy_named_buffer_callback (GtkWidget *widget,
gchar *name, const gchar *name,
gpointer data) gpointer data)
{ {
GimpBuffer *copy_buffer; const GimpBuffer *copy_buffer;
GimpImage *gimage; GimpImage *gimage;
gimage = (GimpImage *) data; gimage = (GimpImage *) data;

18
app/actions/file-commands.c
View File

@ -84,12 +84,12 @@
/* local function prototypes */ /* local function prototypes */
static void file_new_template_callback (GtkWidget *widget, static void file_new_template_callback (GtkWidget *widget,
gchar *name, const gchar *name,
gpointer data); gpointer data);
static void file_revert_confirm_callback (GtkWidget *widget, static void file_revert_confirm_callback (GtkWidget *widget,
gboolean revert, gboolean revert,
gpointer data); gpointer data);
/* public functions */ /* public functions */
@ -391,9 +391,9 @@ file_file_open_dialog (Gimp *gimp,
/* private functions */ /* private functions */
static void static void
file_new_template_callback (GtkWidget *widget, file_new_template_callback (GtkWidget *widget,
gchar *name, const gchar *name,
gpointer data) gpointer data)
{ {
GimpTemplate *template; GimpTemplate *template;
GimpImage *gimage; GimpImage *gimage;

8
app/actions/palettes-commands.c
View File

@ -43,7 +43,7 @@
static void palettes_merge_palettes_query (GimpContainerEditor *editor); static void palettes_merge_palettes_query (GimpContainerEditor *editor);
static void palettes_merge_palettes_callback (GtkWidget *widget, static void palettes_merge_palettes_callback (GtkWidget *widget,
gchar *palette_name, const gchar *palette_name,
gpointer data); gpointer data);
@ -91,9 +91,9 @@ palettes_merge_palettes_query (GimpContainerEditor *editor)
} }
static void static void
palettes_merge_palettes_callback (GtkWidget *widget, palettes_merge_palettes_callback (GtkWidget *widget,
gchar *palette_name, const gchar *palette_name,
gpointer data) gpointer data)
{ {
#ifdef __GNUC__ #ifdef __GNUC__
#warning FIXME: reimplement palettes_merge_palettes_callback() #warning FIXME: reimplement palettes_merge_palettes_callback()

2
app/base/gimplut.c
View File

@ -52,6 +52,7 @@ gimp_lut_free (GimpLut *lut)
g_free (lut->luts[i]); g_free (lut->luts[i]);
g_free (lut->luts); g_free (lut->luts);
g_free (lut);
} }
void void
@ -88,6 +89,7 @@ gimp_lut_setup (GimpLut *lut,
} }
} }
/* see comment in gimplut.h */
void void
gimp_lut_setup_exact (GimpLut *lut, gimp_lut_setup_exact (GimpLut *lut,
GimpLutFunc func, GimpLutFunc func,

4
app/base/gimplut.h
View File

@ -28,8 +28,8 @@ struct _GimpLut
gint nchannels; gint nchannels;
}; };
/* TODO: the GimpLutFunc should really be passed the ColorModel of the region, /* TODO: the GimpLutFunc should really be passed the ColorModel of the
* not just the number of channels * region, not just the number of channels
*/ */
/* GimpLutFuncs should assume that the input and output gamma are 1.0 /* GimpLutFuncs should assume that the input and output gamma are 1.0

16
app/core/gimp-edit.c
View File

@ -45,7 +45,7 @@
#include "gimp-intl.h" #include "gimp-intl.h"
GimpBuffer * const GimpBuffer *
gimp_edit_cut (GimpImage *gimage, gimp_edit_cut (GimpImage *gimage,
GimpDrawable *drawable) GimpDrawable *drawable)
{ {
@ -97,13 +97,15 @@ gimp_edit_cut (GimpImage *gimage,
/* Set the global edit buffer */ /* Set the global edit buffer */
gimage->gimp->global_buffer = gimp_buffer_new (cropped_cut, gimage->gimp->global_buffer = gimp_buffer_new (cropped_cut,
"Global Buffer", "Global Buffer",
TRUE); FALSE);
return gimage->gimp->global_buffer;
} }
return gimp_buffer_new (cropped_cut, "Cut Pixels", FALSE); return NULL;
} }
GimpBuffer * const GimpBuffer *
gimp_edit_copy (GimpImage *gimage, gimp_edit_copy (GimpImage *gimage,
GimpDrawable *drawable) GimpDrawable *drawable)
{ {
@ -155,10 +157,12 @@ gimp_edit_copy (GimpImage *gimage,
/* Set the global edit buffer */ /* Set the global edit buffer */
gimage->gimp->global_buffer = gimp_buffer_new (cropped_copy, gimage->gimp->global_buffer = gimp_buffer_new (cropped_copy,
"Global Buffer", "Global Buffer",
TRUE); FALSE);
return gimage->gimp->global_buffer;
} }
return gimp_buffer_new (cropped_copy, "Copied Pixels", FALSE); return NULL;
} }
GimpLayer * GimpLayer *

32
app/core/gimp-edit.h
View File

@ -20,22 +20,22 @@
#define __GIMP_EDIT_H__ #define __GIMP_EDIT_H__
GimpBuffer * gimp_edit_cut (GimpImage *gimage, const GimpBuffer * gimp_edit_cut (GimpImage *gimage,
GimpDrawable *drawable); GimpDrawable *drawable);
GimpBuffer * gimp_edit_copy (GimpImage *gimage, const GimpBuffer * gimp_edit_copy (GimpImage *gimage,
GimpDrawable *drawable); GimpDrawable *drawable);
GimpLayer * gimp_edit_paste (GimpImage *gimage, GimpLayer * gimp_edit_paste (GimpImage *gimage,
GimpDrawable *drawable, GimpDrawable *drawable,
GimpBuffer *paste, GimpBuffer *paste,
gboolean paste_into); gboolean paste_into);
GimpImage * gimp_edit_paste_as_new (Gimp *gimp, GimpImage * gimp_edit_paste_as_new (Gimp *gimp,
GimpImage *gimage, GimpImage *gimage,
GimpBuffer *paste); GimpBuffer *paste);
gboolean gimp_edit_clear (GimpImage *gimage, gboolean gimp_edit_clear (GimpImage *gimage,
GimpDrawable *drawable); GimpDrawable *drawable);
gboolean gimp_edit_fill (GimpImage *gimage, gboolean gimp_edit_fill (GimpImage *gimage,
GimpDrawable *drawable, GimpDrawable *drawable,
GimpFillType fill_type); GimpFillType fill_type);
#endif /* __GIMP_EDIT_H__ */ #endif /* __GIMP_EDIT_H__ */

5
app/core/gimpbuffer.c
View File

@ -316,7 +316,8 @@ gimp_buffer_new (TileManager *tiles,
if (copy_pixels) if (copy_pixels)
{ {
buffer->tiles = tile_manager_new (width, height, tile_manager_bpp (tiles)); buffer->tiles = tile_manager_new (width, height,
tile_manager_bpp (tiles));
pixel_region_init (&srcPR, tiles, 0, 0, width, height, FALSE); pixel_region_init (&srcPR, tiles, 0, 0, width, height, FALSE);
pixel_region_init (&destPR, buffer->tiles, 0, 0, width, height, TRUE); pixel_region_init (&destPR, buffer->tiles, 0, 0, width, height, TRUE);
@ -327,7 +328,7 @@ gimp_buffer_new (TileManager *tiles,
buffer->tiles = tiles; buffer->tiles = tiles;
} }
return GIMP_BUFFER (buffer); return buffer;
} }
gint gint

16
app/core/gimpedit.c
View File

@ -45,7 +45,7 @@
#include "gimp-intl.h" #include "gimp-intl.h"
GimpBuffer * const GimpBuffer *
gimp_edit_cut (GimpImage *gimage, gimp_edit_cut (GimpImage *gimage,
GimpDrawable *drawable) GimpDrawable *drawable)
{ {
@ -97,13 +97,15 @@ gimp_edit_cut (GimpImage *gimage,
/* Set the global edit buffer */ /* Set the global edit buffer */
gimage->gimp->global_buffer = gimp_buffer_new (cropped_cut, gimage->gimp->global_buffer = gimp_buffer_new (cropped_cut,
"Global Buffer", "Global Buffer",
TRUE); FALSE);
return gimage->gimp->global_buffer;
} }
return gimp_buffer_new (cropped_cut, "Cut Pixels", FALSE); return NULL;
} }
GimpBuffer * const GimpBuffer *
gimp_edit_copy (GimpImage *gimage, gimp_edit_copy (GimpImage *gimage,
GimpDrawable *drawable) GimpDrawable *drawable)
{ {
@ -155,10 +157,12 @@ gimp_edit_copy (GimpImage *gimage,
/* Set the global edit buffer */ /* Set the global edit buffer */
gimage->gimp->global_buffer = gimp_buffer_new (cropped_copy, gimage->gimp->global_buffer = gimp_buffer_new (cropped_copy,
"Global Buffer", "Global Buffer",
TRUE); FALSE);
return gimage->gimp->global_buffer;
} }
return gimp_buffer_new (cropped_copy, "Copied Pixels", FALSE); return NULL;
} }
GimpLayer * GimpLayer *

32
app/core/gimpedit.h
View File

@ -20,22 +20,22 @@
#define __GIMP_EDIT_H__ #define __GIMP_EDIT_H__
GimpBuffer * gimp_edit_cut (GimpImage *gimage, const GimpBuffer * gimp_edit_cut (GimpImage *gimage,
GimpDrawable *drawable); GimpDrawable *drawable);
GimpBuffer * gimp_edit_copy (GimpImage *gimage, const GimpBuffer * gimp_edit_copy (GimpImage *gimage,
GimpDrawable *drawable); GimpDrawable *drawable);
GimpLayer * gimp_edit_paste (GimpImage *gimage, GimpLayer * gimp_edit_paste (GimpImage *gimage,
GimpDrawable *drawable, GimpDrawable *drawable,
GimpBuffer *paste, GimpBuffer *paste,
gboolean paste_into); gboolean paste_into);
GimpImage * gimp_edit_paste_as_new (Gimp *gimp, GimpImage * gimp_edit_paste_as_new (Gimp *gimp,
GimpImage *gimage, GimpImage *gimage,
GimpBuffer *paste); GimpBuffer *paste);
gboolean gimp_edit_clear (GimpImage *gimage, gboolean gimp_edit_clear (GimpImage *gimage,
GimpDrawable *drawable); GimpDrawable *drawable);
gboolean gimp_edit_fill (GimpImage *gimage, gboolean gimp_edit_fill (GimpImage *gimage,
GimpDrawable *drawable, GimpDrawable *drawable,
GimpFillType fill_type); GimpFillType fill_type);
#endif /* __GIMP_EDIT_H__ */ #endif /* __GIMP_EDIT_H__ */

26
app/gui/edit-commands.c
View File

@ -71,12 +71,12 @@
/* local function prototypes */ /* local function prototypes */
static void cut_named_buffer_callback (GtkWidget *widget, static void cut_named_buffer_callback (GtkWidget *widget,
gchar *name, const gchar *name,
gpointer data); gpointer data);
static void copy_named_buffer_callback (GtkWidget *widget, static void copy_named_buffer_callback (GtkWidget *widget,
gchar *name, const gchar *name,
gpointer data); gpointer data);
/* public functions */ /* public functions */
@ -288,8 +288,8 @@ cut_named_buffer_callback (GtkWidget *widget,
gchar *name, gchar *name,
gpointer data) gpointer data)
{ {
GimpBuffer *cut_buffer; const GimpBuffer *cut_buffer;
GimpImage *gimage; GimpImage *gimage;
gimage = (GimpImage *) data; gimage = (GimpImage *) data;
@ -313,12 +313,12 @@ cut_named_buffer_callback (GtkWidget *widget,
} }
static void static void
copy_named_buffer_callback (GtkWidget *widget, copy_named_buffer_callback (GtkWidget *widget,
gchar *name, const gchar *name,
gpointer data) gpointer data)
{ {
GimpBuffer *copy_buffer; const GimpBuffer *copy_buffer;
GimpImage *gimage; GimpImage *gimage;
gimage = (GimpImage *) data; gimage = (GimpImage *) data;

18
app/gui/file-commands.c
View File

@ -84,12 +84,12 @@
/* local function prototypes */ /* local function prototypes */
static void file_new_template_callback (GtkWidget *widget, static void file_new_template_callback (GtkWidget *widget,
gchar *name, const gchar *name,
gpointer data); gpointer data);
static void file_revert_confirm_callback (GtkWidget *widget, static void file_revert_confirm_callback (GtkWidget *widget,
gboolean revert, gboolean revert,
gpointer data); gpointer data);
/* public functions */ /* public functions */
@ -391,9 +391,9 @@ file_file_open_dialog (Gimp *gimp,
/* private functions */ /* private functions */
static void static void
file_new_template_callback (GtkWidget *widget, file_new_template_callback (GtkWidget *widget,
gchar *name, const gchar *name,
gpointer data) gpointer data)
{ {
GimpTemplate *template; GimpTemplate *template;
GimpImage *gimage; GimpImage *gimage;

8
app/gui/palettes-commands.c
View File

@ -43,7 +43,7 @@
static void palettes_merge_palettes_query (GimpContainerEditor *editor); static void palettes_merge_palettes_query (GimpContainerEditor *editor);
static void palettes_merge_palettes_callback (GtkWidget *widget, static void palettes_merge_palettes_callback (GtkWidget *widget,
gchar *palette_name, const gchar *palette_name,
gpointer data); gpointer data);
@ -91,9 +91,9 @@ palettes_merge_palettes_query (GimpContainerEditor *editor)
} }
static void static void
palettes_merge_palettes_callback (GtkWidget *widget, palettes_merge_palettes_callback (GtkWidget *widget,
gchar *palette_name, const gchar *palette_name,
gpointer data) gpointer data)
{ {
#ifdef __GNUC__ #ifdef __GNUC__
#warning FIXME: reimplement palettes_merge_palettes_callback() #warning FIXME: reimplement palettes_merge_palettes_callback()

6
libgimpwidgets/gimpquerybox.c
View File

@ -531,13 +531,13 @@ static void
string_query_box_ok_callback (GtkWidget *widget, string_query_box_ok_callback (GtkWidget *widget,
gpointer data) gpointer data)
{ {
QueryBox *query_box; QueryBox *query_box;
gchar *string; const gchar *string;
query_box = query_box_disconnect (data); query_box = query_box_disconnect (data);
/* Get the entry data */ /* Get the entry data */
string = g_strdup (gtk_entry_get_text (GTK_ENTRY (query_box->entry))); string = gtk_entry_get_text (GTK_ENTRY (query_box->entry));
/* Call the user defined callback */ /* Call the user defined callback */
(* (GimpQueryStringCallback) query_box->callback) (query_box->qbox, (* (GimpQueryStringCallback) query_box->callback) (query_box->qbox,

32
libgimpwidgets/gimpquerybox.h
View File

@ -29,26 +29,26 @@ G_BEGIN_DECLS
/* query box callback prototypes */ /* query box callback prototypes */
typedef void (* GimpQueryStringCallback) (GtkWidget *query_box, typedef void (* GimpQueryStringCallback) (GtkWidget *query_box,
gchar *string, const gchar *string,
gpointer data); gpointer data);
typedef void (* GimpQueryIntCallback) (GtkWidget *query_box, typedef void (* GimpQueryIntCallback) (GtkWidget *query_box,
gint value, gint value,
gpointer data); gpointer data);
typedef void (* GimpQueryDoubleCallback) (GtkWidget *query_box, typedef void (* GimpQueryDoubleCallback) (GtkWidget *query_box,
gdouble value, gdouble value,
gpointer data); gpointer data);
typedef void (* GimpQuerySizeCallback) (GtkWidget *query_box, typedef void (* GimpQuerySizeCallback) (GtkWidget *query_box,
gdouble size, gdouble size,
GimpUnit unit, GimpUnit unit,
gpointer data); gpointer data);
typedef void (* GimpQueryBooleanCallback) (GtkWidget *query_box, typedef void (* GimpQueryBooleanCallback) (GtkWidget *query_box,
gboolean value, gboolean value,
gpointer data); gpointer data);
#define GIMP_QUERY_BOX_VBOX(qbox) g_object_get_data (G_OBJECT (qbox), \ #define GIMP_QUERY_BOX_VBOX(qbox) g_object_get_data (G_OBJECT (qbox), \