procyberian/gimp
2
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gimp.git synced 2025-07-03 09:23:24 +00:00
Code Issues 1 Projects 1 Releases Packages Wiki Activity Actions

app/Makefile.am removed.

Browse source 
2001-05-10  Michael Natterer  <mitch@gimp.org>

	* app/Makefile.am
	* app/asupsample.[ch]: removed.

	* app/core/Makefile.am
	* app/core/core-types.h
	* app/tools/Makefile.am
	* app/tools/tools-types.h: new files.

	* app/tools/gimptoolinfo.[ch]: removed.
	* app/core/gimptoolinfo.[ch]: added here.

	* libgimp/Makefile.am
	* libgimp/gimp.h
	* libgimp/gimpadaptivesupersample.[ch]
	* libgimp/gimpbilinear.[ch]: removed here...

	* libgimpcolor/Makefile.am
	* libgimpcolor/gimpcolortypes.h
	* libgimpcolor/gimpadaptivesupersample.[ch]
	* libgimpcolor/gimpbilinear.[ch]: ..and added here.

	* tools/pdbgen/app.pl
	* tools/pdbgen/pdb/paths.pdb

	* app/*.c: changed tons of #include's
This commit is contained in:
Michael Natterer 2001-05-09 22:34:59 +00:00 • committed by Michael Natterer
parent c69de20f03
commit d1022c34b6
354 changed files with 953 additions and 2258 deletions
Download patch file Download diff file Expand all files Collapse all files

28
ChangeLog
View file

@ -1,3 +1,31 @@
2001-05-10 Michael Natterer <mitch@gimp.org>
* app/Makefile.am
* app/asupsample.[ch]: removed.
* app/core/Makefile.am
* app/core/core-types.h
* app/tools/Makefile.am
* app/tools/tools-types.h: new files.
* app/tools/gimptoolinfo.[ch]: removed.
* app/core/gimptoolinfo.[ch]: added here.
* libgimp/Makefile.am
* libgimp/gimp.h
* libgimp/gimpadaptivesupersample.[ch]
* libgimp/gimpbilinear.[ch]: removed here...
* libgimpcolor/Makefile.am
* libgimpcolor/gimpcolortypes.h
* libgimpcolor/gimpadaptivesupersample.[ch]
* libgimpcolor/gimpbilinear.[ch]: ..and added here.
* tools/pdbgen/app.pl
* tools/pdbgen/pdb/paths.pdb
* app/*.c: changed tons of #include's
2001-05-09 Michael Natterer <mitch@gimp.org>
* configure.in

130
app/Makefile.am
View file

@ -93,86 +93,38 @@ gimp_SOURCES = \
user_install.c \
user_install.h \
##
## stuff that needs to be sorted into yet undecided subsystems, split up,
## removed or otherwise tortured
## stuff for core/
##
datafiles.c \
datafiles.h \
floating_sel.c \
floating_sel.h \
fsdither.h \
gimppreviewcache.h \
gimppreviewcache.c \
parasitelist.c \
parasitelist.h \
scan_convert.c \
scan_convert.h \
##
## lowlevel stuff for base/
##
app_procs.c \
app_procs.h \
appenums.h \
appenv.h \
apptypes.h \
asupsample.c \
asupsample.h \
authors.h \
batch.c \
batch.h \
boundary.c \
boundary.h \
brush_scale.c \
brush_scale.h \
color_transfer.c \
color_transfer.h \
context_manager.c \
context_manager.h \
datafiles.c \
datafiles.h \
drawable.c \
drawable.h \
errors.c \
errors.h \
file-open.c \
file-open.h \
file-save.c \
file-save.h \
file-utils.h \
file-utils.c \
floating_sel.c \
floating_sel.h \
fsdither.h \
general.c \
general.h \
gimage.c \
gimage.h \
gimphelp.c \
gimphelp.h \
gimphistogram.c \
gimphistogram.h \
gimplut.c \
gimplut.h \
gimpparasite.c \
gimpparasite.h \
gimppreviewcache.h \
gimppreviewcache.c \
gimprc.c \
gimprc.h \
gimpunit.c \
image_new.c \
image_new.h \
libgimp_glue.c \
libgimp_glue.h \
lut_funcs.c \
lut_funcs.h \
main.c \
parasitelist.c \
parasitelist.h \
path.c \
path.h \
pathP.h \
path_transform.h \
path_curves.h \
path_curves.c \
path_bezier.h \
path_bezier.c \
pixel_processor.c \
pixel_processor.h \
pixel_region.c \
pixel_region.h \
pixel_surround.c \
pixel_surround.h \
plug_in.c \
plug_in.h \
scan_convert.c \
scan_convert.h \
temp_buf.c \
temp_buf.h \
tile.c \
@ -185,6 +137,58 @@ gimp_SOURCES = \
tile_manager_pvt.h \
tile_swap.c \
tile_swap.h \
##
## stuff that needs to be sorted into yet undecided subsystems, split up,
## removed or otherwise tortured
##
app_procs.c \
app_procs.h \
appenums.h \
appenv.h \
apptypes.h \
authors.h \
batch.c \
batch.h \
color_transfer.c \
color_transfer.h \
context_manager.c \
context_manager.h \
drawable.c \
drawable.h \
errors.c \
errors.h \
file-open.c \
file-open.h \
file-save.c \
file-save.h \
file-utils.h \
file-utils.c \
general.c \
general.h \
gimage.c \
gimage.h \
gimphelp.c \
gimphelp.h \
gimpparasite.c \
gimpparasite.h \
gimprc.c \
gimprc.h \
gimpunit.c \
image_new.c \
image_new.h \
libgimp_glue.c \
libgimp_glue.h \
main.c \
path.c \
path.h \
pathP.h \
path_transform.h \
path_curves.h \
path_curves.c \
path_bezier.h \
path_bezier.c \
plug_in.c \
plug_in.h \
undo.c \
undo.h \
undo_types.h \

2
app/actions/channels-commands.c
View file

@ -23,7 +23,7 @@
#include "libgimpcolor/gimpcolor.h"
#include "libgimpwidgets/gimpwidgets.h"
#include "apptypes.h"
#include "core/core-types.h"
#include "core/gimpchannel.h"
#include "core/gimpimage.h"

5
app/actions/help-commands.c
View file

@ -27,7 +27,8 @@
#include "libgimpmath/gimpmath.h"
#include "libgimpwidgets/gimpwidgets.h"
#include "apptypes.h"
#include "core/core-types.h"
#include "tools/tools-types.h"
#include "core/gimpcontext.h"
#include "core/gimpdrawable.h"
@ -36,9 +37,9 @@
#include "core/gimpimage.h"
#include "core/gimpimage-duplicate.h"
#include "core/gimpimage-mask.h"
#include "core/gimptoolinfo.h"
#include "tools/gimptool.h"
#include "tools/gimptoolinfo.h"
#include "tools/tool_manager.h"
#include "commands.h"

2
app/actions/layers-commands.c
View file

@ -26,7 +26,7 @@
#include "libgimpwidgets/gimpwidgets.h"
#include "libgimp/gimplimits.h"
#include "apptypes.h"
#include "core/core-types.h"
#include "paint-funcs/paint-funcs.h"

10
app/actions/plug-in-commands.c
View file

@ -79,7 +79,7 @@
#include "libgimp/gimpenv.h"
#include "apptypes.h"
#include "core/core-types.h"
#include "libgimp/gimpparasite.h"
#include "libgimp/gimpprotocol.h"
@ -319,8 +319,8 @@ plug_in_init (void)
plug_in_init_shm ();
/* search for binaries in the plug-in directory path */
datafiles_read_directories (plug_in_path, MODE_EXECUTABLE,
plug_in_init_file, NULL);
gimp_datafiles_read_directories (plug_in_path, MODE_EXECUTABLE,
plug_in_init_file, NULL);
/* read the pluginrc file for cached data */
filename = NULL;
@ -2370,8 +2370,8 @@ plug_in_init_file (const gchar *filename,
plug_in_def = NULL;
}
plug_in_def = plug_in_def_new (filename);
plug_in_def->mtime = datafile_mtime ();
plug_in_def = plug_in_def_new (filename);
plug_in_def->mtime = gimp_datafile_mtime ();
plug_in_def->query = TRUE;
plug_in_defs = g_slist_append (plug_in_defs, plug_in_def);

2
app/actions/qmask-commands.c
View file

@ -27,7 +27,7 @@
#include "libgimpcolor/gimpcolor.h"
#include "libgimpwidgets/gimpwidgets.h"
#include "apptypes.h"
#include "core/core-types.h"
#include "core/gimpchannel.h"
#include "core/gimpcontext.h"

2
app/actions/quick-mask-commands.c
View file

@ -27,7 +27,7 @@
#include "libgimpcolor/gimpcolor.h"
#include "libgimpwidgets/gimpwidgets.h"
#include "apptypes.h"
#include "core/core-types.h"
#include "core/gimpchannel.h"
#include "core/gimpcontext.h"

2
app/app_procs.c
View file

@ -44,7 +44,7 @@
#include "libgimp/gimpfeatures.h"
#include "libgimp/gimpenv.h"
#include "apptypes.h"
#include "core/core-types.h"
#include "paint-funcs/paint-funcs.h"

72
app/apptypes.h
View file

@ -30,67 +30,6 @@
#include "appenums.h"
/* base objects */
typedef struct _GimpObject GimpObject;
typedef struct _GimpContainer GimpContainer;
typedef struct _GimpList GimpList;
typedef struct _GimpDataList GimpDataList;
typedef struct _GimpDataFactory GimpDataFactory;
typedef struct _GimpContext GimpContext;
typedef struct _GimpViewable GimpViewable;
/* drawable objects */
typedef struct _GimpDrawable GimpDrawable;
typedef struct _GimpChannel GimpChannel;
typedef struct _GimpLayer GimpLayer;
typedef struct _GimpLayerMask GimpLayerMask;
typedef struct _GimpImage GimpImage;
/* data objects */
typedef struct _GimpData GimpData;
typedef struct _GimpBrush GimpBrush;
typedef struct _GimpBrushGenerated GimpBrushGenerated;
typedef struct _GimpBrushPipe GimpBrushPipe;
typedef struct _GimpGradient GimpGradient;
typedef struct _GimpPattern GimpPattern;
typedef struct _GimpPalette GimpPalette;
/* tools */
typedef struct _GimpToolInfo GimpToolInfo;
typedef struct _GimpTool GimpTool;
typedef struct _GimpPaintTool GimpPaintTool;
typedef struct _GimpDrawTool GimpDrawTool;
typedef struct _GimpPathTool GimpPathTool;
typedef struct _GimpTransformTool GimpTransformTool;
typedef struct _GimpBezierSelectPoint GimpBezierSelectPoint;
typedef struct _GimpBezierSelectTool GimpBezierSelectTool;
/* undo objects */
typedef struct _GimpUndo GimpUndo;
typedef struct _GimpUndoStack GimpUndoStack;
/* other stuff */
typedef struct _Argument Argument;
@ -152,8 +91,6 @@ typedef struct _ScanConvertPoint ScanConvertPoint;
typedef struct _Selection Selection;
typedef struct _SelectionOptions SelectionOptions;
/* some undo stuff */
@ -173,18 +110,9 @@ typedef void (* TileValidateProc) (TileManager *tm,
typedef void (* ToolOptionsResetFunc) (ToolOptions *tool_options);
typedef void (* GimpProgressFunc) (gint min,
gint max,
gint current,
gpointer data);
typedef void (* ImageMapApplyFunc) (PixelRegion *srcPR,
PixelRegion *destPR,
gpointer data);
typedef void (* GimpDataFileLoaderFunc) (const gchar *filename,
gpointer loader_data);
typedef GimpData * (* GimpDataObjectLoaderFunc) (const gchar *filename);
#endif /* __APPTYPES_H__ */

377
app/asupsample.c
View file

@ -1,377 +0,0 @@
/* The GIMP -- an image manipulation program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* General, non-jittered adaptive supersampling library
* Copyright (C) 1997 Federico Mena Quintero
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program 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 General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
*/
/* This code is *largely* based on the sources for POV-Ray 3.0. I am
* grateful to the POV-Team for such a great program and for making
* their sources available. All comments / bug reports /
* etc. regarding this library should be addressed to me, not to the
* POV-Ray team. Any bugs are my responsibility, not theirs.
*/
#include "config.h"
#include <stdlib.h>
#include <gtk/gtk.h>
#include "libgimpcolor/gimpcolor.h"
#include "libgimpmath/gimpmath.h"
#include "apptypes.h"
#include "appenv.h"
#include "asupsample.h"
#include "gimpprogress.h"
typedef struct
{
gchar ready;
GimpRGB color;
} GimpSampleType;
/***** Local functions *****/
static gulong gimp_render_sub_pixel (gint max_depth,
gint depth,
GimpSampleType **block,
gint x,
gint y,
gint x1,
gint y1,
gint x3,
gint y3,
gdouble threshold,
gint sub_pixel_size,
GimpRGB *color,
GimpRenderFunc render_func,
gpointer render_data);
/***** Functions *****/
gulong
gimp_adaptive_supersample_area (gint x1,
gint y1,
gint x2,
gint y2,
gint max_depth,
gdouble threshold,
GimpRenderFunc render_func,
gpointer render_data,
GimpPutPixelFunc put_pixel_func,
gpointer put_pixel_data,
GimpProgressFunc progress_func,
gpointer progress_data)
{
gint x, y, width; /* Counters, width of region */
gint xt, xtt, yt; /* Temporary counters */
gint sub_pixel_size; /* Numbe of samples per pixel (1D) */
GimpRGB color; /* Rendered pixel's color */
GimpSampleType tmp_sample; /* For swapping samples */
GimpSampleType *top_row, *bot_row, *tmp_row; /* Sample rows */
GimpSampleType **block; /* Sample block matrix */
gulong num_samples;
/* Initialize color */
gimp_rgba_set (&color, 0.0, 0.0, 0.0, 0.0);
/* Calculate sub-pixel size */
sub_pixel_size = 1 << max_depth;
/* Create row arrays */
width = x2 - x1 + 1;
top_row = g_new (GimpSampleType, sub_pixel_size * width + 1);
bot_row = g_new (GimpSampleType, sub_pixel_size * width + 1);
for (x = 0; x < (sub_pixel_size * width + 1); x++)
{
top_row[x].ready = FALSE;
gimp_rgba_set (&top_row[x].color, 0.0, 0.0, 0.0, 0.0);
bot_row[x].ready = FALSE;
gimp_rgba_set (&bot_row[x].color, 0.0, 0.0, 0.0, 0.0);
}
/* Allocate block matrix */
block = g_new (GimpSampleType *, sub_pixel_size + 1); /* Rows */
for (y = 0; y < (sub_pixel_size + 1); y++)
{
block[y] = g_new (GimpSampleType, sub_pixel_size + 1); /* Columns */
for (x = 0; x < (sub_pixel_size + 1); x++)
{
block[y][x].ready = FALSE;
gimp_rgba_set (&block[y][x].color, 0.0, 0.0, 0.0, 0.0);
}
}
/* Render region */
num_samples = 0;
for (y = y1; y <= y2; y++)
{
/* Clear the bottom row */
for (xt = 0; xt < (sub_pixel_size * width + 1); xt++)
bot_row[xt].ready = FALSE;
/* Clear first column */
for (yt = 0; yt < (sub_pixel_size + 1); yt++)
block[yt][0].ready = 0;
/* Render row */
for (x = x1; x <= x2; x++)
{
/* Initialize block by clearing all but first row/column */
for (yt = 1; yt < (sub_pixel_size + 1); yt++)
for (xt = 1; xt < (sub_pixel_size + 1); xt++)
block[yt][xt].ready = FALSE;
/* Copy samples from top row to block */
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) */
num_samples += gimp_render_sub_pixel (max_depth, 1, block, x, y, 0, 0,
sub_pixel_size, sub_pixel_size,
threshold, sub_pixel_size,
&color,
render_func, render_data);
if (put_pixel_func)
(* put_pixel_func) (x, y, &color, put_pixel_data);
/* Copy block information to rows */
top_row[((x - x1) + 1) * sub_pixel_size] = block[0][sub_pixel_size];
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 */
for (yt = 0; yt < (sub_pixel_size + 1); yt++)
{
tmp_sample = block[yt][0];
block[yt][0] = block[yt][sub_pixel_size];
block[yt][sub_pixel_size] = tmp_sample;
}
}
/* Swap rows */
tmp_row = top_row;
top_row = bot_row;
bot_row = tmp_row;
/* Call progress display function */
if (progress_func && !(y & 0xf))
(* progress_func) (y1, y2, y, progress_data);
}
/* Free memory */
for (y = 0; y < (sub_pixel_size + 1); y++)
g_free (block[y]);
g_free (block);
g_free (top_row);
g_free (bot_row);
return num_samples;
}
static gulong
gimp_render_sub_pixel (gint max_depth,
gint depth,
GimpSampleType **block,
gint x,
gint y,
gint x1,
gint y1,
gint x3,
gint y3,
gdouble threshold,
gint sub_pixel_size,
GimpRGB *color,
GimpRenderFunc render_func,
gpointer render_data)
{
gint x2, y2; /* Coords of center sample */
gdouble dx1, dy1; /* Delta to upper left sample */
gdouble dx3, dy3; /* Delta to lower right sample */
GimpRGB c1, c2, c3, c4; /* Sample colors */
gulong num_samples;
/* Get offsets for corners */
dx1 = (gdouble) (x1 - sub_pixel_size / 2) / sub_pixel_size;
dx3 = (gdouble) (x3 - sub_pixel_size / 2) / sub_pixel_size;
dy1 = (gdouble) (y1 - sub_pixel_size / 2) / sub_pixel_size;
dy3 = (gdouble) (y3 - sub_pixel_size / 2) / sub_pixel_size;
num_samples = 0;
/* Render upper left sample */
if (!block[y1][x1].ready)
{
num_samples++;
if (render_func)
(* render_func) (x + dx1, y + dy1, &c1, render_data);
block[y1][x1].ready = TRUE;
block[y1][x1].color = c1;
}
else
{
c1 = block[y1][x1].color;
}
/* Render upper right sample */
if (! block[y1][x3].ready)
{
num_samples++;
if (render_func)
(* render_func) (x + dx3, y + dy1, &c2, render_data);
block[y1][x3].ready = TRUE;
block[y1][x3].color = c2;
}
else
{
c2 = block[y1][x3].color;
}
/* Render lower left sample */
if (! block[y3][x1].ready)
{
num_samples++;
if (render_func)
(* render_func) (x + dx1, y + dy3, &c3, render_data);
block[y3][x1].ready = TRUE;
block[y3][x1].color = c3;
}
else
{
c3 = block[y3][x1].color;
}
/* Render lower right sample */
if (! block[y3][x3].ready)
{
num_samples++;
if (render_func)
(* render_func) (x + dx3, y + dy3, &c4, render_data);
block[y3][x3].ready = TRUE;
block[y3][x3].color = c4;
}
else
{
c4 = block[y3][x3].color;
}
/* Check for supersampling */
if (depth <= max_depth)
{
/* Check whether we have tu supersample */
if ((gimp_rgba_distance (&c1, &c2) >= threshold) ||
(gimp_rgba_distance (&c1, &c3) >= threshold) ||
(gimp_rgba_distance (&c1, &c4) >= threshold) ||
(gimp_rgba_distance (&c2, &c3) >= threshold) ||
(gimp_rgba_distance (&c2, &c4) >= threshold) ||
(gimp_rgba_distance (&c3, &c4) >= threshold))
{
/* Calc coordinates of center subsample */
x2 = (x1 + x3) / 2;
y2 = (y1 + y3) / 2;
/* Render sub-blocks */
num_samples += gimp_render_sub_pixel (max_depth, depth + 1, block,
x, y, x1, y1, x2, y2,
threshold, sub_pixel_size,
&c1,
render_func, render_data);
num_samples += gimp_render_sub_pixel (max_depth, depth + 1, block,
x, y, x2, y1, x3, y2,
threshold, sub_pixel_size,
&c2,
render_func, render_data);
num_samples += gimp_render_sub_pixel (max_depth, depth + 1, block,
x, y, x1, y2, x2, y3,
threshold, sub_pixel_size,
&c3,
render_func, render_data);
num_samples += gimp_render_sub_pixel (max_depth, depth + 1, block,
x, y, x2, y2, x3, y3,
threshold, sub_pixel_size,
&c4,
render_func, render_data);
}
}
color->r = 0.25 * (c1.r + c2.r + c3.r + c4.r);
color->g = 0.25 * (c1.g + c2.g + c3.g + c4.g);
color->b = 0.25 * (c1.b + c2.b + c3.b + c4.b);
color->a = 0.25 * (c1.a + c2.a + c3.a + c4.a);
return num_samples;
}

51
app/asupsample.h
View file

@ -1,51 +0,0 @@
/* The GIMP -- an image manipulation program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* General, non-jittered adaptive supersampling library
* Copyright (C) 1997 Federico Mena Quintero
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program 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 General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
*/
#ifndef __ASUPSAMPLE_H__
#define __ASUPSAMPLE_H__
typedef void (* GimpRenderFunc) (gdouble x,
gdouble y,
GimpRGB *color,
gpointer data);
typedef void (* GimpPutPixelFunc) (gint x,
gint y,
GimpRGB *color,
gpointer data);
gulong gimp_adaptive_supersample_area (gint x1,
gint y1,
gint x2,
gint y2,
gint max_depth,
gdouble threshold,
GimpRenderFunc render_func,
gpointer render_data,
GimpPutPixelFunc put_pixel_func,
gpointer put_pixel_data,
GimpProgressFunc progress_func,
gpointer progress_data);
#endif /* __ASUPSAMPLE_H__ */

2
app/base/gimphistogram.c
View file

@ -29,7 +29,7 @@
#include "libgimpmath/gimpmath.h"
#include "libgimpwidgets/gimpwidgets.h"
#include "apptypes.h"
#include "core/core-types.h"
#include "core/gimpdrawable.h"
#include "core/gimpimage.h"

2
app/base/lut-funcs.c
View file

@ -24,7 +24,7 @@
#include "libgimpmath/gimpmath.h"
#include "apptypes.h"
#include "core/core-types.h"
#include "gimplut.h"
#include "gimphistogram.h"

2
app/base/pixel-surround.c
View file

@ -20,7 +20,7 @@
#include <gtk/gtk.h>
#include "apptypes.h"
#include "core/core-types.h"
#include "core/gimpimage.h"

2
app/base/temp-buf.c
View file

@ -36,7 +36,7 @@
#include "libgimpcolor/gimpcolor.h"
#include "apptypes.h"
#include "core/core-types.h"
#include "paint-funcs/paint-funcs.h"

4
app/context_manager.c
View file

@ -20,7 +20,7 @@
#include <gtk/gtk.h>
#include "apptypes.h"
#include "core/core-types.h"
#include "core/gimpbrush.h"
#include "core/gimpbrushgenerated.h"
@ -32,9 +32,9 @@
#include "core/gimpimage.h"
#include "core/gimppalette.h"
#include "core/gimppattern.h"
#include "core/gimptoolinfo.h"
#include "tools/gimptool.h"
#include "tools/gimptoolinfo.h"
#include "tools/paint_options.h"
#include "tools/tool_manager.h"

3
app/core/Makefile.am
View file

@ -3,6 +3,7 @@
noinst_LTLIBRARIES = libappcore.la
libappcore_la_SOURCES = \
core-types.h \
gimpbrush.c \
gimpbrush.h \
gimpbrush-header.h \
@ -63,6 +64,8 @@ libappcore_la_SOURCES = \
gimppalette.h \
gimppalette-import.c \
gimppalette-import.h \
gimptoolinfo.c \
gimptoolinfo.h \
gimpundo.c \
gimpundo.h \
gimpundostack.c \

83
app/core/core-types.h Normal file
View file

@ -0,0 +1,83 @@
/* The GIMP -- an image manipulation program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program 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 General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef __CORE_TYPES_H__
#define __CORE_TYPES_H__
#include "apptypes.h"
/* base objects */
typedef struct _GimpObject GimpObject;
typedef struct _GimpContainer GimpContainer;
typedef struct _GimpList GimpList;
typedef struct _GimpDataList GimpDataList;
typedef struct _GimpDataFactory GimpDataFactory;
typedef struct _GimpContext GimpContext;
typedef struct _GimpViewable GimpViewable;
typedef struct _GimpToolInfo GimpToolInfo;
/* drawable objects */
typedef struct _GimpDrawable GimpDrawable;
typedef struct _GimpChannel GimpChannel;
typedef struct _GimpLayer GimpLayer;
typedef struct _GimpLayerMask GimpLayerMask;
typedef struct _GimpImage GimpImage;
/* data objects */
typedef struct _GimpData GimpData;
typedef struct _GimpBrush GimpBrush;
typedef struct _GimpBrushGenerated GimpBrushGenerated;
typedef struct _GimpBrushPipe GimpBrushPipe;
typedef struct _GimpGradient GimpGradient;
typedef struct _GimpPattern GimpPattern;
typedef struct _GimpPalette GimpPalette;
/* undo objects */
typedef struct _GimpUndo GimpUndo;
typedef struct _GimpUndoStack GimpUndoStack;
/* functions */
typedef void (* GimpDataFileLoaderFunc) (const gchar *filename,
gpointer loader_data);
typedef GimpData * (* GimpDataObjectLoaderFunc) (const gchar *filename);
#endif /* __CORE_TYPES_H__ */

3
app/core/gimp-edit.c
View file

@ -24,7 +24,8 @@
#include "libgimpwidgets/gimpwidgets.h"
#include "apptypes.h"
#include "core/core-types.h"
#include "tools/tools-types.h"
#include "paint-funcs/paint-funcs.h"

2
app/core/gimp-parasites.c
View file

@ -24,7 +24,7 @@
#include <unistd.h>
#endif
#include "apptypes.h"
#include "core/core-types.h"
#include "app_procs.h"
#include "parasitelist.h"

4
app/core/gimp-transform-region.c
View file

@ -25,7 +25,7 @@
#include "libgimpmath/gimpmath.h"
#include "libgimpwidgets/gimpwidgets.h"
#include "apptypes.h"
#include "tools-types.h"
#include "paint-funcs/paint-funcs.h"
@ -36,6 +36,7 @@
#include "core/gimpimage-mask.h"
#include "core/gimplayer.h"
#include "core/gimpmarshal.h"
#include "core/gimptoolinfo.h"
#include "gui/info-dialog.h"
#include "cursorutil.h"
@ -52,7 +53,6 @@
#include "tile_manager.h"
#include "tile.h"
#include "gimptoolinfo.h"
#include "tool_manager.h"
#include "tool_options.h"
#include "transform_options.h"

2
app/core/gimpbrush-load.c
View file

@ -41,7 +41,7 @@
#include <stdio.h>
#include "apptypes.h"
#include "core-types.h"
#include "brush_scale.h"
#include "gimpbrush.h"

2
app/core/gimpbrush.c
View file

@ -41,7 +41,7 @@
#include <stdio.h>
#include "apptypes.h"
#include "core-types.h"
#include "brush_scale.h"
#include "gimpbrush.h"

3
app/core/gimpbrush.h
View file

@ -22,6 +22,9 @@
#include "gimpdata.h"
/* FIXME: remove the GimpPaintTool dependency */
#include "tools/tools-types.h"
#define GIMP_BRUSH_FILE_EXTENSION ".gbr"
#define GIMP_BRUSH_PIXMAP_FILE_EXTENSION ".gpb"

8
app/core/gimpbrushgenerated-load.c
View file

@ -32,9 +32,8 @@
#include "libgimpmath/gimpmath.h"
#include "apptypes.h"
#include "core-types.h"
#include "appenv.h"
#include "gimpbrushgenerated.h"
#include "gimprc.h"
#include "gimpbrush.h"
@ -48,8 +47,9 @@
/* local function prototypes */
static void gimp_brush_generated_class_init (GimpBrushGeneratedClass *klass);
static void gimp_brush_generated_init (GimpBrushGenerated *brush);
static void gimp_brush_generated_class_init (GimpBrushGeneratedClass *klass);
static void gimp_brush_generated_init (GimpBrushGenerated *brush);
static void gimp_brush_generated_destroy (GtkObject *object);
static gboolean gimp_brush_generated_save (GimpData *data);
static void gimp_brush_generated_dirty (GimpData *data);

8
app/core/gimpbrushgenerated-save.c
View file

@ -32,9 +32,8 @@
#include "libgimpmath/gimpmath.h"
#include "apptypes.h"
#include "core-types.h"
#include "appenv.h"
#include "gimpbrushgenerated.h"
#include "gimprc.h"
#include "gimpbrush.h"
@ -48,8 +47,9 @@
/* local function prototypes */
static void gimp_brush_generated_class_init (GimpBrushGeneratedClass *klass);
static void gimp_brush_generated_init (GimpBrushGenerated *brush);
static void gimp_brush_generated_class_init (GimpBrushGeneratedClass *klass);
static void gimp_brush_generated_init (GimpBrushGenerated *brush);
static void gimp_brush_generated_destroy (GtkObject *object);
static gboolean gimp_brush_generated_save (GimpData *data);
static void gimp_brush_generated_dirty (GimpData *data);

8
app/core/gimpbrushgenerated.c
View file

@ -32,9 +32,8 @@
#include "libgimpmath/gimpmath.h"
#include "apptypes.h"
#include "core-types.h"
#include "appenv.h"
#include "gimpbrushgenerated.h"
#include "gimprc.h"
#include "gimpbrush.h"
@ -48,8 +47,9 @@
/* local function prototypes */
static void gimp_brush_generated_class_init (GimpBrushGeneratedClass *klass);
static void gimp_brush_generated_init (GimpBrushGenerated *brush);
static void gimp_brush_generated_class_init (GimpBrushGeneratedClass *klass);
static void gimp_brush_generated_init (GimpBrushGenerated *brush);
static void gimp_brush_generated_destroy (GtkObject *object);
static gboolean gimp_brush_generated_save (GimpData *data);
static void gimp_brush_generated_dirty (GimpData *data);

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

@ -43,9 +43,8 @@
#include "libgimpmath/gimpmath.h"
#include "apptypes.h"
#include "core-types.h"
#include "appenv.h"
#include "gimpbrush.h"
#include "gimpbrush-header.h"
#include "gimpbrushpipe.h"

3
app/core/gimpbrushpipe.c
View file

@ -43,9 +43,8 @@
#include "libgimpmath/gimpmath.h"
#include "apptypes.h"
#include "core-types.h"
#include "appenv.h"
#include "gimpbrush.h"
#include "gimpbrush-header.h"
#include "gimpbrushpipe.h"

2
app/core/gimpchannel-combine.c
View file

@ -26,7 +26,7 @@
#include "libgimpcolor/gimpcolor.h"
#include "libgimpmath/gimpmath.h"
#include "apptypes.h"
#include "core-types.h"
#include "paint-funcs/paint-funcs.h"

2
app/core/gimpchannel.c
View file

@ -26,7 +26,7 @@
#include "libgimpcolor/gimpcolor.h"
#include "libgimpmath/gimpmath.h"
#include "apptypes.h"
#include "core-types.h"
#include "paint-funcs/paint-funcs.h"

2
app/core/gimpcontainer.c
View file

@ -23,7 +23,7 @@
#include <gtk/gtk.h>
#include "apptypes.h"
#include "core-types.h"
#include "gimpcontainer.h"
#include "gimpmarshal.h"

12
app/core/gimpcontext.c
View file

@ -25,13 +25,13 @@
#include "libgimpcolor/gimpcolor.h"
#include "apptypes.h"
#include "core-types.h"
/* FIXME: make a GimpToolFactory out of the tool_manager and put it here */
#include "tools/tools-types.h"
#include "tools/gimptoolinfo.h"
#include "tools/tool_manager.h"
#include "context_manager.h"
#include "gdisplay.h"
#include "gimpbrush.h"
#include "gimpcontainer.h"
#include "gimpcontext.h"
@ -41,6 +41,10 @@
#include "gimpmarshal.h"
#include "gimppalette.h"
#include "gimppattern.h"
#include "gimptoolinfo.h"
#include "context_manager.h"
#include "gdisplay.h"
#include "gimprc.h"
#include "temp_buf.h"

6
app/core/gimpdata.c
View file

@ -31,13 +31,13 @@
#include <gtk/gtk.h>
#include "apptypes.h"
#include "libgimp/gimpenv.h"
#include "core-types.h"
#include "gimpdata.h"
#include "gimpmarshal.h"
#include "libgimp/gimpenv.h"
enum
{

12
app/core/gimpdatafactory.c
View file

@ -25,7 +25,7 @@
#include "libgimpwidgets/gimpwidgets.h"
#include "apptypes.h"
#include "core-types.h"
#include "datafiles.h"
#include "gimpdata.h"
@ -157,9 +157,9 @@ gimp_data_factory_data_init (GimpDataFactory *factory,
if (factory->data_path && *factory->data_path)
{
datafiles_read_directories (*factory->data_path, 0,
gimp_data_factory_data_load_callback,
factory);
gimp_datafiles_read_directories (*factory->data_path, 0,
gimp_data_factory_data_load_callback,
factory);
}
gimp_container_thaw (factory->container);
@ -275,8 +275,8 @@ gimp_data_factory_data_load_callback (const gchar *filename,
{
if (factory->loader_entries[i].extension)
{
if (datafiles_check_extension (filename,
factory->loader_entries[i].extension))
if (gimp_datafiles_check_extension (filename,
factory->loader_entries[i].extension))
{
goto insert;
}

20
app/core/gimpdatafiles.c
View file

@ -45,7 +45,7 @@
#endif
#endif /* G_OS_WIN32 */
#include "apptypes.h"
#include "core/core-types.h"
#include "datafiles.h"
#include "gimprc.h"
@ -102,8 +102,8 @@ is_script (const gchar *filename)
#endif
gboolean
datafiles_check_extension (const gchar *filename,
const gchar *extension)
gimp_datafiles_check_extension (const gchar *filename,
const gchar *extension)
{
gint name_len;
gint ext_len;
@ -121,10 +121,10 @@ datafiles_check_extension (const gchar *filename,
}
void
datafiles_read_directories (const gchar *path_str,
GimpDataFileFlags flags,
GimpDataFileLoaderFunc loader_func,
gpointer loader_data)
gimp_datafiles_read_directories (const gchar *path_str,
GimpDataFileFlags flags,
GimpDataFileLoaderFunc loader_func,
gpointer loader_data)
{
gchar *local_path;
GList *path;
@ -196,7 +196,7 @@ datafiles_read_directories (const gchar *path_str,
}
time_t
datafile_atime (void)
gimp_datafile_atime (void)
{
if (filestat_valid)
return filestat.st_atime;
@ -205,7 +205,7 @@ datafile_atime (void)
}
time_t
datafile_mtime (void)
gimp_datafile_mtime (void)
{
if (filestat_valid)
return filestat.st_mtime;
@ -214,7 +214,7 @@ datafile_mtime (void)
}
time_t
datafile_ctime (void)
gimp_datafile_ctime (void)
{
if (filestat_valid)
return filestat.st_ctime;

24
app/core/gimpdatafiles.h
View file

@ -19,8 +19,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef __DATAFILES_H__
#define __DATAFILES_H__
#ifndef __GIMP_DATAFILES_H__
#define __GIMP_DATAFILES_H__
#include <time.h>
@ -32,22 +32,22 @@ typedef enum
} GimpDataFileFlags;
gboolean datafiles_check_extension (const gchar *filename,
const gchar *extension);
gboolean gimp_datafiles_check_extension (const gchar *filename,
const gchar *extension);
void datafiles_read_directories (const gchar *path_str,
GimpDataFileFlags flags,
GimpDataFileLoaderFunc loader_func,
gpointer loader_data);
void gimp_datafiles_read_directories (const gchar *path_str,
GimpDataFileFlags flags,
GimpDataFileLoaderFunc loader_func,
gpointer loader_data);
/* Return the current datafiles access, modification
* or change time. The current datafile is the one for
* which the "DataFileLoaderFunc" function has been called
* on.
*/
time_t datafile_atime (void);
time_t datafile_mtime (void);
time_t datafile_ctime (void);
time_t gimp_datafile_atime (void);
time_t gimp_datafile_mtime (void);
time_t gimp_datafile_ctime (void);
#endif /* __DATAFILES_H__ */
#endif /* __GIMP_DATAFILES_H__ */

3
app/core/gimpdatalist.c
View file

@ -28,9 +28,8 @@
#include "libgimpmath/gimpmath.h"
#include "apptypes.h"
#include "core-types.h"
#include "appenv.h"
#include "gimpdata.h"
#include "gimpdatalist.h"

5
app/core/gimpdrawable-blend.c
View file

@ -26,7 +26,7 @@
#include "libgimpmath/gimpmath.h"
#include "libgimpwidgets/gimpwidgets.h"
#include "apptypes.h"
#include "tools-types.h"
#include "paint-funcs/paint-funcs.h"
@ -35,11 +35,11 @@
#include "core/gimpgradient.h"
#include "core/gimpimage.h"
#include "core/gimpimage-mask.h"
#include "core/gimptoolinfo.h"
#include "widgets/gimpdnd.h"
#include "appenv.h"
#include "asupsample.h"
#include "cursorutil.h"
#include "drawable.h"
#include "errors.h"
@ -53,7 +53,6 @@
#include "tile_manager.h"
#include "gimpblendtool.h"
#include "gimptoolinfo.h"
#include "paint_options.h"
#include "tool_manager.h"

2
app/core/gimpdrawable-desaturate.c
View file

@ -20,7 +20,7 @@
#include <gtk/gtk.h>
#include "apptypes.h"
#include "core-types.h"
#include "paint-funcs/paint-funcs.h"

2
app/core/gimpdrawable-equalize.c
View file

@ -20,7 +20,7 @@
#include <gtk/gtk.h>
#include "apptypes.h"
#include "core-types.h"
#include "drawable.h"
#include "gimpdrawable.h"

2
app/core/gimpdrawable-invert.c
View file

@ -20,7 +20,7 @@
#include <glib.h>
#include "apptypes.h"
#include "core-types.h"
#include "drawable.h"
#include "gimpdrawable.h"

2
app/core/gimpdrawable-offset.c
View file

@ -25,7 +25,7 @@
#include "libgimpcolor/gimpcolor.h"
#include "libgimpmath/gimpmath.h"
#include "apptypes.h"
#include "core-types.h"
#include "paint-funcs/paint-funcs.h"

2
app/core/gimpdrawable-preview.c
View file

@ -24,7 +24,7 @@
#include "libgimpmath/gimpmath.h"
#include "apptypes.h"
#include "core-types.h"
#include "paint-funcs/paint-funcs.h"

4
app/core/gimpdrawable-transform.c
View file

@ -25,7 +25,7 @@
#include "libgimpmath/gimpmath.h"
#include "libgimpwidgets/gimpwidgets.h"
#include "apptypes.h"
#include "tools-types.h"
#include "paint-funcs/paint-funcs.h"
@ -36,6 +36,7 @@
#include "core/gimpimage-mask.h"
#include "core/gimplayer.h"
#include "core/gimpmarshal.h"
#include "core/gimptoolinfo.h"
#include "gui/info-dialog.h"
#include "cursorutil.h"
@ -52,7 +53,6 @@
#include "tile_manager.h"
#include "tile.h"
#include "gimptoolinfo.h"
#include "tool_manager.h"
#include "tool_options.h"
#include "transform_options.h"

2
app/core/gimpdrawable.c
View file

@ -27,7 +27,7 @@
#include "libgimpcolor/gimpcolor.h"
#include "libgimpmath/gimpmath.h"
#include "apptypes.h"
#include "core-types.h"
#include "paint-funcs/paint-funcs.h"

3
app/core/gimpedit.c
View file

@ -24,7 +24,8 @@
#include "libgimpwidgets/gimpwidgets.h"
#include "apptypes.h"
#include "core/core-types.h"
#include "tools/tools-types.h"
#include "paint-funcs/paint-funcs.h"

2
app/core/gimpgradient.c
View file

@ -27,7 +27,7 @@
#include "libgimpcolor/gimpcolor.h"
#include "libgimpmath/gimpmath.h"
#include "apptypes.h"
#include "core-types.h"
#include "errors.h"
#include "gimpimage.h"

2
app/core/gimpimage-convert.c
View file

@ -102,7 +102,7 @@
#include "libgimpcolor/gimpcolor.h"
#include "libgimpmath/gimpmath.h"
#include "apptypes.h"
#include "core-types.h"
#include "cursorutil.h"
#include "gdisplay.h"

5
app/core/gimpimage-duplicate.c
View file

@ -26,7 +26,10 @@
#include "libgimpmath/gimpmath.h"
#include "libgimpwidgets/gimpwidgets.h"
#include "apptypes.h"
#include "core-types.h"
/* FIXME: remove the Path <-> BezierSelect dependency */
#include "tools/tools-types.h"
#include "paint-funcs/paint-funcs.h"

5
app/core/gimpimage-guides.c
View file

@ -25,7 +25,10 @@
#include "libgimpcolor/gimpcolor.h"
#include "libgimpmath/gimpmath.h"
#include "apptypes.h"
#include "core-types.h"
/* FIXME: remove the Path <-> BezierSelect dependency */
#include "tools/tools-types.h"
#include "paint-funcs/paint-funcs.h"

8
app/core/gimpimage-mask.c
View file

@ -20,13 +20,13 @@
#include <gtk/gtk.h>
#include "apptypes.h"
#include "core-types.h"
/* FIXME: move the "stroke" stuff into the core entirely */
#include "tools/tools-types.h"
#include "paint-funcs/paint-funcs.h"
#include "tools/gimptool.h"
#include "tools/gimppainttool.h"
#include "tools/paint_options.h"
#include "tools/tool_manager.h"
#include "gimpchannel.h"

5
app/core/gimpimage-merge.c
View file

@ -25,7 +25,10 @@
#include "libgimpcolor/gimpcolor.h"
#include "libgimpmath/gimpmath.h"
#include "apptypes.h"
#include "core-types.h"
/* FIXME: remove the Path <-> BezierSelect dependency */
#include "tools/tools-types.h"
#include "paint-funcs/paint-funcs.h"

2
app/core/gimpimage-pick-color.c
View file

@ -23,7 +23,7 @@
#include "libgimpcolor/gimpcolor.h"
#include "libgimpwidgets/gimpwidgets.h"
#include "apptypes.h"
#include "tools-types.h"
#include "core/gimpdrawable.h"
#include "core/gimpimage.h"

5
app/core/gimpimage-projection.c
View file

@ -25,7 +25,10 @@
#include "libgimpcolor/gimpcolor.h"
#include "libgimpmath/gimpmath.h"
#include "apptypes.h"
#include "core-types.h"
/* FIXME: remove the Path <-> BezierSelect dependency */
#include "tools/tools-types.h"
#include "paint-funcs/paint-funcs.h"

2
app/core/gimpimage-qmask.c
View file

@ -27,7 +27,7 @@
#include "libgimpcolor/gimpcolor.h"
#include "libgimpwidgets/gimpwidgets.h"
#include "apptypes.h"
#include "core/core-types.h"
#include "core/gimpchannel.h"
#include "core/gimpcontext.h"

2
app/core/gimpimage-quick-mask.c
View file

@ -27,7 +27,7 @@
#include "libgimpcolor/gimpcolor.h"
#include "libgimpwidgets/gimpwidgets.h"
#include "apptypes.h"
#include "core/core-types.h"
#include "core/gimpchannel.h"
#include "core/gimpcontext.h"

5
app/core/gimpimage-resize.c
View file

@ -25,7 +25,10 @@
#include "libgimpcolor/gimpcolor.h"
#include "libgimpmath/gimpmath.h"
#include "apptypes.h"
#include "core-types.h"
/* FIXME: remove the Path <-> BezierSelect dependency */
#include "tools/tools-types.h"
#include "paint-funcs/paint-funcs.h"

5
app/core/gimpimage-scale.c
View file

@ -25,7 +25,10 @@
#include "libgimpcolor/gimpcolor.h"
#include "libgimpmath/gimpmath.h"
#include "apptypes.h"
#include "core-types.h"
/* FIXME: remove the Path <-> BezierSelect dependency */
#include "tools/tools-types.h"
#include "paint-funcs/paint-funcs.h"

3
app/core/gimpimage-undo-push.c
View file

@ -23,7 +23,8 @@
#include <gtk/gtk.h>
#include "apptypes.h"
#include "core/core-types.h"
#include "tools/tools-types.h"
#include "paint-funcs/paint-funcs.h"

2
app/core/gimpimage-undo.c
View file

@ -20,7 +20,7 @@
#include <gtk/gtk.h>
#include "apptypes.h"
#include "core-types.h"
#include "gimpimage.h"
#include "gimpimage-undo.h"

5
app/core/gimpimage.c
View file

@ -25,7 +25,10 @@
#include "libgimpcolor/gimpcolor.h"
#include "libgimpmath/gimpmath.h"
#include "apptypes.h"
#include "core-types.h"
/* FIXME: remove the Path <-> BezierSelect dependency */
#include "tools/tools-types.h"
#include "paint-funcs/paint-funcs.h"

2
app/core/gimpimagemap.c
View file

@ -20,7 +20,7 @@
#include <gtk/gtk.h>
#include "apptypes.h"
#include "core/core-types.h"
#include "paint-funcs/paint-funcs.h"

2
app/core/gimplayer-floating-sel.c
View file

@ -22,7 +22,7 @@
#include "libgimpmath/gimpmath.h"
#include "apptypes.h"
#include "core/core-types.h"
#include "paint-funcs/paint-funcs.h"

2
app/core/gimplayer.c
View file

@ -27,7 +27,7 @@
#include "libgimpmath/gimpmath.h"
#include "apptypes.h"
#include "core-types.h"
#include "paint-funcs/paint-funcs.h"

2
app/core/gimplayermask.c
View file

@ -25,7 +25,7 @@
#include "libgimpmath/gimpmath.h"
#include "apptypes.h"
#include "core-types.h"
#include "paint-funcs/paint-funcs.h"

3
app/core/gimplist.c
View file

@ -25,9 +25,8 @@
#include <gtk/gtk.h>
#include "apptypes.h"
#include "core-types.h"
#include "gimpcontainer.h"
#include "gimplist.h"

2
app/core/gimpobject.c
View file

@ -22,7 +22,7 @@
#include <gtk/gtk.h>
#include "apptypes.h"
#include "core-types.h"
#include "gimpobject.h"

3
app/core/gimppalette-import.c
View file

@ -24,12 +24,13 @@
#include "libgimpcolor/gimpcolor.h"
#include "apptypes.h"
#include "core-types.h"
#include "gimpcontainer.h"
#include "gimpgradient.h"
#include "gimpimage.h"
#include "gimppalette.h"
#include "pixel_region.h"
#include "temp_buf.h"

6
app/core/gimppalette-load.c
View file

@ -28,15 +28,15 @@
#include <gtk/gtk.h>
#include "libgimpcolor/gimpcolor.h"
#include "libgimp/gimpenv.h"
#include "apptypes.h"
#include "core-types.h"
#include "gimppalette.h"
#include "gimprc.h"
#include "temp_buf.h"
#include "libgimp/gimpenv.h"
#include "libgimp/gimpintl.h"

6
app/core/gimppalette-save.c
View file

@ -28,15 +28,15 @@
#include <gtk/gtk.h>
#include "libgimpcolor/gimpcolor.h"
#include "libgimp/gimpenv.h"
#include "apptypes.h"
#include "core-types.h"
#include "gimppalette.h"
#include "gimprc.h"
#include "temp_buf.h"
#include "libgimp/gimpenv.h"
#include "libgimp/gimpintl.h"

6
app/core/gimppalette.c
View file

@ -28,15 +28,15 @@
#include <gtk/gtk.h>
#include "libgimpcolor/gimpcolor.h"
#include "libgimp/gimpenv.h"
#include "apptypes.h"
#include "core-types.h"
#include "gimppalette.h"
#include "gimprc.h"
#include "temp_buf.h"
#include "libgimp/gimpenv.h"
#include "libgimp/gimpintl.h"

2
app/core/gimpparasite.c
View file

@ -24,7 +24,7 @@
#include <unistd.h>
#endif
#include "apptypes.h"
#include "core/core-types.h"
#include "app_procs.h"
#include "parasitelist.h"

2
app/core/gimpparasitelist.c
View file

@ -21,7 +21,7 @@
#include <gtk/gtk.h>
#include "apptypes.h"
#include "core/core-types.h"
#include "parasitelist.h"

3
app/core/gimppattern-load.c
View file

@ -40,11 +40,12 @@
#define _O_BINARY 0
#endif
#include "apptypes.h"
#include "core-types.h"
#include "gimpimage.h"
#include "gimppattern.h"
#include "gimppattern-header.h"
#include "gimprc.h"
#include "temp_buf.h"

3
app/core/gimppattern.c
View file

@ -40,11 +40,12 @@
#define _O_BINARY 0
#endif
#include "apptypes.h"
#include "core-types.h"
#include "gimpimage.h"
#include "gimppattern.h"
#include "gimppattern-header.h"
#include "gimprc.h"
#include "temp_buf.h"

5
app/core/gimpprojection-construct.c
View file

@ -25,7 +25,10 @@
#include "libgimpcolor/gimpcolor.h"
#include "libgimpmath/gimpmath.h"
#include "apptypes.h"
#include "core-types.h"
/* FIXME: remove the Path <-> BezierSelect dependency */
#include "tools/tools-types.h"
#include "paint-funcs/paint-funcs.h"

3
app/core/gimpprojection.c
View file

@ -25,7 +25,8 @@
#include "libgimpmath/gimpmath.h"
#include "apptypes.h"
#include "core/core-types.h"
#include "tools/tools-types.h"
#include "core/gimpchannel.h"
#include "core/gimpcontainer.h"

2
app/core/gimpscanconvert.c
View file

@ -24,7 +24,7 @@
#include "libgimpmath/gimpmath.h"
#include "apptypes.h"
#include "core/core-types.h"
#include "core/gimpchannel.h"
#include "core/gimpimage.h"

10
app/core/gimptoolinfo.c
View file

@ -20,15 +20,17 @@
#include <gtk/gtk.h>
#include "apptypes.h"
#include "core/core-types.h"
#include "tools/tools-types.h"
#include "core/gimpcontext.h"
#include "gimpcontext.h"
#include "gimptoolinfo.h"
#include "context_manager.h"
#include "gimptoolinfo.h"
#include "temp_buf.h"
#include "gimprectselecttool.h"
/* GRMPF */
#include "tools/gimprectselecttool.h"
static void gimp_tool_info_class_init (GimpToolInfoClass *klass);

5
app/core/gimpundo.c
View file

@ -20,11 +20,12 @@
#include <gtk/gtk.h>
#include "apptypes.h"
#include "core-types.h"
#include "gimpimage.h"
#include "gimprc.h"
#include "gimpundo.h"
#include "gimprc.h"
#include "temp_buf.h"

8
app/core/gimpundostack.c
View file

@ -20,9 +20,8 @@
#include <gtk/gtk.h>
#include "apptypes.h"
#include "core-types.h"
#include "gimpcontainer.h"
#include "gimpimage.h"
#include "gimplist.h"
#include "gimpundo.h"
@ -48,7 +47,8 @@ gimp_undo_stack_get_type (void)
{
static GtkType undo_stack_type = 0;
if (! undo_stack_type) {
if (! undo_stack_type)
{
static const GtkTypeInfo undo_stack_info =
{
"GimpUndoStack",
@ -63,7 +63,7 @@ gimp_undo_stack_get_type (void)
undo_stack_type = gtk_type_unique (GIMP_TYPE_UNDO,
&undo_stack_info);
}
}
return undo_stack_type;
}

2
app/core/gimpviewable.c
View file

@ -23,7 +23,7 @@
#include <gtk/gtk.h>
#include "apptypes.h"
#include "core-types.h"
#include "gimpmarshal.h"
#include "gimpviewable.h"

2
app/cursorutil.c
View file

@ -20,7 +20,7 @@
#include <gtk/gtk.h>
#include "apptypes.h"
#include "core/core-types.h"
#include "appenv.h"
#include "cursorutil.h"

20
app/datafiles.c
View file

@ -45,7 +45,7 @@
#endif
#endif /* G_OS_WIN32 */
#include "apptypes.h"
#include "core/core-types.h"
#include "datafiles.h"
#include "gimprc.h"
@ -102,8 +102,8 @@ is_script (const gchar *filename)
#endif
gboolean
datafiles_check_extension (const gchar *filename,
const gchar *extension)
gimp_datafiles_check_extension (const gchar *filename,
const gchar *extension)
{
gint name_len;
gint ext_len;
@ -121,10 +121,10 @@ datafiles_check_extension (const gchar *filename,
}
void
datafiles_read_directories (const gchar *path_str,
GimpDataFileFlags flags,
GimpDataFileLoaderFunc loader_func,
gpointer loader_data)
gimp_datafiles_read_directories (const gchar *path_str,
GimpDataFileFlags flags,
GimpDataFileLoaderFunc loader_func,
gpointer loader_data)
{
gchar *local_path;
GList *path;
@ -196,7 +196,7 @@ datafiles_read_directories (const gchar *path_str,
}
time_t
datafile_atime (void)
gimp_datafile_atime (void)
{
if (filestat_valid)
return filestat.st_atime;
@ -205,7 +205,7 @@ datafile_atime (void)
}
time_t
datafile_mtime (void)
gimp_datafile_mtime (void)
{
if (filestat_valid)
return filestat.st_mtime;
@ -214,7 +214,7 @@ datafile_mtime (void)
}
time_t
datafile_ctime (void)
gimp_datafile_ctime (void)
{
if (filestat_valid)
return filestat.st_ctime;

24
app/datafiles.h
View file

@ -19,8 +19,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef __DATAFILES_H__
#define __DATAFILES_H__
#ifndef __GIMP_DATAFILES_H__
#define __GIMP_DATAFILES_H__
#include <time.h>
@ -32,22 +32,22 @@ typedef enum
} GimpDataFileFlags;
gboolean datafiles_check_extension (const gchar *filename,
const gchar *extension);
gboolean gimp_datafiles_check_extension (const gchar *filename,
const gchar *extension);
void datafiles_read_directories (const gchar *path_str,
GimpDataFileFlags flags,
GimpDataFileLoaderFunc loader_func,
gpointer loader_data);
void gimp_datafiles_read_directories (const gchar *path_str,
GimpDataFileFlags flags,
GimpDataFileLoaderFunc loader_func,
gpointer loader_data);
/* Return the current datafiles access, modification
* or change time. The current datafile is the one for
* which the "DataFileLoaderFunc" function has been called
* on.
*/
time_t datafile_atime (void);
time_t datafile_mtime (void);
time_t datafile_ctime (void);
time_t gimp_datafile_atime (void);
time_t gimp_datafile_mtime (void);
time_t gimp_datafile_ctime (void);
#endif /* __DATAFILES_H__ */
#endif /* __GIMP_DATAFILES_H__ */

2
app/devices.c
View file

@ -35,11 +35,11 @@
#include "core/gimpdatafactory.h"
#include "core/gimpgradient.h"
#include "core/gimppattern.h"
#include "core/gimptoolinfo.h"
#include "widgets/gimpdnd.h"
#include "widgets/gimppreview.h"
#include "tools/gimptoolinfo.h"
#include "tools/tool_manager.h"
#include "appenv.h"

4
app/dialogs/about-dialog.c
View file

@ -31,9 +31,9 @@
#include "libgimpmath/gimpmath.h"
#include "libgimpwidgets/gimpwidgets.h"
#include "apptypes.h"
#include "core/core-types.h"
#include "tools/gimptoolinfo.h"
#include "core/gimptoolinfo.h"
#include "widgets/gimpdnd.h"

3
app/dialogs/convert-dialog.c
View file

@ -22,7 +22,8 @@
#include "libgimpwidgets/gimpwidgets.h"
#include "apptypes.h"
#include "core/core-types.h"
#include "tools/tools-types.h"
#include "core/gimpdatafactory.h"
#include "core/gimpimage.h"

2
app/dialogs/dialogs-constructors.c
View file

@ -32,6 +32,7 @@
#include "core/gimpgradient.h"
#include "core/gimpimage.h"
#include "core/gimplayer.h"
#include "core/gimptoolinfo.h"
#include "widgets/gimpcontainerlistview.h"
#include "widgets/gimpcontainergridview.h"
@ -44,7 +45,6 @@
#include "widgets/gimplistitem.h"
#include "widgets/gimppreview.h"
#include "tools/gimptoolinfo.h"
#include "tools/tool_manager.h"
#include "tools/tool_options_dialog.h"

2
app/dialogs/file-dialog-utils.c
View file

@ -23,7 +23,7 @@
#include <gtk/gtk.h>
#include "apptypes.h"
#include "core/core-types.h"
#include "gdisplay.h"
#include "gimpui.h"

2
app/dialogs/file-open-dialog.c
View file

@ -38,7 +38,7 @@
#include "libgimpmath/gimpmath.h"
#include "libgimpwidgets/gimpwidgets.h"
#include "apptypes.h"
#include "core/core-types.h"
#include "core/gimpcontext.h"
#include "core/gimpimage.h"

2
app/dialogs/file-save-dialog.c
View file

@ -32,7 +32,7 @@
#include "libgimpwidgets/gimpwidgets.h"
#include "apptypes.h"
#include "core/core-types.h"
#include "core/gimpdrawable.h"
#include "core/gimpimage.h"

2
app/dialogs/image-new-dialog.c
View file

@ -24,7 +24,7 @@
#include "libgimpwidgets/gimpwidgets.h"
#include "libgimp/gimplimits.h"
#include "apptypes.h"
#include "core/core-types.h"
#include "file-new-dialog.h"
#include "gdisplay.h"

3
app/dialogs/info-window.c
View file

@ -22,7 +22,8 @@
#include "libgimpwidgets/gimpwidgets.h"
#include "apptypes.h"
#include "core/core-types.h"
#include "tools/tools-types.h"
#include "widgets/widgets-types.h"
#include "core/gimpcontainer.h"

10
app/dialogs/module-dialog.c
View file

@ -35,7 +35,7 @@
#include "libgimpwidgets/gimpwidgets.h"
#include "apptypes.h"
#include "core/core-types.h"
#include "core/gimplist.h"
@ -217,8 +217,8 @@ module_db_init (void)
modules = gimp_list_new (MODULE_INFO_TYPE, GIMP_CONTAINER_POLICY_WEAK);
if (g_module_supported ())
datafiles_read_directories (module_path, 0 /* no flags */,
module_initialize, NULL);
gimp_datafiles_read_directories (module_path, 0 /* no flags */,
module_initialize, NULL);
#ifdef DUMP_DB
gimp_container_foreach (modules, print_module_info, NULL);
#endif
@ -1135,8 +1135,8 @@ browser_refresh_callback (GtkWidget *widget,
kill_list = NULL;
/* walk filesystem and add new things we find */
datafiles_read_directories (module_path, 0 /* no flags */,
module_initialize, NULL);
gimp_datafiles_read_directories (module_path, 0 /* no flags */,
module_initialize, NULL);
}

2
app/dialogs/offset-dialog.c
View file

@ -23,7 +23,7 @@
#include "libgimpmath/gimpmath.h"
#include "libgimpwidgets/gimpwidgets.h"
#include "apptypes.h"
#include "core/core-types.h"
#include "core/gimpdrawable.h"
#include "core/gimpdrawable-offset.h"

3
app/dialogs/palette-import-dialog.c
View file

@ -25,7 +25,7 @@
#include "libgimpcolor/gimpcolor.h"
#include "libgimpwidgets/gimpwidgets.h"
#include "apptypes.h"
#include "core/core-types.h"
#include "core/gimpcontainer.h"
#include "core/gimpcontext.h"
@ -49,6 +49,7 @@
#define IMPORT_PREVIEW_WIDTH 80
#define IMPORT_PREVIEW_HEIGHT 80
typedef enum
{
GRAD_IMPORT = 0,

2
app/dialogs/preferences-dialog.c
View file

@ -26,7 +26,7 @@
#include "libgimpwidgets/gimpwidgets.h"
#include "libgimp/gimplimits.h"
#include "apptypes.h"
#include "core/core-types.h"
#include "core/gimpcontainer.h"
#include "core/gimpimage.h"

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