Commit 0308d410 authored by Simon Budig's avatar Simon Budig Committed by Simon Budig
Browse files

Fixing include/declaration issues in the application:

2006-11-23  Simon Budig  <simon@gimp.org>

	Fixing include/declaration issues in the application:

	* app/composite/gimp-composite-sse2.c: disable unused debugging code

	* app/paint-funcs/paint-funcs.[ch]
	* app/paint-funcs/scale-funcs.[ch]: fix include files, add some
	prototypes, make some other functions static.

	* app/core/gimpbuffer.c
	* app/core/gimpdrawable-preview.c: changed accordingly.

	* app/tools/gimpeditselectiontool.[ch]: untangle .c and .h file.

	* app/widgets/gimpfiledialog.c: add missing #include.
parent 65a643bb
2006-11-24 Simon Budig <simon@gimp.org>
Fixing include/declaration issues in the application:
* app/composite/gimp-composite-sse2.c: disable unused debugging code
* app/paint-funcs/paint-funcs.[ch]
* app/paint-funcs/scale-funcs.[ch]: fix include files, add some
prototypes, make some other functions static.
* app/core/gimpbuffer.c
* app/core/gimpdrawable-preview.c: changed accordingly.
* app/tools/gimpeditselectiontool.[ch]: untangle .c and .h file.
* app/widgets/gimpfiledialog.c: add missing #include.
2006-11-24 Tor Lillqvist <tml@novell.com>
 
* libgimp/gimp.h (MAIN): Add prototype for WinMain to avoid gcc
......
......@@ -62,6 +62,7 @@ static const guint32 va8_b255_64[2] = { 0xFFFFFFFF, 0xFFFFFFFF };
static const guint32 va8_w1_64[2] = { 0x00010001, 0x00010001 };
static const guint32 va8_w255_64[2] = { 0x00FF00FF, 0x00FF00FF };
#if 0
void
debug_display_sse (void)
{
......@@ -79,6 +80,7 @@ debug_display_sse (void)
print128(xmm6); printf(" "); print128(xmm7); printf("\n");
printf("--------------------------------------------\n");
}
#endif
void
gimp_composite_addition_rgba8_rgba8_rgba8_sse2 (GimpCompositeContext *_op)
......
......@@ -29,6 +29,7 @@
#include "base/temp-buf.h"
#include "paint-funcs/paint-funcs.h"
#include "paint-funcs/scale-funcs.h"
#include "gimpbuffer.h"
......
......@@ -29,7 +29,7 @@
#include "base/pixel-region.h"
#include "base/temp-buf.h"
#include "paint-funcs/paint-funcs.h"
#include "paint-funcs/scale-funcs.h"
#include "config/gimpcoreconfig.h"
......
......@@ -1733,7 +1733,7 @@ erase_indexed_pixels (const guchar *src1,
}
}
void
static inline void
anti_erase_inten_pixels (const guchar *src1,
const guchar *src2,
guchar *dest,
......@@ -1768,7 +1768,7 @@ anti_erase_inten_pixels (const guchar *src1,
}
void
static inline void
anti_erase_indexed_pixels (const guchar *src1,
const guchar *src2,
guchar *dest,
......@@ -1802,7 +1802,7 @@ anti_erase_indexed_pixels (const guchar *src1,
}
static void
static inline void
color_erase_helper (GimpRGB *src,
const GimpRGB *color)
{
......@@ -1867,7 +1867,7 @@ color_erase_helper (GimpRGB *src,
}
void
static inline void
color_erase_inten_pixels (const guchar *src1,
const guchar *src2,
guchar *dest,
......@@ -4093,7 +4093,7 @@ struct initial_regions_struct
guchar *data;
};
void
static void
initial_sub_region (struct initial_regions_struct *st,
PixelRegion *src,
PixelRegion *dest,
......
......@@ -32,6 +32,20 @@ void color_pixels (guchar *dest,
guint w,
guint bytes);
void color_pixels_mask (guchar *dest,
const guchar *mask,
const guchar *color,
guint w,
guint bytes);
void pattern_pixels_mask (guchar *dest,
const guchar *mask,
TempBuf *pattern,
guint w,
guint bytes,
gint x,
gint y);
void blend_pixels (const guchar *src1,
const guchar *src2,
guchar *dest,
......@@ -207,6 +221,15 @@ void combine_indexed_a_and_indexed_a_pixels(const guchar *src1,
guint length,
guint bytes);
void combine_inten_a_and_indexed_pixels (const guchar *src1,
const guchar *src2,
guchar *dest,
const guchar *mask,
const guchar *cmap,
guint opacity,
guint length,
guint bytes);
/* combine intensity with indexed, destination is
* intensity-alpha...use this for an indexed floating sel
*/
......@@ -384,10 +407,6 @@ void border_region (PixelRegion *src,
gint16 yradius,
gboolean feather);
void subsample_region (PixelRegion *srcPR,
PixelRegion *destPR,
gint subsample);
gfloat shapeburst_region (PixelRegion *srcPR,
PixelRegion *distPR,
GimpProgressFunc progress_callback,
......
......@@ -31,6 +31,8 @@
#include "scale-funcs.h"
#define EPSILON (0.0001) /* arbitary small number for avoiding zero */
static void scale_region_no_resample (PixelRegion *srcPR,
PixelRegion *destPR);
static void scale_region_lanczos (PixelRegion *srcPR,
......
......@@ -20,7 +20,6 @@
#define __SCALE_FUNCS_H__
#define EPSILON (0.0001) /* arbitary small number for avoiding zero */
#define LANCZOS_SPP (4000) /* number of data pts per unit x in lookup table */
#define LANCZOS_MIN (1.0/LANCZOS_SPP)
#define LANCZOS_WIDTH (3) /* 3 for Lanczos3 code, for L4 prefer DUAL_LANCZOS below */
......@@ -28,13 +27,17 @@
#define LANCZOS_SAMPLES (LANCZOS_SPP * (LANCZOS_WIDTH + 1))
void scale_region (PixelRegion *srcPR,
PixelRegion *destPR,
GimpInterpolationType interpolation,
GimpProgressFunc progress_callback,
gpointer progress_data);
void scale_region (PixelRegion *srcPR,
PixelRegion *destPR,
GimpInterpolationType interpolation,
GimpProgressFunc progress_callback,
gpointer progress_data);
gfloat * create_lanczos_lookup (void);
void subsample_region (PixelRegion *srcPR,
PixelRegion *destPR,
gint subsample);
gfloat * create_lanczos_lookup (void);
#endif /* __SCALE_FUNCS_H__ */
......
......@@ -65,44 +65,6 @@
#define ARROW_VELOCITY 25
#define GIMP_TYPE_EDIT_SELECTION_TOOL (gimp_edit_selection_tool_get_type ())
#define GIMP_EDIT_SELECTION_TOOL(obj) (GTK_CHECK_CAST ((obj), GIMP_TYPE_EDIT_SELECTION_TOOL, GimpEditSelectionTool))
#define GIMP_EDIT_SELECTION_TOOL_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GIMP_TYPE_EDIT_SELECTION_TOOL, GimpEditSelectionToolClass))
#define GIMP_IS_EDIT_SELECTION_TOOL(obj) (GTK_CHECK_TYPE ((obj), GIMP_TYPE_EDIT_SELECTION_TOOL))
#define GIMP_IS_EDIT_SELECTION_TOOL_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_EDIT_SELECTION_TOOL))
typedef struct _GimpEditSelectionTool GimpEditSelectionTool;
typedef struct _GimpEditSelectionToolClass GimpEditSelectionToolClass;
struct _GimpEditSelectionTool
{
GimpDrawTool parent_instance;
gint origx, origy; /* Last x and y coords */
gint cumlx, cumly; /* Cumulative changes to x and yed */
gint x, y; /* Current x and y coords */
gint num_segs_in; /* Num seg in selection boundary */
gint num_segs_out; /* Num seg in selection boundary */
BoundSeg *segs_in; /* Pointer to the channel sel. segs */
BoundSeg *segs_out; /* Pointer to the channel sel. segs */
gint x1, y1; /* Bounding box of selection mask */
gint x2, y2;
GimpTranslateMode edit_mode; /* Translate the mask or layer? */
gboolean first_move; /* Don't push undos after the first */
gboolean propagate_release;
};
struct _GimpEditSelectionToolClass
{
GimpDrawToolClass parent_class;
};
static void gimp_edit_selection_tool_button_release (GimpTool *tool,
GimpCoords *coords,
guint32 time,
......
......@@ -20,13 +20,55 @@
#define __GIMP_EDIT_SELECTION_TOOL_H__
#include "gimpdrawtool.h"
#define GIMP_TYPE_EDIT_SELECTION_TOOL (gimp_edit_selection_tool_get_type ())
#define GIMP_EDIT_SELECTION_TOOL(obj) (GTK_CHECK_CAST ((obj), GIMP_TYPE_EDIT_SELECTION_TOOL, GimpEditSelectionTool))
#define GIMP_EDIT_SELECTION_TOOL_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GIMP_TYPE_EDIT_SELECTION_TOOL, GimpEditSelectionToolClass))
#define GIMP_IS_EDIT_SELECTION_TOOL(obj) (GTK_CHECK_TYPE ((obj), GIMP_TYPE_EDIT_SELECTION_TOOL))
#define GIMP_IS_EDIT_SELECTION_TOOL_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_EDIT_SELECTION_TOOL))
typedef struct _GimpEditSelectionTool GimpEditSelectionTool;
typedef struct _GimpEditSelectionToolClass GimpEditSelectionToolClass;
struct _GimpEditSelectionTool
{
GimpDrawTool parent_instance;
gint origx, origy; /* Last x and y coords */
gint cumlx, cumly; /* Cumulative changes to x and yed */
gint x, y; /* Current x and y coords */
gint num_segs_in; /* Num seg in selection boundary */
gint num_segs_out; /* Num seg in selection boundary */
BoundSeg *segs_in; /* Pointer to the channel sel. segs */
BoundSeg *segs_out; /* Pointer to the channel sel. segs */
gint x1, y1; /* Bounding box of selection mask */
gint x2, y2;
GimpTranslateMode edit_mode; /* Translate the mask or layer? */
gboolean first_move; /* Don't push undos after the first */
gboolean propagate_release;
};
struct _GimpEditSelectionToolClass
{
GimpDrawToolClass parent_class;
};
GType gimp_edit_selection_tool_get_type (void) G_GNUC_CONST;
void gimp_edit_selection_tool_start (GimpTool *parent_tool,
GimpDisplay *display,
GimpCoords *coords,
GimpTranslateMode edit_mode,
gboolean propagate_release);
gboolean gimp_edit_selection_tool_key_press (GimpTool *tool,
GdkEventKey *kevent,
GimpDisplay *display);
......
......@@ -49,6 +49,7 @@
#include "gimpview.h"
#include "gimpviewrendererimagefile.h"
#include "gimpthumbbox.h"
#include "gimpwidgets-utils.h"
#include "gimp-intl.h"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment