dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Libgimp cleanup part II (with a little help from Yosh who moved the CVS 

2000-05-27  Michael Natterer  <mitch@gimp.org>

	Libgimp cleanup part II (with a little help from Yosh
	who moved the CVS files).

	* libgimp/Makefile.am
	* libgimp/gimpchannel_pdb.c
	* libgimp/gimpdisplay_pdb.c
	* libgimp/gimpdrawable_pdb.c
	* libgimp/gimpgradient_pdb.c
	* libgimp/gimphelp_pdb.c
	* libgimp/gimpimage_pdb.c
	* libgimp/gimplayer_pdb.c
	* libgimp/gimppalette_pdb.c
	* libgimp/gimpparasite_pdb.c
	* libgimp/gimpselection_pdb.c
	* libgimp/gimpunit_pdb.c: new names of all files which contain
	PDB wrappers.

	* modules/Makefile.am
	* libgimp/gimpcolordisplay.h
	* libgimp/gimpcolorselector.h
	* modules/gimpmodregister.[ch]: renamed.

	* libgimp/gimpparasiteF.h
	* libgimp/gimpparasiteP.h: removed because gimp.h had to include
	the private header anyway.

	* app/color_notebook.c
	* app/color_select.c
	* app/gdisplay_color.[ch]
	* app/gdisplay_color_ui.c
	* app/gimpbrushpipe.c
	* app/gimpdrawable.[ch]
	* app/gimpimage.c
	* app/gimpimage.h
	* app/gimpparasite.[ch]
	* app/gimprc.c
	* app/image_new.c
	* app/layer.c
	* app/parasite_cmds.c
	* app/parasitelist.[ch]
	* app/plug_in.c
	* app/procedural_db.c
	* app/undo.c
	* app/xcf.c
	* libgimp/gimp.[ch]
	* libgimp/gimpcolordisplay.h
	* libgimp/gimpparasite.[ch]
	* modules/cdisplay_gamma.c
	* modules/cdisplay_highcontrast.c
	* modules/colorsel_gtk.c
	* modules/colorsel_triangle.c
	* modules/colorsel_water.c
	* plug-ins/FractalExplorer/Dialogs.c
	* plug-ins/FractalExplorer/Events.c
	* plug-ins/Lighting/lighting_apply.c
	* plug-ins/Lighting/lighting_shade.c
	* plug-ins/MapObject/mapobject_image.c
	* plug-ins/common/gpb.c
	* plug-ins/common/psp.c
	* plug-ins/sel2path/sel2path.c
	* po-libgimp/POTFILES.in
	* tools/pdbgen/pdb.pl
	* tools/pdbgen/pdb/parasite.pdb: changed includes accordingly.
This commit is contained in:
Michael Natterer 2000-05-27 01:30:21 +00:00 committed by Michael Natterer
parent 763bd6ab98
commit 6fa33d6855
113 changed files with 374 additions and 542 deletions
ChangeLog
app
actions
plug-in-commands.c
color_notebook.ccolor_select.c
core
gimp-parasites.cgimp-parasites.hgimpbrushpipe-load.cgimpbrushpipe.cgimpdrawable.cgimpdrawable.hgimpimage-guides.cgimpimage-guides.hgimpimage-merge.cgimpimage-merge.hgimpimage-projection.cgimpimage-projection.hgimpimage-resize.cgimpimage-resize.hgimpimage-scale.cgimpimage-scale.hgimpimage-undo-push.cgimpimage.cgimpimage.hgimplayer.cgimpparasite.cgimpparasite.hgimpparasitelist.cgimpparasitelist.hgimpprojection-construct.cgimpprojection-construct.h
dialogs
color-dialog.c
display
gimpdisplayshell-filter-dialog.cgimpdisplayshell-filter.cgimpdisplayshell-filter.h
gdisplay_color.cgdisplay_color.hgdisplay_color_ui.cgimpbrushpipe.cgimpdrawable.cgimpdrawable.hgimpimage.cgimpimage.hgimplayer.cgimpparasite.cgimpparasite.hgimprc.c
gui
color-notebook.ccolor-select.cplug-in-commands.cplug-in-menus.c
image_new.clayer.c
menus
plug-in-menus.c
parasite_cmds.cparasitelist.cparasitelist.h
plug-in
gimpplugin-message.cgimpplugin-progress.cgimpplugin.cgimppluginmanager-call.cgimppluginmanager-run.cgimppluginmanager.cgimppluginshm.cplug-in-def.cplug-in-message.cplug-in-params.cplug-in-progress.cplug-in-run.cplug-in-shm.cplug-in.cplug-ins.c
plug_in.cprocedural_db.cundo.c
widgets
gimpcolordialog.cgimpcolordisplayeditor.c
xcf.c
xcf
xcf.c
libgimp
Makefile.amgimp.cgimp.hgimpcolordisplay.hgimpparasite.cgimpparasite.hgimpparasiteF.hgimpparasiteP.hgimpparasiteio.cgimpprotocol.cgimpui.h
libgimpbase
gimpparasite.cgimpparasite.hgimpparasiteio.cgimpprotocol.c
libgimpwidgets
gimpcolorselect.c
modules
Makefile.amcdisplay_gamma.ccdisplay_highcontrast.ccolorsel_gtk.ccolorsel_triangle.ccolorsel_water.c
Show More

66
ChangeLog
View File

@ -1,3 +1,69 @@
2000-05-27 Michael Natterer <mitch@gimp.org>
Libgimp cleanup part II (with a little help from Yosh
who moved the CVS files).
* libgimp/Makefile.am
* libgimp/gimpchannel_pdb.c
* libgimp/gimpdisplay_pdb.c
* libgimp/gimpdrawable_pdb.c
* libgimp/gimpgradient_pdb.c
* libgimp/gimphelp_pdb.c
* libgimp/gimpimage_pdb.c
* libgimp/gimplayer_pdb.c
* libgimp/gimppalette_pdb.c
* libgimp/gimpparasite_pdb.c
* libgimp/gimpselection_pdb.c
* libgimp/gimpunit_pdb.c: new names of all files which contain
PDB wrappers.
* modules/Makefile.am
* libgimp/gimpcolordisplay.h
* libgimp/gimpcolorselector.h
* modules/gimpmodregister.[ch]: renamed.
* libgimp/gimpparasiteF.h
* libgimp/gimpparasiteP.h: removed because gimp.h had to include
the private header anyway.
* app/color_notebook.c
* app/color_select.c
* app/gdisplay_color.[ch]
* app/gdisplay_color_ui.c
* app/gimpbrushpipe.c
* app/gimpdrawable.[ch]
* app/gimpimage.c
* app/gimpimage.h
* app/gimpparasite.[ch]
* app/gimprc.c
* app/image_new.c
* app/layer.c
* app/parasite_cmds.c
* app/parasitelist.[ch]
* app/plug_in.c
* app/procedural_db.c
* app/undo.c
* app/xcf.c
* libgimp/gimp.[ch]
* libgimp/gimpcolordisplay.h
* libgimp/gimpparasite.[ch]
* modules/cdisplay_gamma.c
* modules/cdisplay_highcontrast.c
* modules/colorsel_gtk.c
* modules/colorsel_triangle.c
* modules/colorsel_water.c
* plug-ins/FractalExplorer/Dialogs.c
* plug-ins/FractalExplorer/Events.c
* plug-ins/Lighting/lighting_apply.c
* plug-ins/Lighting/lighting_shade.c
* plug-ins/MapObject/mapobject_image.c
* plug-ins/common/gpb.c
* plug-ins/common/psp.c
* plug-ins/sel2path/sel2path.c
* po-libgimp/POTFILES.in
* tools/pdbgen/pdb.pl
* tools/pdbgen/pdb/parasite.pdb: changed includes accordingly.
Fri May 26 23:14:14 BST 2000 Andy Thomas <alt@gimp.org>
* plug-ins/common/illusion.c

3
app/actions/plug-in-commands.c
View File

@ -94,8 +94,7 @@
#include "libgimp/gimpenv.h"
#include "libgimp/gimpprotocol.h"
#include "libgimp/gimpwire.h"
#include "libgimp/parasite.h"
#include "libgimp/parasiteP.h" /* ick */
#include "libgimp/gimpparasite.h"
#include "libgimp/gimpintl.h"

5
app/color_notebook.c
View File

@ -27,13 +27,14 @@
#include <stdlib.h>
#include <string.h>
/*#include "appenv.h"*/
#include "color_notebook.h"
#include "gimpui.h"
#include "libgimp/color_selector.h"
#include "libgimp/gimpcolorselector.h"
#include "libgimp/gimpintl.h"
static void color_notebook_ok_callback (GtkWidget *widget,
gpointer data);
static void color_notebook_cancel_callback (GtkWidget *widget,

2
app/color_select.c
View File

@ -31,7 +31,7 @@
#include "session.h"
#include "color_area.h" /* for color_area_draw_rect */
#include "libgimp/color_selector.h"
#include "libgimp/gimpcolorselector.h"
#include "libgimp/gimpintl.h"

3
app/core/gimp-parasites.c
View File

@ -28,9 +28,10 @@
#include "gimpparasite.h"
#include "gimprc.h"
#include "libgimp/parasite.h"
#include "libgimp/gimpparasite.h"
#include "libgimp/gimpenv.h"
static ParasiteList *parasites = NULL;
void

2
app/core/gimp-parasites.h
View File

@ -17,7 +17,7 @@
#ifndef __APP_GIMP_PARASITE_H__
#define __APP_GIMP_PARASITE_H__
#include "libgimp/parasiteF.h"
#include "libgimp/gimpparasite.h"
void gimp_init_parasites (void);

3
app/core/gimpbrushpipe-load.c
View File

@ -36,10 +36,11 @@
#include "gimprc.h"
#include "libgimp/gimpmath.h"
#include "libgimp/parasiteio.h"
#include "libgimp/gimpparasiteio.h"
#include "libgimp/gimpintl.h"
static GimpBrushClass *gimp_brush_class;
static GimpBrushPixmapClass *gimp_brush_pixmap_class;

3
app/core/gimpbrushpipe.c
View File

@ -36,10 +36,11 @@
#include "gimprc.h"
#include "libgimp/gimpmath.h"
#include "libgimp/parasiteio.h"
#include "libgimp/gimpparasiteio.h"
#include "libgimp/gimpintl.h"
static GimpBrushClass *gimp_brush_class;
static GimpBrushPixmapClass *gimp_brush_pixmap_class;

2
app/core/gimpdrawable.c
View File

@ -29,7 +29,7 @@
#include "undo.h"
#include "libgimp/gimpmath.h"
#include "libgimp/parasite.h"
#include "libgimp/gimpparasite.h"
#include "libgimp/gimpintl.h"

3
app/core/gimpdrawable.h
View File

@ -25,7 +25,8 @@
#include "temp_buf.h"
#include "gimpimageF.h"
#include <libgimp/parasiteF.h>
#include "libgimp/gimpparasite.h"
#define GIMP_TYPE_DRAWABLE (gimp_drawable_get_type ())
#define GIMP_DRAWABLE(obj) (GTK_CHECK_CAST ((obj), GIMP_TYPE_DRAWABLE, GimpDrawable))

2
app/core/gimpimage-guides.c
View File

@ -41,7 +41,7 @@
#include "libgimp/gimpcolorspace.h"
#include "libgimp/gimplimits.h"
#include "libgimp/parasite.h"
#include "libgimp/gimpparasite.h"
#include "libgimp/gimpintl.h"

5
app/core/gimpimage-guides.h
View File

@ -25,13 +25,14 @@
#include "drawable.h"
#include "channel.h"
#include "layer.h"
#include <libgimp/parasiteF.h>
#include <libgimp/gimpunit.h>
#include "plug_in.h"
#include "temp_buf.h"
#include "tile_manager.h"
#include "path.h"
#include "libgimp/gimpparasite.h"
#include "libgimp/gimpunit.h"
#define GIMP_TYPE_IMAGE gimp_image_get_type()
#define GIMP_IMAGE(obj) GTK_CHECK_CAST (obj, GIMP_TYPE_IMAGE, GimpImage)

2
app/core/gimpimage-merge.c
View File

@ -41,7 +41,7 @@
#include "libgimp/gimpcolorspace.h"
#include "libgimp/gimplimits.h"
#include "libgimp/parasite.h"
#include "libgimp/gimpparasite.h"
#include "libgimp/gimpintl.h"

5
app/core/gimpimage-merge.h
View File

@ -25,13 +25,14 @@
#include "drawable.h"
#include "channel.h"
#include "layer.h"
#include <libgimp/parasiteF.h>
#include <libgimp/gimpunit.h>
#include "plug_in.h"
#include "temp_buf.h"
#include "tile_manager.h"
#include "path.h"
#include "libgimp/gimpparasite.h"
#include "libgimp/gimpunit.h"
#define GIMP_TYPE_IMAGE gimp_image_get_type()
#define GIMP_IMAGE(obj) GTK_CHECK_CAST (obj, GIMP_TYPE_IMAGE, GimpImage)

2
app/core/gimpimage-projection.c
View File

@ -41,7 +41,7 @@
#include "libgimp/gimpcolorspace.h"
#include "libgimp/gimplimits.h"
#include "libgimp/parasite.h"
#include "libgimp/gimpparasite.h"
#include "libgimp/gimpintl.h"

5
app/core/gimpimage-projection.h
View File

@ -25,13 +25,14 @@
#include "drawable.h"
#include "channel.h"
#include "layer.h"
#include <libgimp/parasiteF.h>
#include <libgimp/gimpunit.h>
#include "plug_in.h"
#include "temp_buf.h"
#include "tile_manager.h"
#include "path.h"
#include "libgimp/gimpparasite.h"
#include "libgimp/gimpunit.h"
#define GIMP_TYPE_IMAGE gimp_image_get_type()
#define GIMP_IMAGE(obj) GTK_CHECK_CAST (obj, GIMP_TYPE_IMAGE, GimpImage)

2
app/core/gimpimage-resize.c
View File

@ -41,7 +41,7 @@
#include "libgimp/gimpcolorspace.h"
#include "libgimp/gimplimits.h"
#include "libgimp/parasite.h"
#include "libgimp/gimpparasite.h"
#include "libgimp/gimpintl.h"

5
app/core/gimpimage-resize.h
View File

@ -25,13 +25,14 @@
#include "drawable.h"
#include "channel.h"
#include "layer.h"
#include <libgimp/parasiteF.h>
#include <libgimp/gimpunit.h>
#include "plug_in.h"
#include "temp_buf.h"
#include "tile_manager.h"
#include "path.h"
#include "libgimp/gimpparasite.h"
#include "libgimp/gimpunit.h"
#define GIMP_TYPE_IMAGE gimp_image_get_type()
#define GIMP_IMAGE(obj) GTK_CHECK_CAST (obj, GIMP_TYPE_IMAGE, GimpImage)

2
app/core/gimpimage-scale.c
View File

@ -41,7 +41,7 @@
#include "libgimp/gimpcolorspace.h"
#include "libgimp/gimplimits.h"
#include "libgimp/parasite.h"
#include "libgimp/gimpparasite.h"
#include "libgimp/gimpintl.h"

5
app/core/gimpimage-scale.h
View File

@ -25,13 +25,14 @@
#include "drawable.h"
#include "channel.h"
#include "layer.h"
#include <libgimp/parasiteF.h>
#include <libgimp/gimpunit.h>
#include "plug_in.h"
#include "temp_buf.h"
#include "tile_manager.h"
#include "path.h"
#include "libgimp/gimpparasite.h"
#include "libgimp/gimpunit.h"
#define GIMP_TYPE_IMAGE gimp_image_get_type()
#define GIMP_IMAGE(obj) GTK_CHECK_CAST (obj, GIMP_TYPE_IMAGE, GimpImage)

2
app/core/gimpimage-undo-push.c
View File

@ -45,7 +45,7 @@
#include "tile_manager_pvt.h"
#include "tile.h" /* ick. */
#include "libgimp/parasite.h"
#include "libgimp/gimpparasite.h"
#include "libgimp/gimpintl.h"

2
app/core/gimpimage.c
View File

@ -41,7 +41,7 @@
#include "libgimp/gimpcolorspace.h"
#include "libgimp/gimplimits.h"
#include "libgimp/parasite.h"
#include "libgimp/gimpparasite.h"
#include "libgimp/gimpintl.h"

5
app/core/gimpimage.h
View File

@ -25,13 +25,14 @@
#include "drawable.h"
#include "channel.h"
#include "layer.h"
#include <libgimp/parasiteF.h>
#include <libgimp/gimpunit.h>
#include "plug_in.h"
#include "temp_buf.h"
#include "tile_manager.h"
#include "path.h"
#include "libgimp/gimpparasite.h"
#include "libgimp/gimpunit.h"
#define GIMP_TYPE_IMAGE gimp_image_get_type()
#define GIMP_IMAGE(obj) GTK_CHECK_CAST (obj, GIMP_TYPE_IMAGE, GimpImage)

5
app/core/gimplayer.c
View File

@ -40,12 +40,13 @@
#include "tile.h" /* ick. */
#include "libgimp/gimpmath.h"
#include "libgimp/parasite.h"
#include "libgimp/gimpparasite.h"
#include "libgimp/gimpintl.h"
enum {
enum
{
REMOVED,
LAST_SIGNAL
};

3
app/core/gimpparasite.c
View File

@ -28,9 +28,10 @@
#include "gimpparasite.h"
#include "gimprc.h"
#include "libgimp/parasite.h"
#include "libgimp/gimpparasite.h"
#include "libgimp/gimpenv.h"
static ParasiteList *parasites = NULL;
void

2
app/core/gimpparasite.h
View File

@ -17,7 +17,7 @@
#ifndef __APP_GIMP_PARASITE_H__
#define __APP_GIMP_PARASITE_H__
#include "libgimp/parasiteF.h"
#include "libgimp/gimpparasite.h"
void gimp_init_parasites (void);

3
app/core/gimpparasitelist.c
View File

@ -21,8 +21,7 @@
#include "gimpsignal.h"
#include "parasitelistP.h"
#include "libgimp/parasite.h"
#include "libgimp/parasiteP.h"
#include "libgimp/gimpparasite.h"
enum

2
app/core/gimpparasitelist.h
View File

@ -23,7 +23,7 @@
#include "parasitelistF.h"
#include "gimpobject.h"
#include "libgimp/parasiteF.h"
#include "libgimp/gimpparasite.h"
#define GIMP_TYPE_PARASITE_LIST (parasite_list_get_type ())

2
app/core/gimpprojection-construct.c
View File

@ -41,7 +41,7 @@
#include "libgimp/gimpcolorspace.h"
#include "libgimp/gimplimits.h"
#include "libgimp/parasite.h"
#include "libgimp/gimpparasite.h"
#include "libgimp/gimpintl.h"

5
app/core/gimpprojection-construct.h
View File

@ -25,13 +25,14 @@
#include "drawable.h"
#include "channel.h"
#include "layer.h"
#include <libgimp/parasiteF.h>
#include <libgimp/gimpunit.h>
#include "plug_in.h"
#include "temp_buf.h"
#include "tile_manager.h"
#include "path.h"
#include "libgimp/gimpparasite.h"
#include "libgimp/gimpunit.h"
#define GIMP_TYPE_IMAGE gimp_image_get_type()
#define GIMP_IMAGE(obj) GTK_CHECK_CAST (obj, GIMP_TYPE_IMAGE, GimpImage)

5
app/dialogs/color-dialog.c
View File

@ -27,13 +27,14 @@
#include <stdlib.h>
#include <string.h>
/*#include "appenv.h"*/
#include "color_notebook.h"
#include "gimpui.h"
#include "libgimp/color_selector.h"
#include "libgimp/gimpcolorselector.h"
#include "libgimp/gimpintl.h"
static void color_notebook_ok_callback (GtkWidget *widget,
gpointer data);
static void color_notebook_cancel_callback (GtkWidget *widget,

2
app/display/gimpdisplayshell-filter-dialog.c
View File

@ -27,7 +27,7 @@
#include "gimpimageP.h"
#include "gimpui.h"
#include "libgimp/parasite.h"
#include "libgimp/gimpparasite.h"
#include "libgimp/gimpintl.h"

17
app/display/gimpdisplayshell-filter.c
View File

@ -26,14 +26,15 @@
#include "gimpimageP.h"
#include "gimpui.h"
#include "libgimp/parasite.h"
#include "libgimp/gimpparasite.h"
#include <gtk/gtk.h>
typedef struct _ColorDisplayInfo ColorDisplayInfo;
struct _ColorDisplayInfo {
char *name;
struct _ColorDisplayInfo
{
gchar *name;
GimpColorDisplayMethods methods;
GSList *refs;
};
@ -47,7 +48,7 @@ static void gdisplay_color_detach_real (GDisplay *gdisp,
ColorDisplayNode *node,
gboolean unref);
static gint node_name_compare (ColorDisplayNode *node,
const char *name);
const gchar *name);
void
color_display_init (void)
@ -55,7 +56,7 @@ color_display_init (void)
}
G_MODULE_EXPORT gboolean
gimp_color_display_register (const char *name,
gimp_color_display_register (const gchar *name,
GimpColorDisplayMethods *methods)
{
ColorDisplayInfo *info;
@ -81,7 +82,7 @@ gimp_color_display_register (const char *name,
}
G_MODULE_EXPORT gboolean
gimp_color_display_unregister (const char *name)
gimp_color_display_unregister (const gchar *name)
{
ColorDisplayInfo *info;
GDisplay *gdisp;
@ -147,8 +148,8 @@ color_display_foreach_real (gpointer key,
}
ColorDisplayNode *
gdisplay_color_attach (GDisplay *gdisp,
const char *name)
gdisplay_color_attach (GDisplay *gdisp,
const gchar *name)
{
ColorDisplayInfo *info;
ColorDisplayNode *node;

4
app/display/gimpdisplayshell-filter.h
View File

@ -18,9 +18,11 @@
#ifndef __GDISPLAY_COLOR_H__
#define __GDISPLAY_COLOR_H__
#include "libgimp/color_display.h"
#include "gdisplayF.h"
#include "libgimp/gimpcolordisplay.h"
typedef struct _ColorDisplayNode ColorDisplayNode;
struct _ColorDisplayNode {

17
app/gdisplay_color.c
View File

@ -26,14 +26,15 @@
#include "gimpimageP.h"
#include "gimpui.h"
#include "libgimp/parasite.h"
#include "libgimp/gimpparasite.h"
#include <gtk/gtk.h>
typedef struct _ColorDisplayInfo ColorDisplayInfo;
struct _ColorDisplayInfo {
char *name;
struct _ColorDisplayInfo
{
gchar *name;
GimpColorDisplayMethods methods;
GSList *refs;
};
@ -47,7 +48,7 @@ static void gdisplay_color_detach_real (GDisplay *gdisp,
ColorDisplayNode *node,
gboolean unref);
static gint node_name_compare (ColorDisplayNode *node,
const char *name);
const gchar *name);
void
color_display_init (void)
@ -55,7 +56,7 @@ color_display_init (void)
}
G_MODULE_EXPORT gboolean
gimp_color_display_register (const char *name,
gimp_color_display_register (const gchar *name,
GimpColorDisplayMethods *methods)
{
ColorDisplayInfo *info;
@ -81,7 +82,7 @@ gimp_color_display_register (const char *name,
}
G_MODULE_EXPORT gboolean
gimp_color_display_unregister (const char *name)
gimp_color_display_unregister (const gchar *name)
{
ColorDisplayInfo *info;
GDisplay *gdisp;
@ -147,8 +148,8 @@ color_display_foreach_real (gpointer key,
}
ColorDisplayNode *
gdisplay_color_attach (GDisplay *gdisp,
const char *name)
gdisplay_color_attach (GDisplay *gdisp,
const gchar *name)
{
ColorDisplayInfo *info;
ColorDisplayNode *node;

4
app/gdisplay_color.h
View File

@ -18,9 +18,11 @@
#ifndef __GDISPLAY_COLOR_H__
#define __GDISPLAY_COLOR_H__
#include "libgimp/color_display.h"
#include "gdisplayF.h"
#include "libgimp/gimpcolordisplay.h"
typedef struct _ColorDisplayNode ColorDisplayNode;
struct _ColorDisplayNode {

2
app/gdisplay_color_ui.c
View File

@ -27,7 +27,7 @@
#include "gimpimageP.h"
#include "gimpui.h"
#include "libgimp/parasite.h"
#include "libgimp/gimpparasite.h"
#include "libgimp/gimpintl.h"

3
app/gimpbrushpipe.c
View File

@ -36,10 +36,11 @@
#include "gimprc.h"
#include "libgimp/gimpmath.h"
#include "libgimp/parasiteio.h"
#include "libgimp/gimpparasiteio.h"
#include "libgimp/gimpintl.h"
static GimpBrushClass *gimp_brush_class;
static GimpBrushPixmapClass *gimp_brush_pixmap_class;

2
app/gimpdrawable.c
View File

@ -29,7 +29,7 @@
#include "undo.h"
#include "libgimp/gimpmath.h"
#include "libgimp/parasite.h"
#include "libgimp/gimpparasite.h"
#include "libgimp/gimpintl.h"

3
app/gimpdrawable.h
View File

@ -25,7 +25,8 @@
#include "temp_buf.h"
#include "gimpimageF.h"
#include <libgimp/parasiteF.h>
#include "libgimp/gimpparasite.h"
#define GIMP_TYPE_DRAWABLE (gimp_drawable_get_type ())
#define GIMP_DRAWABLE(obj) (GTK_CHECK_CAST ((obj), GIMP_TYPE_DRAWABLE, GimpDrawable))

2
app/gimpimage.c
View File

@ -41,7 +41,7 @@
#include "libgimp/gimpcolorspace.h"
#include "libgimp/gimplimits.h"
#include "libgimp/parasite.h"
#include "libgimp/gimpparasite.h"
#include "libgimp/gimpintl.h"

5
app/gimpimage.h
View File

@ -25,13 +25,14 @@
#include "drawable.h"
#include "channel.h"
#include "layer.h"
#include <libgimp/parasiteF.h>
#include <libgimp/gimpunit.h>
#include "plug_in.h"
#include "temp_buf.h"
#include "tile_manager.h"
#include "path.h"
#include "libgimp/gimpparasite.h"
#include "libgimp/gimpunit.h"
#define GIMP_TYPE_IMAGE gimp_image_get_type()
#define GIMP_IMAGE(obj) GTK_CHECK_CAST (obj, GIMP_TYPE_IMAGE, GimpImage)

5
app/gimplayer.c
View File

@ -40,12 +40,13 @@
#include "tile.h" /* ick. */
#include "libgimp/gimpmath.h"
#include "libgimp/parasite.h"
#include "libgimp/gimpparasite.h"
#include "libgimp/gimpintl.h"
enum {
enum
{
REMOVED,
LAST_SIGNAL
};

3
app/gimpparasite.c
View File

@ -28,9 +28,10 @@
#include "gimpparasite.h"
#include "gimprc.h"
#include "libgimp/parasite.h"
#include "libgimp/gimpparasite.h"
#include "libgimp/gimpenv.h"
static ParasiteList *parasites = NULL;
void

2
app/gimpparasite.h
View File

@ -17,7 +17,7 @@
#ifndef __APP_GIMP_PARASITE_H__
#define __APP_GIMP_PARASITE_H__
#include "libgimp/parasiteF.h"
#include "libgimp/gimpparasite.h"
void gimp_init_parasites (void);

2
app/gimprc.c
View File

@ -48,7 +48,7 @@
#include "libgimp/gimpenv.h"
#include "libgimp/gimputils.h"
#include "libgimp/parasite.h"
#include "libgimp/gimpparasite.h"
#include "libgimp/gimpintl.h"

5
app/gui/color-notebook.c
View File

@ -27,13 +27,14 @@
#include <stdlib.h>
#include <string.h>
/*#include "appenv.h"*/
#include "color_notebook.h"
#include "gimpui.h"
#include "libgimp/color_selector.h"
#include "libgimp/gimpcolorselector.h"
#include "libgimp/gimpintl.h"
static void color_notebook_ok_callback (GtkWidget *widget,
gpointer data);
static void color_notebook_cancel_callback (GtkWidget *widget,

2
app/gui/color-select.c
View File

@ -31,7 +31,7 @@
#include "session.h"
#include "color_area.h" /* for color_area_draw_rect */
#include "libgimp/color_selector.h"
#include "libgimp/gimpcolorselector.h"
#include "libgimp/gimpintl.h"

3
app/gui/plug-in-commands.c
View File

@ -94,8 +94,7 @@
#include "libgimp/gimpenv.h"
#include "libgimp/gimpprotocol.h"
#include "libgimp/gimpwire.h"
#include "libgimp/parasite.h"
#include "libgimp/parasiteP.h" /* ick */
#include "libgimp/gimpparasite.h"
#include "libgimp/gimpintl.h"

3
app/gui/plug-in-menus.c
View File

@ -94,8 +94,7 @@
#include "libgimp/gimpenv.h"
#include "libgimp/gimpprotocol.h"
#include "libgimp/gimpwire.h"
#include "libgimp/parasite.h"
#include "libgimp/parasiteP.h" /* ick */
#include "libgimp/gimpparasite.h"
#include "libgimp/gimpintl.h"

11
app/image_new.c
View File

@ -27,11 +27,13 @@
#include "gimpcontext.h"
#include "gimage.h"
#include "libgimp/gimpparasite.h"
#include "libgimp/gimpintl.h"
#include "libgimp/parasite.h"
#include "pixmaps/wilber2.xpm"
static GList *image_base_type_names = NULL;
static GList *fill_type_names = NULL;
static GimpImageNewValues last_values;
@ -43,8 +45,9 @@ static void
image_new_init (void)
{
static gboolean image_new_inited = FALSE;
GimpImageBaseTypeName *new_type;
GimpFillTypeName *new_fill_type;
GimpFillTypeName *new_fill_type;
if (image_new_inited)
return;
@ -94,7 +97,7 @@ image_new_init (void)
last_values.fill_type = BACKGROUND_FILL;
}
GList*
GList *
image_new_get_image_base_type_names (void)
{
image_new_init ();
@ -102,7 +105,7 @@ image_new_get_image_base_type_names (void)
return image_base_type_names;
}
GList*
GList *
image_new_get_fill_type_names (void)
{
image_new_init ();

5
app/layer.c
View File

@ -40,12 +40,13 @@
#include "tile.h" /* ick. */
#include "libgimp/gimpmath.h"
#include "libgimp/parasite.h"
#include "libgimp/gimpparasite.h"
#include "libgimp/gimpintl.h"
enum {
enum
{
REMOVED,
LAST_SIGNAL
};

3
app/menus/plug-in-menus.c
View File

@ -94,8 +94,7 @@
#include "libgimp/gimpenv.h"
#include "libgimp/gimpprotocol.h"
#include "libgimp/gimpwire.h"
#include "libgimp/parasite.h"
#include "libgimp/parasiteP.h" /* ick */
#include "libgimp/gimpparasite.h"
#include "libgimp/gimpintl.h"

2
app/parasite_cmds.c
View File

@ -25,7 +25,7 @@
#include "gimpimage.h"
#include "gimpparasite.h"
#include "libgimp/parasite.h"
#include "libgimp/gimpparasite.h"
static ProcRecord parasite_new_proc;
static ProcRecord parasite_find_proc;

3
app/parasitelist.c
View File

@ -21,8 +21,7 @@
#include "gimpsignal.h"
#include "parasitelistP.h"
#include "libgimp/parasite.h"
#include "libgimp/parasiteP.h"
#include "libgimp/gimpparasite.h"
enum

2
app/parasitelist.h
View File

@ -23,7 +23,7 @@
#include "parasitelistF.h"
#include "gimpobject.h"
#include "libgimp/parasiteF.h"
#include "libgimp/gimpparasite.h"
#define GIMP_TYPE_PARASITE_LIST (parasite_list_get_type ())

3
app/plug-in/gimpplugin-message.c
View File

@ -94,8 +94,7 @@
#include "libgimp/gimpenv.h"
#include "libgimp/gimpprotocol.h"
#include "libgimp/gimpwire.h"
#include "libgimp/parasite.h"
#include "libgimp/parasiteP.h" /* ick */
#include "libgimp/gimpparasite.h"
#include "libgimp/gimpintl.h"

3
app/plug-in/gimpplugin-progress.c
View File

@ -94,8 +94,7 @@
#include "libgimp/gimpenv.h"
#include "libgimp/gimpprotocol.h"
#include "libgimp/gimpwire.h"
#include "libgimp/parasite.h"
#include "libgimp/parasiteP.h" /* ick */
#include "libgimp/gimpparasite.h"
#include "libgimp/gimpintl.h"

3
app/plug-in/gimpplugin.c
View File

@ -94,8 +94,7 @@
#include "libgimp/gimpenv.h"
#include "libgimp/gimpprotocol.h"
#include "libgimp/gimpwire.h"
#include "libgimp/parasite.h"
#include "libgimp/parasiteP.h" /* ick */
#include "libgimp/gimpparasite.h"
#include "libgimp/gimpintl.h"

3
app/plug-in/gimppluginmanager-call.c
View File

@ -94,8 +94,7 @@
#include "libgimp/gimpenv.h"
#include "libgimp/gimpprotocol.h"
#include "libgimp/gimpwire.h"
#include "libgimp/parasite.h"
#include "libgimp/parasiteP.h" /* ick */
#include "libgimp/gimpparasite.h"
#include "libgimp/gimpintl.h"

3
app/plug-in/gimppluginmanager-run.c
View File

@ -94,8 +94,7 @@
#include "libgimp/gimpenv.h"
#include "libgimp/gimpprotocol.h"
#include "libgimp/gimpwire.h"
#include "libgimp/parasite.h"
#include "libgimp/parasiteP.h" /* ick */
#include "libgimp/gimpparasite.h"
#include "libgimp/gimpintl.h"

3
app/plug-in/gimppluginmanager.c
View File

@ -94,8 +94,7 @@
#include "libgimp/gimpenv.h"
#include "libgimp/gimpprotocol.h"
#include "libgimp/gimpwire.h"
#include "libgimp/parasite.h"
#include "libgimp/parasiteP.h" /* ick */
#include "libgimp/gimpparasite.h"
#include "libgimp/gimpintl.h"

3
app/plug-in/gimppluginshm.c
View File

@ -94,8 +94,7 @@
#include "libgimp/gimpenv.h"
#include "libgimp/gimpprotocol.h"
#include "libgimp/gimpwire.h"
#include "libgimp/parasite.h"
#include "libgimp/parasiteP.h" /* ick */
#include "libgimp/gimpparasite.h"
#include "libgimp/gimpintl.h"

3
app/plug-in/plug-in-def.c
View File

@ -94,8 +94,7 @@
#include "libgimp/gimpenv.h"
#include "libgimp/gimpprotocol.h"
#include "libgimp/gimpwire.h"
#include "libgimp/parasite.h"
#include "libgimp/parasiteP.h" /* ick */
#include "libgimp/gimpparasite.h"
#include "libgimp/gimpintl.h"

3
app/plug-in/plug-in-message.c
View File

@ -94,8 +94,7 @@
#include "libgimp/gimpenv.h"
#include "libgimp/gimpprotocol.h"
#include "libgimp/gimpwire.h"
#include "libgimp/parasite.h"
#include "libgimp/parasiteP.h" /* ick */
#include "libgimp/gimpparasite.h"
#include "libgimp/gimpintl.h"

3
app/plug-in/plug-in-params.c
View File

@ -94,8 +94,7 @@
#include "libgimp/gimpenv.h"
#include "libgimp/gimpprotocol.h"
#include "libgimp/gimpwire.h"
#include "libgimp/parasite.h"
#include "libgimp/parasiteP.h" /* ick */
#include "libgimp/gimpparasite.h"
#include "libgimp/gimpintl.h"

3
app/plug-in/plug-in-progress.c
View File

@ -94,8 +94,7 @@
#include "libgimp/gimpenv.h"
#include "libgimp/gimpprotocol.h"
#include "libgimp/gimpwire.h"
#include "libgimp/parasite.h"
#include "libgimp/parasiteP.h" /* ick */
#include "libgimp/gimpparasite.h"
#include "libgimp/gimpintl.h"

3
app/plug-in/plug-in-run.c
View File

@ -94,8 +94,7 @@
#include "libgimp/gimpenv.h"
#include "libgimp/gimpprotocol.h"
#include "libgimp/gimpwire.h"
#include "libgimp/parasite.h"
#include "libgimp/parasiteP.h" /* ick */
#include "libgimp/gimpparasite.h"
#include "libgimp/gimpintl.h"

3
app/plug-in/plug-in-shm.c
View File

@ -94,8 +94,7 @@
#include "libgimp/gimpenv.h"
#include "libgimp/gimpprotocol.h"
#include "libgimp/gimpwire.h"
#include "libgimp/parasite.h"
#include "libgimp/parasiteP.h" /* ick */
#include "libgimp/gimpparasite.h"
#include "libgimp/gimpintl.h"

3
app/plug-in/plug-in.c
View File

@ -94,8 +94,7 @@
#include "libgimp/gimpenv.h"
#include "libgimp/gimpprotocol.h"
#include "libgimp/gimpwire.h"
#include "libgimp/parasite.h"
#include "libgimp/parasiteP.h" /* ick */
#include "libgimp/gimpparasite.h"
#include "libgimp/gimpintl.h"

3
app/plug-in/plug-ins.c
View File

@ -94,8 +94,7 @@
#include "libgimp/gimpenv.h"
#include "libgimp/gimpprotocol.h"
#include "libgimp/gimpwire.h"
#include "libgimp/parasite.h"
#include "libgimp/parasiteP.h" /* ick */
#include "libgimp/gimpparasite.h"
#include "libgimp/gimpintl.h"

3
app/plug_in.c
View File

@ -94,8 +94,7 @@
#include "libgimp/gimpenv.h"
#include "libgimp/gimpprotocol.h"
#include "libgimp/gimpwire.h"
#include "libgimp/parasite.h"
#include "libgimp/parasiteP.h" /* ick */
#include "libgimp/gimpparasite.h"
#include "libgimp/gimpintl.h"

2
app/procedural_db.c
View File

@ -25,7 +25,7 @@
#include "plug_in.h"
#include "procedural_db.h"
#include "libgimp/parasite.h"
#include "libgimp/gimpparasite.h"
#include "libgimp/gimpintl.h"

2
app/undo.c
View File

@ -45,7 +45,7 @@
#include "tile_manager_pvt.h"
#include "tile.h" /* ick. */
#include "libgimp/parasite.h"
#include "libgimp/gimpparasite.h"
#include "libgimp/gimpintl.h"

5
app/widgets/gimpcolordialog.c
View File

@ -27,13 +27,14 @@
#include <stdlib.h>
#include <string.h>
/*#include "appenv.h"*/
#include "color_notebook.h"
#include "gimpui.h"
#include "libgimp/color_selector.h"
#include "libgimp/gimpcolorselector.h"
#include "libgimp/gimpintl.h"
static void color_notebook_ok_callback (GtkWidget *widget,
gpointer data);
static void color_notebook_cancel_callback (GtkWidget *widget,

2
app/widgets/gimpcolordisplayeditor.c
View File

@ -27,7 +27,7 @@
#include "gimpimageP.h"
#include "gimpui.h"
#include "libgimp/parasite.h"
#include "libgimp/gimpparasite.h"
#include "libgimp/gimpintl.h"

3
app/xcf.c
View File

@ -54,8 +54,7 @@
#include <libgimp/gimpunit.h>
#include <libgimp/gimplimits.h>
#include <libgimp/parasiteP.h>
#include <libgimp/parasite.h>
#include <libgimp/gimpparasite.h>
#include "libgimp/gimpintl.h"

3
app/xcf/xcf.c
View File

@ -54,8 +54,7 @@
#include <libgimp/gimpunit.h>
#include <libgimp/gimplimits.h>
#include <libgimp/parasiteP.h>
#include <libgimp/parasite.h>
#include <libgimp/gimpparasite.h>
#include "libgimp/gimpintl.h"

24
libgimp/Makefile.am
View File

@ -63,8 +63,6 @@ libgimpi_a_SOURCES = \
gimpwire.h \
gimpparasite.c \
gimpparasite.h \
gimpparasiteF.h \
gimpparasiteP.h \
gimpparasiteio.c \
gimpparasiteio.h
@ -94,6 +92,10 @@ libgimp_la_SOURCES = \
gimpmatrix.h \
gimppalette_pdb.c \
gimpparasite_pdb.c \
gimpparasite.c \
gimpparasite.h \
gimpparasiteio.c \
gimpparasiteio.h \
gimppixelrgn.c \
gimpprotocol.c \
gimpprotocol.h \
@ -108,12 +110,6 @@ libgimp_la_SOURCES = \
gimpvector.h \
gimpwire.c \
gimpwire.h \
parasite.c \
parasite.h \
parasiteF.h \
parasiteP.h \
parasiteio.c \
parasiteio.h \
stdplugins-intl.h \
libgimp-intl.h
@ -137,11 +133,11 @@ libgimpui_la_SOURCES = \
gimpwidgets.c
gimpinclude_HEADERS = \
color_display.h \
color_selector.h \
gimp.h \
gimpchainbutton.h \
gimpcolorbutton.h \
gimpcolordisplay.h \
gimpcolorselector.h \
gimpcolorspace.h \
gimpcompat.h \
gimpdialog.h \
@ -156,6 +152,8 @@ gimpinclude_HEADERS = \
gimpmatrix.h \
gimpmenu.h \
gimpmodule.h \
gimpparasite.h \
gimpparasiteio.h \
gimppatheditor.h \
gimppixmap.h \
gimpquerybox.h \
@ -167,11 +165,7 @@ gimpinclude_HEADERS = \
gimputils.h \
gimpvector.h \
gimpwidgets.h \
gimpintl.h \
parasite.h \
parasiteF.h \
parasiteP.h \
parasiteio.h
gimpintl.h
libgimp_la_LDFLAGS = \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \

1
libgimp/gimp.c
View File

@ -53,7 +53,6 @@
#include <signal.h>
#endif
#include "parasiteP.h"
#include "gimpenv.h"
#ifdef HAVE_IPC_H

79
libgimp/gimp.h
View File

@ -22,19 +22,18 @@
#include <glib.h>
#include "libgimp/gimpenums.h"
#include "libgimp/gimpcolorspace.h"
#include "libgimp/gimpfeatures.h"
#include "libgimp/gimpenv.h"
#include "libgimp/gimplimits.h"
#include "libgimp/gimpmath.h"
#include "libgimp/gimpparasite.h"
#include "libgimp/gimpparasiteP.h"
#include "libgimp/gimpunit.h"
#include "libgimp/gimputils.h"
#include "libgimp/gimpvector.h"
#include <libgimp/gimpenums.h>
#include <libgimp/gimpcolorspace.h>
#include <libgimp/gimpfeatures.h>
#include <libgimp/gimpenv.h>
#include <libgimp/gimplimits.h>
#include <libgimp/gimpmath.h>
#include <libgimp/gimpparasite.h>
#include <libgimp/gimpunit.h>
#include <libgimp/gimputils.h>
#include <libgimp/gimpvector.h>
#include "libgimp/gimpcompat.h" /* to be removed in 1.3 */
#include <libgimp/gimpcompat.h> /* to be removed in 1.3 */
#ifdef G_OS_WIN32
# include <stdlib.h> /* For _-argc and __argv */
@ -95,47 +94,47 @@ struct _GPlugInInfo
struct _GTile
{
guint ewidth; /* the effective width of the tile */
guint eheight; /* the effective height of the tile */
guint bpp; /* the bytes per pixel (1, 2, 3 or 4 ) */
guint tile_num; /* the number of this tile within the drawable */
guint16 ref_count; /* reference count for the tile */
guint dirty : 1; /* is the tile dirty? has it been modified? */
guint shadow: 1; /* is this a shadow tile */
guchar *data; /* the pixel data for the tile */
guint ewidth; /* the effective width of the tile */
guint eheight; /* the effective height of the tile */
guint bpp; /* the bytes per pixel (1, 2, 3 or 4 ) */
guint tile_num; /* the number of this tile within the drawable */
guint16 ref_count; /* reference count for the tile */
guint dirty : 1; /* is the tile dirty? has it been modified? */
guint shadow: 1; /* is this a shadow tile */
guchar *data; /* the pixel data for the tile */
GDrawable *drawable; /* the drawable this tile came from */
};
struct _GDrawable
{
gint32 id; /* drawable ID */
guint width; /* width of drawble */
guint height; /* height of drawble */
guint bpp; /* bytes per pixel of drawable */
guint ntile_rows; /* # of tile rows */
guint ntile_cols; /* # of tile columns */
GTile *tiles; /* the normal tiles */
GTile *shadow_tiles; /* the shadow tiles */
gint32 id; /* drawable ID */
guint width; /* width of drawble */
guint height; /* height of drawble */
guint bpp; /* bytes per pixel of drawable */
guint ntile_rows; /* # of tile rows */
guint ntile_cols; /* # of tile columns */
GTile *tiles; /* the normal tiles */
GTile *shadow_tiles; /* the shadow tiles */
};
struct _GPixelRgn
{
guchar *data; /* pointer to region data */
GDrawable *drawable; /* pointer to drawable */
guint bpp; /* bytes per pixel */
guint rowstride; /* bytes per pixel row */
guint x, y; /* origin */
guint w, h; /* width and height of region */
guint dirty : 1; /* will this region be dirtied? */
guint shadow : 1; /* will this region use the shadow or normal tiles */
guint process_count; /* used internally */
guchar *data; /* pointer to region data */
GDrawable *drawable; /* pointer to drawable */
guint bpp; /* bytes per pixel */
guint rowstride; /* bytes per pixel row */
guint x, y; /* origin */
guint w, h; /* width and height of region */
guint dirty : 1; /* will this region be dirtied? */
guint shadow : 1; /* will this region use the shadow or normal tiles */
guint process_count; /* used internally */
};
struct _GParamDef
{
GParamType type;
gchar *name;
gchar *description;
GParamType type;
gchar *name;
gchar *description;
};
struct _GParamColor

3
libgimp/gimpcolordisplay.h
View File

@ -22,7 +22,8 @@
#include <glib.h>
#include <gmodule.h>
#include <libgimp/parasiteF.h>
#include "gimpparasite.h"
typedef void (* GimpColorDisplayInit) (void);
typedef gpointer (* GimpColorDisplayNew) (gint type);

6
libgimp/gimpparasite.c
View File

@ -19,11 +19,8 @@
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
#include "config.h"
#include "parasiteP.h"
#include "parasite.h"
#include <stdio.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h>
@ -35,6 +32,9 @@
#include <process.h> /* For _getpid() */
#endif
#include "gimpparasite.h"
#ifdef DEBUG
static void
gimp_parasite_print (GimpParasite *parasite)

19
libgimp/gimpparasite.h
View File

@ -19,15 +19,9 @@
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
#ifndef __GIMP_PARASITE_H__
#define __GIMP_PARASITE_H__
#include <glib.h>
#include <stdio.h>
#include "libgimp/gimpparasiteF.h"
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
@ -43,6 +37,19 @@ extern "C" {
#define GIMP_PARASITE_GRANDPARENT_PERSISTENT (GIMP_PARASITE_PERSISTENT << 16)
#define GIMP_PARASITE_GRANDPARENT_UNDOABLE (GIMP_PARASITE_UNDOABLE << 16)
typedef struct _GimpParasite GimpParasite;
struct _GimpParasite
{
gchar *name; /* The name of the parasite. USE A UNIQUE PREFIX! */
guint32 flags; /* save Parasite in XCF file, etc. */
guint32 size; /* amount of data */
gpointer data; /* a pointer to the data. plugin is *
* responsible for tracking byte order */
};
GimpParasite * gimp_parasite_new (const gchar *name,
guint32 flags,
guint32 size,

27
libgimp/gimpparasiteF.h
View File

@ -1,27 +0,0 @@
/* LIBGIMP - The GIMP Library
* Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball
*
* gimpparasiteF.h
* Copyright (C) 1998 Jay Cox <jaycox@earthlink.net>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
#ifndef __GIMP_PARASITE_F_H__
#define __GIMP_PARASITE_F_H__
typedef struct _GimpParasite GimpParasite;
#endif /* __GIMP_PARASITE_F_H__ */

44
libgimp/gimpparasiteP.h
View File

@ -1,44 +0,0 @@
/* LIBGIMP - The GIMP Library
* Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball
*
* gimpparasiteP.h
* Copyright (C) 1998 Jay Cox <jaycox@earthlink.net>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
#ifndef __GIMP_PARASITE_P_H__
#define __GIMP_PARASITE_P_H__
#include <glib.h>
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
struct _GimpParasite
{
gchar *name; /* The name of the parasite. USE A UNIQUE PREFIX! */
guint32 flags; /* save Parasite in XCF file, etc. */
guint32 size; /* amount of data */
gpointer data; /* a pointer to the data. plugin is *
* responsible for tracking byte order */
};
#ifdef __cplusplus
}
#endif /* __cplusplus */
#endif /* __GIMP_PARASITE_P_H__ */

2
libgimp/gimpparasiteio.c
View File

@ -33,7 +33,7 @@
#include <glib.h>
#include "parasiteio.h"
#include "gimpparasiteio.h"
void

5
libgimp/gimpprotocol.c
View File

@ -18,11 +18,12 @@
*/
#include <stdio.h>
#include <glib.h>
#include "gimpenums.h"
#include "gimpparasite.h"
#include "gimpprotocol.h"
#include "gimpwire.h"
#include "parasite.h"
#include "parasiteP.h"
static void _gp_quit_read (GIOChannel *channel,

26
libgimp/gimpui.h
View File

@ -21,19 +21,19 @@
#include <gtk/gtk.h>
#include "gimpchainbutton.h"
#include "gimpcolorbutton.h"
#include "gimpdialog.h"
#include "gimpexport.h"
#include "gimpfileselection.h"
#include "gimphelpui.h"
#include "gimpmenu.h"
#include "gimppatheditor.h"
#include "gimppixmap.h"
#include "gimpquerybox.h"
#include "gimpsizeentry.h"
#include "gimpunitmenu.h"
#include "gimpwidgets.h"
#include <libgimp/gimpchainbutton.h>
#include <libgimp/gimpcolorbutton.h>
#include <libgimp/gimpdialog.h>
#include <libgimp/gimpexport.h>
#include <libgimp/gimpfileselection.h>
#include <libgimp/gimphelpui.h>
#include <libgimp/gimpmenu.h>
#include <libgimp/gimppatheditor.h>
#include <libgimp/gimppixmap.h>
#include <libgimp/gimpquerybox.h>
#include <libgimp/gimpsizeentry.h>
#include <libgimp/gimpunitmenu.h>
#include <libgimp/gimpwidgets.h>
void gimp_ui_init (gchar *prog_name,
gboolean preview);

6
libgimpbase/gimpparasite.c
View File

@ -19,11 +19,8 @@
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
#include "config.h"
#include "parasiteP.h"
#include "parasite.h"
#include <stdio.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h>
@ -35,6 +32,9 @@
#include <process.h> /* For _getpid() */
#endif
#include "gimpparasite.h"
#ifdef DEBUG
static void
gimp_parasite_print (GimpParasite *parasite)

19
libgimpbase/gimpparasite.h
View File

@ -19,15 +19,9 @@
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
#ifndef __GIMP_PARASITE_H__
#define __GIMP_PARASITE_H__
#include <glib.h>
#include <stdio.h>
#include "libgimp/gimpparasiteF.h"
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
@ -43,6 +37,19 @@ extern "C" {
#define GIMP_PARASITE_GRANDPARENT_PERSISTENT (GIMP_PARASITE_PERSISTENT << 16)
#define GIMP_PARASITE_GRANDPARENT_UNDOABLE (GIMP_PARASITE_UNDOABLE << 16)
typedef struct _GimpParasite GimpParasite;
struct _GimpParasite
{
gchar *name; /* The name of the parasite. USE A UNIQUE PREFIX! */
guint32 flags; /* save Parasite in XCF file, etc. */
guint32 size; /* amount of data */
gpointer data; /* a pointer to the data. plugin is *
* responsible for tracking byte order */
};
GimpParasite * gimp_parasite_new (const gchar *name,
guint32 flags,
guint32 size,

2
libgimpbase/gimpparasiteio.c
View File

@ -33,7 +33,7 @@
#include <glib.h>
#include "parasiteio.h"
#include "gimpparasiteio.h"
void

5
libgimpbase/gimpprotocol.c
View File

@ -18,11 +18,12 @@
*/
#include <stdio.h>
#include <glib.h>
#include "gimpenums.h"
#include "gimpparasite.h"
#include "gimpprotocol.h"
#include "gimpwire.h"
#include "parasite.h"
#include "parasiteP.h"
static void _gp_quit_read (GIOChannel *channel,

2
libgimpwidgets/gimpcolorselect.c
View File

@ -31,7 +31,7 @@
#include "session.h"
#include "color_area.h" /* for color_area_draw_rect */
#include "libgimp/color_selector.h"
#include "libgimp/gimpcolorselector.h"
#include "libgimp/gimpintl.h"

18
modules/Makefile.am
View File

@ -6,23 +6,23 @@ CPPFLAGS = \
-DMODULE_COMPILATION
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/intl \
$(GTK_CFLAGS) \
-I$(top_srcdir) \
-I$(top_srcdir)/intl \
$(GTK_CFLAGS) \
-I$(includedir)
EXTRA_DIST = \
makefile.cygwin \
makefile.msc \
module.def \
modregister.c \
modregister.h
gimpmodregister.c \
gimpmodregister.h
libexec_LTLIBRARIES = \
libcolorsel_gtk.la \
libcolorsel_triangle.la \
libcolorsel_water.la \
libcdisplay_gamma.la \
libcolorsel_gtk.la \
libcolorsel_triangle.la \
libcolorsel_water.la \
libcdisplay_gamma.la \
libcdisplay_highcontrast.la
libcolorsel_gtk_la_SOURCES = colorsel_gtk.c

14
modules/cdisplay_gamma.c
View File

@ -21,15 +21,15 @@
#include <gtk/gtk.h>
#include <libgimp/color_display.h>
#include <libgimp/gimpmodule.h>
#include <libgimp/parasite.h>
#include <libgimp/gimpmath.h>
#include <libgimp/gimpui.h>
#include "app/dialog_handler.h"
#include "modregister.h"
#include "gimpmodregister.h"
#include <libgimp/gimpcolordisplay.h>
#include <libgimp/gimpmodule.h>
#include <libgimp/gimpparasite.h>
#include <libgimp/gimpmath.h>
#include <libgimp/gimpui.h>
#include "libgimp/gimpintl.h"

14
modules/cdisplay_highcontrast.c
View File

@ -21,15 +21,15 @@
#include <gtk/gtk.h>
#include <libgimp/color_display.h>
#include <libgimp/gimpmodule.h>
#include <libgimp/parasite.h>
#include <libgimp/gimpui.h>
#include <libgimp/gimpmath.h>
#include "app/dialog_handler.h"
#include "modregister.h"
#include "gimpmodregister.h"
#include <libgimp/gimpcolordisplay.h>
#include <libgimp/gimpmodule.h>
#include <libgimp/gimpparasite.h>
#include <libgimp/gimpui.h>
#include <libgimp/gimpmath.h>
#include "libgimp/gimpintl.h"

13
modules/colorsel_gtk.c
View File

@ -20,11 +20,16 @@
#include "config.h"
#include <stdio.h>
#include <gtk/gtk.h>
#include <libgimp/color_selector.h>
#include <libgimp/gimpintl.h>
#include <libgimp/gimpmodule.h>
#include "modregister.h"
#include "gimpmodregister.h"
#include "libgimp/gimpcolorselector.h"
#include "libgimp/gimpmodule.h"
#include "libgimp/gimpintl.h"
/* prototypes */
static GtkWidget * colorsel_gtk_new (int, int, int,

7
modules/colorsel_triangle.c
View File

@ -27,13 +27,14 @@
#include <gtk/gtk.h>
#include <gdk/gdk.h>
#include <libgimp/color_selector.h>
#include "gimpmodregister.h"
#include <libgimp/gimpcolorselector.h>
#include <libgimp/gimpmodule.h>
#include <libgimp/gimpmath.h>
#include "modregister.h"
#include "libgimp/gimpintl.h"
#include <libgimp/gimpintl.h>
/* prototypes */
static GtkWidget * colorsel_triangle_new (int, int, int,

4
modules/colorsel_water.c
View File

@ -25,11 +25,11 @@
#include <gtk/gtk.h>
#include <libgimp/color_selector.h>
#include <libgimp/gimpcolorselector.h>
#include <libgimp/gimpmodule.h>
#include <libgimp/gimpmath.h>
#include "modregister.h"
#include "gimpmodregister.h"
#include <libgimp/gimpintl.h>

Some files were not shown because too many files have changed in this diff Show More