app/core/Makefile.am new files. Changed function names to be consistent.
2001-11-28 Michael Natterer <mitch@gimp.org> * app/core/Makefile.am * app/core/gimpimage-projection.[ch]: new files. Changed function names to be consistent. * app/core/gimpimage.[ch]: removed the projection stuff here. Removed the gimp_image_composite_blah() functions becauee they were just calling the resp. gimp_image_projection ones. * app/core/gimpimage-contiguous-region.c * app/core/gimpimage-convert.c * app/core/gimpimage-crop.c * app/core/gimppalette-import.c * app/undo.c * app/display/gimpdisplay.c * app/display/gimpdisplayshell-render.c * app/gui/info-window.c * app/tools/gimpbycolorselecttool.c * app/tools/gimpcolorpickertool.c * app/tools/gimpiscissorstool.c: changed accordingly.
This commit is contained in:
Michael Natterer
committed by
Michael Natterer
Michael Natterer
parent
e9c3bb45a2
commit
9bac8fafec
@ -16,463 +16,40 @@
|
||||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
#ifndef __GIMP_IMAGE_H__
|
||||
#define __GIMP_IMAGE_H__
|
||||
#ifndef __GIMP_IMAGE_PROJECTION_H__
|
||||
#define __GIMP_IMAGE_PROJECTION_H__
|
||||
|
||||
|
||||
#include "gimpviewable.h"
|
||||
|
||||
|
||||
#define COLORMAP_SIZE 768
|
||||
|
||||
#define GIMP_IMAGE_TYPE_HAS_ALPHA(t) ((t) == RGBA_GIMAGE || \
|
||||
(t) == GRAYA_GIMAGE || \
|
||||
(t) == INDEXEDA_GIMAGE)
|
||||
|
||||
|
||||
struct _GimpGuide
|
||||
{
|
||||
gint ref_count;
|
||||
gint position;
|
||||
InternalOrientationType orientation;
|
||||
guint32 guide_ID;
|
||||
};
|
||||
|
||||
|
||||
#define GIMP_TYPE_IMAGE (gimp_image_get_type ())
|
||||
#define GIMP_IMAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_IMAGE, GimpImage))
|
||||
#define GIMP_IMAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_IMAGE, GimpImageClass))
|
||||
#define GIMP_IS_IMAGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_IMAGE))
|
||||
#define GIMP_IS_IMAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_IMAGE))
|
||||
#define GIMP_IMAGE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_IMAGE, GimpImageClass))
|
||||
|
||||
|
||||
typedef struct _GimpImageClass GimpImageClass;
|
||||
|
||||
struct _GimpImage
|
||||
{
|
||||
GimpViewable parent_instance;
|
||||
|
||||
Gimp *gimp; /* the GIMP the image belongs to*/
|
||||
|
||||
gint ID; /* provides a unique ID */
|
||||
|
||||
PlugInProcDef *save_proc; /* last PDB save proc used */
|
||||
|
||||
gint width, height; /* width and height attributes */
|
||||
gdouble xresolution; /* image x-res, in dpi */
|
||||
gdouble yresolution; /* image y-res, in dpi */
|
||||
GimpUnit unit; /* image unit */
|
||||
GimpImageBaseType base_type; /* base gimp_image type */
|
||||
|
||||
guchar *cmap; /* colormap--for indexed */
|
||||
gint num_cols; /* number of cols--for indexed */
|
||||
|
||||
gint dirty; /* dirty flag -- # of ops */
|
||||
gboolean undo_on; /* Is undo enabled? */
|
||||
|
||||
gint instance_count; /* number of instances */
|
||||
gint disp_count; /* number of displays */
|
||||
|
||||
GimpTattoo tattoo_state; /* the next unique tattoo to use*/
|
||||
|
||||
TileManager *shadow; /* shadow buffer tiles */
|
||||
|
||||
/* Projection attributes */
|
||||
gboolean construct_flag; /* flag for construction */
|
||||
GimpImageType proj_type; /* type of the projection image */
|
||||
gint proj_bytes; /* bpp in projection image */
|
||||
gint proj_level; /* projection level */
|
||||
TileManager *projection; /* The projection--layers & */
|
||||
/* channels */
|
||||
|
||||
GList *guides; /* guides */
|
||||
|
||||
/* Layer/Channel attributes */
|
||||
GimpContainer *layers; /* the list of layers */
|
||||
GimpContainer *channels; /* the list of masks */
|
||||
GSList *layer_stack; /* the layers in MRU order */
|
||||
|
||||
GimpLayer *active_layer; /* the active layer */
|
||||
GimpChannel *active_channel; /* the active channel */
|
||||
GimpLayer *floating_sel; /* the FS layer */
|
||||
GimpChannel *selection_mask; /* the selection mask channel */
|
||||
|
||||
GimpParasiteList *parasites; /* Plug-in parasite data */
|
||||
|
||||
PathList *paths; /* Paths data for this image */
|
||||
|
||||
gboolean visible[MAX_CHANNELS]; /* visible channels */
|
||||
gboolean active[MAX_CHANNELS]; /* active channels */
|
||||
|
||||
gboolean qmask_state; /* TRUE if qmask is on */
|
||||
GimpRGB qmask_color; /* rgba triplet of the color */
|
||||
|
||||
/* Old undo apparatus */
|
||||
GSList *undo_stack; /* stack for undo operations */
|
||||
GSList *redo_stack; /* stack for redo operations */
|
||||
gint undo_bytes; /* bytes in undo stack */
|
||||
gint undo_levels; /* levels in undo stack */
|
||||
gint group_count; /* nested undo groups */
|
||||
UndoType pushing_undo_group; /* undo group status flag */
|
||||
|
||||
/* New undo apparatus */
|
||||
GimpUndoStack *new_undo_stack; /* stack for undo operations */
|
||||
GimpUndoStack *new_redo_stack; /* stack for redo operations */
|
||||
|
||||
/* Composite preview */
|
||||
TempBuf *comp_preview; /* the composite preview */
|
||||
gboolean comp_preview_valid; /* preview valid-1/channel */
|
||||
};
|
||||
|
||||
struct _GimpImageClass
|
||||
{
|
||||
GimpViewableClass parent_class;
|
||||
|
||||
void (* mode_changed) (GimpImage *gimage);
|
||||
void (* alpha_changed) (GimpImage *gimage);
|
||||
void (* floating_selection_changed) (GimpImage *gimage);
|
||||
void (* active_layer_changed) (GimpImage *gimage);
|
||||
void (* active_channel_changed) (GimpImage *gimage);
|
||||
void (* component_visibility_changed) (GimpImage *gimage,
|
||||
ChannelType channel);
|
||||
void (* component_active_changed) (GimpImage *gimage,
|
||||
ChannelType channel);
|
||||
void (* mask_changed) (GimpImage *gimage);
|
||||
void (* resolution_changed) (GimpImage *gimage);
|
||||
void (* unit_changed) (GimpImage *gimage);
|
||||
void (* qmask_changed) (GimpImage *gimage);
|
||||
void (* selection_control) (GimpImage *gimage,
|
||||
GimpSelectionControl control);
|
||||
|
||||
void (* clean) (GimpImage *gimage);
|
||||
void (* dirty) (GimpImage *gimage);
|
||||
void (* update) (GimpImage *gimage,
|
||||
gint x,
|
||||
gint y,
|
||||
gint width,
|
||||
gint height);
|
||||
void (* update_guide) (GimpImage *gimage,
|
||||
GimpGuide *guide);
|
||||
void (* colormap_changed) (GimpImage *gimage,
|
||||
gint color_index);
|
||||
void (* undo_event) (GimpImage *gimage,
|
||||
gint event);
|
||||
|
||||
void (* undo) (GimpImage *gimage);
|
||||
void (* redo) (GimpImage *gimage);
|
||||
};
|
||||
|
||||
|
||||
/* function declarations */
|
||||
|
||||
GType gimp_image_get_type (void) G_GNUC_CONST;
|
||||
|
||||
GimpImage * gimp_image_new (Gimp *gimp,
|
||||
gint width,
|
||||
gint height,
|
||||
GimpImageBaseType base_type);
|
||||
|
||||
gint gimp_image_get_ID (GimpImage *gimage);
|
||||
GimpImage * gimp_image_get_by_ID (Gimp *gimp,
|
||||
gint id);
|
||||
|
||||
void gimp_image_set_filename (GimpImage *gimage,
|
||||
const gchar *filename);
|
||||
void gimp_image_set_resolution (GimpImage *gimage,
|
||||
gdouble xres,
|
||||
gdouble yres);
|
||||
void gimp_image_get_resolution (const GimpImage *gimage,
|
||||
gdouble *xresolution,
|
||||
gdouble *yresolution);
|
||||
void gimp_image_set_unit (GimpImage *gimage,
|
||||
GimpUnit unit);
|
||||
GimpUnit gimp_image_get_unit (const GimpImage *gimage);
|
||||
|
||||
void gimp_image_set_qmask_state (GimpImage *gimage,
|
||||
gboolean qmask_state);
|
||||
gboolean gimp_image_get_qmask_state (const GimpImage *gimage);
|
||||
|
||||
void gimp_image_set_save_proc (GimpImage *gimage,
|
||||
PlugInProcDef *proc);
|
||||
PlugInProcDef * gimp_image_get_save_proc (const GimpImage *gimage);
|
||||
|
||||
gint gimp_image_get_width (const GimpImage *gimage);
|
||||
gint gimp_image_get_height (const GimpImage *gimage);
|
||||
|
||||
void gimp_image_resize (GimpImage *gimage,
|
||||
gint new_width,
|
||||
gint new_height,
|
||||
gint offset_x,
|
||||
gint offset_y);
|
||||
void gimp_image_scale (GimpImage *gimage,
|
||||
gint new_width,
|
||||
gint new_height,
|
||||
GimpProgressFunc progress_func,
|
||||
gpointer progress_data);
|
||||
gboolean gimp_image_check_scaling (const GimpImage *gimage,
|
||||
gint new_width,
|
||||
gint new_height);
|
||||
|
||||
TileManager * gimp_image_shadow (GimpImage *gimage,
|
||||
gint width,
|
||||
gint height,
|
||||
gint bpp);
|
||||
void gimp_image_free_shadow (GimpImage *gimage);
|
||||
|
||||
void gimp_image_apply_image (GimpImage *gimage,
|
||||
GimpDrawable *drawable,
|
||||
PixelRegion *src2PR,
|
||||
gboolean undo,
|
||||
gint opacity,
|
||||
LayerModeEffects mode,
|
||||
TileManager *src1_tiles,
|
||||
gint x,
|
||||
gint y);
|
||||
void gimp_image_replace_image (GimpImage *gimage,
|
||||
GimpDrawable *drawable,
|
||||
PixelRegion *src2PR,
|
||||
gboolean undo,
|
||||
gint opacity,
|
||||
PixelRegion *maskPR,
|
||||
gint x,
|
||||
gint y);
|
||||
|
||||
void gimp_image_get_foreground (const GimpImage *gimage,
|
||||
const GimpDrawable *drawable,
|
||||
guchar *fg);
|
||||
void gimp_image_get_background (const GimpImage *gimage,
|
||||
const GimpDrawable *drawable,
|
||||
guchar *bg);
|
||||
guchar * gimp_image_get_color_at (GimpImage *gimage,
|
||||
gint x,
|
||||
gint y);
|
||||
void gimp_image_get_color (const GimpImage *gimage,
|
||||
GimpImageType d_type,
|
||||
guchar *rgb,
|
||||
guchar *src);
|
||||
void gimp_image_transform_color (const GimpImage *gimage,
|
||||
const GimpDrawable *drawable,
|
||||
guchar *src,
|
||||
guchar *dest,
|
||||
GimpImageBaseType type);
|
||||
|
||||
GimpGuide * gimp_image_add_hguide (GimpImage *gimage);
|
||||
GimpGuide * gimp_image_add_vguide (GimpImage *gimage);
|
||||
void gimp_image_add_guide (GimpImage *gimage,
|
||||
GimpGuide *guide);
|
||||
void gimp_image_remove_guide (GimpImage *gimage,
|
||||
GimpGuide *guide);
|
||||
void gimp_image_delete_guide (GimpImage *gimage,
|
||||
GimpGuide *guide);
|
||||
GimpGuide * gimp_image_find_guide (GimpImage *gimage,
|
||||
gint x,
|
||||
gint y);
|
||||
gboolean gimp_image_snap_point (GimpImage *gimage,
|
||||
gint x,
|
||||
gint y,
|
||||
gint *tx,
|
||||
gint *ty);
|
||||
gboolean gimp_image_snap_rectangle (GimpImage *gimage,
|
||||
gint x1,
|
||||
gint y1,
|
||||
gint x2,
|
||||
gint y2,
|
||||
gint *tx1,
|
||||
gint *ty1);
|
||||
|
||||
GimpParasite * gimp_image_parasite_find (const GimpImage *gimage,
|
||||
const gchar *name);
|
||||
gchar ** gimp_image_parasite_list (const GimpImage *gimage,
|
||||
gint *count);
|
||||
void gimp_image_parasite_attach (GimpImage *gimage,
|
||||
GimpParasite *parasite);
|
||||
void gimp_image_parasite_detach (GimpImage *gimage,
|
||||
const gchar *parasite);
|
||||
|
||||
GimpTattoo gimp_image_get_new_tattoo (GimpImage *gimage);
|
||||
gboolean gimp_image_set_tattoo_state (GimpImage *gimage,
|
||||
GimpTattoo val);
|
||||
GimpTattoo gimp_image_get_tattoo_state (GimpImage *gimage);
|
||||
|
||||
void gimp_image_set_paths (GimpImage *gimage,
|
||||
PathList *paths);
|
||||
PathList * gimp_image_get_paths (const GimpImage *gimage);
|
||||
|
||||
/* Temporary hack till colormap manipulation is encapsulated in functions.
|
||||
* Call this whenever you modify an image's colormap. The col argument
|
||||
* specifies which color has changed, or negative if there's a bigger change.
|
||||
* Currently, use this also when the image's base type is changed to/from
|
||||
* indexed.
|
||||
*/
|
||||
void gimp_image_colormap_changed (GimpImage *gimage,
|
||||
gint col);
|
||||
|
||||
void gimp_image_mode_changed (GimpImage *gimage);
|
||||
void gimp_image_alpha_changed (GimpImage *gimage);
|
||||
void gimp_image_floating_selection_changed (GimpImage *gimage);
|
||||
void gimp_image_mask_changed (GimpImage *gimage);
|
||||
void gimp_image_resolution_changed (GimpImage *gimage);
|
||||
void gimp_image_unit_changed (GimpImage *gimage);
|
||||
void gimp_image_qmask_changed (GimpImage *gimage);
|
||||
void gimp_image_update (GimpImage *gimage,
|
||||
gint x,
|
||||
gint y,
|
||||
gint width,
|
||||
gint height);
|
||||
void gimp_image_update_guide (GimpImage *gimage,
|
||||
GimpGuide *guide);
|
||||
void gimp_image_selection_control (GimpImage *gimage,
|
||||
GimpSelectionControl control);
|
||||
|
||||
|
||||
/* layer/channel functions */
|
||||
|
||||
GimpContainer * gimp_image_get_layers (const GimpImage *gimage);
|
||||
GimpContainer * gimp_image_get_channels (const GimpImage *gimage);
|
||||
|
||||
gint gimp_image_get_layer_index (const GimpImage *gimage,
|
||||
const GimpLayer *layer);
|
||||
gint gimp_image_get_channel_index (const GimpImage *gimage,
|
||||
const GimpChannel *channel);
|
||||
GimpLayer * gimp_image_get_active_layer (const GimpImage *gimage);
|
||||
GimpChannel * gimp_image_get_active_channel (const GimpImage *gimage);
|
||||
GimpLayer * gimp_image_get_layer_by_tattoo (const GimpImage *gimage,
|
||||
GimpTattoo tatoo);
|
||||
GimpChannel * gimp_image_get_channel_by_tattoo (const GimpImage *gimage,
|
||||
GimpTattoo tatoo);
|
||||
GimpChannel * gimp_image_get_channel_by_name (const GimpImage *gimage,
|
||||
const gchar *name);
|
||||
GimpChannel * gimp_image_get_mask (const GimpImage *gimage);
|
||||
|
||||
void gimp_image_set_component_active (GimpImage *gimage,
|
||||
ChannelType type,
|
||||
gboolean active);
|
||||
gboolean gimp_image_get_component_active (const GimpImage *gimage,
|
||||
ChannelType type);
|
||||
|
||||
void gimp_image_set_component_visible (GimpImage *gimage,
|
||||
ChannelType type,
|
||||
gboolean visible);
|
||||
gboolean gimp_image_get_component_visible (const GimpImage *gimage,
|
||||
ChannelType type);
|
||||
|
||||
gboolean gimp_image_layer_boundary (const GimpImage *gimage,
|
||||
BoundSeg **segs,
|
||||
gint *n_segs);
|
||||
GimpLayer * gimp_image_set_active_layer (GimpImage *gimage,
|
||||
GimpLayer *layer);
|
||||
GimpChannel * gimp_image_set_active_channel (GimpImage *gimage,
|
||||
GimpChannel *channel);
|
||||
GimpChannel * gimp_image_unset_active_channel (GimpImage *gimage);
|
||||
GimpLayer * gimp_image_pick_correlate_layer (const GimpImage *gimage,
|
||||
gint x,
|
||||
gint y);
|
||||
gboolean gimp_image_raise_layer (GimpImage *gimage,
|
||||
GimpLayer *layer);
|
||||
gboolean gimp_image_lower_layer (GimpImage *gimage,
|
||||
GimpLayer *layer);
|
||||
gboolean gimp_image_raise_layer_to_top (GimpImage *gimage,
|
||||
GimpLayer *layer);
|
||||
gboolean gimp_image_lower_layer_to_bottom (GimpImage *gimage,
|
||||
GimpLayer *layer);
|
||||
gboolean gimp_image_position_layer (GimpImage *gimage,
|
||||
GimpLayer *layer,
|
||||
gint new_index,
|
||||
gboolean push_undo);
|
||||
GimpLayer * gimp_image_merge_visible_layers (GimpImage *gimage,
|
||||
MergeType merge_type);
|
||||
GimpLayer * gimp_image_merge_down (GimpImage *gimage,
|
||||
GimpLayer *current_layer,
|
||||
MergeType merge_type);
|
||||
GimpLayer * gimp_image_flatten (GimpImage *gimage);
|
||||
GimpLayer * gimp_image_merge_layers (GimpImage *gimage,
|
||||
GSList *merge_list,
|
||||
MergeType merge_type);
|
||||
gboolean gimp_image_add_layer (GimpImage *gimage,
|
||||
GimpLayer *layer,
|
||||
gint position);
|
||||
void gimp_image_remove_layer (GimpImage *gimage,
|
||||
GimpLayer *layer);
|
||||
gboolean gimp_image_raise_channel (GimpImage *gimage,
|
||||
GimpChannel *channel);
|
||||
gboolean gimp_image_lower_channel (GimpImage *gimage,
|
||||
GimpChannel *channel);
|
||||
gboolean gimp_image_position_channel (GimpImage *gimage,
|
||||
GimpChannel *channel,
|
||||
gint new_index,
|
||||
gboolean push_undo);
|
||||
gboolean gimp_image_add_channel (GimpImage *gimage,
|
||||
GimpChannel *channel,
|
||||
gint position);
|
||||
void gimp_image_remove_channel (GimpImage *gimage,
|
||||
GimpChannel *channel);
|
||||
|
||||
|
||||
void gimp_image_invalidate_without_render (GimpImage *gimage,
|
||||
gint x,
|
||||
gint y,
|
||||
gint w,
|
||||
gint h,
|
||||
gint x1,
|
||||
gint y1,
|
||||
gint x2,
|
||||
gint y2);
|
||||
void gimp_image_invalidate (GimpImage *gimage,
|
||||
gint x,
|
||||
gint y,
|
||||
gint w,
|
||||
gint h,
|
||||
gint x1,
|
||||
gint y1,
|
||||
gint x2,
|
||||
gint y2);
|
||||
void gimp_image_validate (TileManager *tm,
|
||||
Tile *tile);
|
||||
|
||||
void gimp_image_invalidate_layer_previews (GimpImage *gimage);
|
||||
void gimp_image_invalidate_channel_previews (GimpImage *gimage);
|
||||
|
||||
|
||||
|
||||
/* Access functions */
|
||||
|
||||
gboolean gimp_image_is_empty (const GimpImage *gimage);
|
||||
GimpDrawable * gimp_image_active_drawable (const GimpImage *gimage);
|
||||
|
||||
GimpImageBaseType gimp_image_base_type (const GimpImage *gimage);
|
||||
GimpImageType gimp_image_base_type_with_alpha (const GimpImage *gimage);
|
||||
|
||||
const gchar * gimp_image_filename (const GimpImage *gimage);
|
||||
gboolean gimp_image_undo_is_enabled (const GimpImage *gimage);
|
||||
gboolean gimp_image_undo_enable (GimpImage *gimage);
|
||||
gboolean gimp_image_undo_disable (GimpImage *gimage);
|
||||
gboolean gimp_image_undo_freeze (GimpImage *gimage);
|
||||
gboolean gimp_image_undo_thaw (GimpImage *gimage);
|
||||
void gimp_image_undo_event (GimpImage *gimage,
|
||||
gint event);
|
||||
gint gimp_image_dirty (GimpImage *gimage);
|
||||
gint gimp_image_clean (GimpImage *gimage);
|
||||
void gimp_image_clean_all (GimpImage *gimage);
|
||||
GimpLayer * gimp_image_floating_sel (const GimpImage *gimage);
|
||||
guchar * gimp_image_cmap (const GimpImage *gimage);
|
||||
|
||||
/* projection access functions */
|
||||
void gimp_image_projection_allocate (GimpImage *gimage);
|
||||
void gimp_image_projection_free (GimpImage *gimage);
|
||||
|
||||
TileManager * gimp_image_projection (GimpImage *gimage);
|
||||
GimpImageType gimp_image_projection_type (const GimpImage *gimage);
|
||||
gint gimp_image_projection_bytes (const GimpImage *gimage);
|
||||
gint gimp_image_projection_opacity (const GimpImage *gimage);
|
||||
void gimp_image_projection_realloc (GimpImage *gimage);
|
||||
|
||||
guchar * gimp_image_projection_get_color_at (GimpImage *gimage,
|
||||
gint x,
|
||||
gint y);
|
||||
|
||||
void gimp_image_invalidate (GimpImage *gimage,
|
||||
gint x,
|
||||
gint y,
|
||||
gint w,
|
||||
gint h,
|
||||
gint x1,
|
||||
gint y1,
|
||||
gint x2,
|
||||
gint y2);
|
||||
void gimp_image_invalidate_without_render (GimpImage *gimage,
|
||||
gint x,
|
||||
gint y,
|
||||
gint w,
|
||||
gint h,
|
||||
gint x1,
|
||||
gint y1,
|
||||
gint x2,
|
||||
gint y2);
|
||||
|
||||
|
||||
/* composite access functions */
|
||||
|
||||
TileManager * gimp_image_composite (GimpImage *gimage);
|
||||
GimpImageType gimp_image_composite_type (const GimpImage *gimage);
|
||||
gint gimp_image_composite_bytes (const GimpImage *gimage);
|
||||
|
||||
gboolean gimp_image_preview_valid (const GimpImage *gimage);
|
||||
|
||||
|
||||
#endif /* __GIMP_IMAGE_H__ */
|
||||
#endif /* __GIMP_IMAGE_PROJECTION_H__ */
|
||||
|
||||
Reference in New Issue
Block a user