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

Implement GimpDrawable::convert_type() 

Move pixel conversion code from gimp_layer_convert() to the new
gimp_layer_convert_type() implementation and call
gimp_drawable_convert_type() from convert(). In convert_type(), simply
chain up to convert to gray and rgb and only implement indexed
conversion ourselves.
This commit is contained in:
Michael Natterer 2009-09-11 21:28:52 +02:00
parent 86a264e9f2
commit c6fb6d0ceb
1 changed files with 59 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
app/core/gimplayer.c
View File

@ -151,6 +151,9 @@ static gint64 gimp_layer_estimate_memsize (const GimpDrawable *drawable,
static void gimp_layer_invalidate_boundary (GimpDrawable *drawable);
static void gimp_layer_get_active_components (const GimpDrawable *drawable,
gboolean *active);
static void gimp_layer_convert_type (GimpDrawable *drawable,
GimpImage *dest_image,
GimpImageBaseType new_base_type);
static gint gimp_layer_get_opacity_at (GimpPickable *pickable,
gint x,
@ -261,6 +264,7 @@ gimp_layer_class_init (GimpLayerClass *klass)
drawable_class->estimate_memsize = gimp_layer_estimate_memsize;
drawable_class->invalidate_boundary = gimp_layer_invalidate_boundary;
drawable_class->get_active_components = gimp_layer_get_active_components;
drawable_class->convert_type = gimp_layer_convert_type;
drawable_class->project_region = gimp_layer_project_region;
klass->opacity_changed = NULL;
@ -541,55 +545,7 @@ gimp_layer_convert (GimpItem *item,
new_base_type = gimp_image_base_type (dest_image);
if (old_base_type != new_base_type)
{
switch (new_base_type)
{
case GIMP_RGB:
gimp_drawable_convert_rgb (drawable);
break;
case GIMP_GRAY:
gimp_drawable_convert_grayscale (drawable);
break;
case GIMP_INDEXED:
{
TileManager *new_tiles;
GimpImageType new_type;
PixelRegion layerPR;
PixelRegion newPR;
new_type = GIMP_IMAGE_TYPE_FROM_BASE_TYPE (new_base_type);
if (gimp_drawable_has_alpha (drawable))
new_type = GIMP_IMAGE_TYPE_WITH_ALPHA (new_type);
new_tiles = tile_manager_new (gimp_item_get_width (item),
gimp_item_get_height (item),
GIMP_IMAGE_TYPE_BYTES (new_type));
pixel_region_init (&layerPR, gimp_drawable_get_tiles (drawable),
0, 0,
gimp_item_get_width (item),
gimp_item_get_height (item),
FALSE);
pixel_region_init (&newPR, new_tiles,
0, 0,
gimp_item_get_width (item),
gimp_item_get_height (item),
TRUE);
gimp_layer_transform_color (dest_image,
&layerPR, gimp_drawable_type (drawable),
&newPR, new_type);
gimp_drawable_set_tiles (drawable, FALSE, NULL,
new_tiles, new_type);
tile_manager_unref (new_tiles);
}
break;
}
}
gimp_drawable_convert_type (drawable, dest_image, new_base_type);
if (layer->mask)
gimp_item_set_image (GIMP_ITEM (layer->mask), dest_image);
@ -899,6 +855,60 @@ gimp_layer_get_active_components (const GimpDrawable *drawable,
active[gimp_drawable_bytes (drawable) - 1] = FALSE;
}
static void
gimp_layer_convert_type (GimpDrawable *drawable,
GimpImage *dest_image,
GimpImageBaseType new_base_type)
{
switch (new_base_type)
{
case GIMP_RGB:
case GIMP_GRAY:
GIMP_DRAWABLE_CLASS (parent_class)->convert_type (drawable, dest_image,
new_base_type);
break;
case GIMP_INDEXED:
{
GimpItem *item = GIMP_ITEM (drawable);
TileManager *new_tiles;
GimpImageType new_type;
PixelRegion layerPR;
PixelRegion newPR;
new_type = GIMP_IMAGE_TYPE_FROM_BASE_TYPE (new_base_type);
if (gimp_drawable_has_alpha (drawable))
new_type = GIMP_IMAGE_TYPE_WITH_ALPHA (new_type);
new_tiles = tile_manager_new (gimp_item_get_width (item),
gimp_item_get_height (item),
GIMP_IMAGE_TYPE_BYTES (new_type));
pixel_region_init (&layerPR, gimp_drawable_get_tiles (drawable),
0, 0,
gimp_item_get_width (item),
gimp_item_get_height (item),
FALSE);
pixel_region_init (&newPR, new_tiles,
0, 0,
gimp_item_get_width (item),
gimp_item_get_height (item),
TRUE);
gimp_layer_transform_color (dest_image,
&layerPR, gimp_drawable_type (drawable),
&newPR, new_type);
gimp_drawable_set_tiles (drawable,
gimp_item_is_attached (GIMP_ITEM (drawable)),
NULL,
new_tiles, new_type);
tile_manager_unref (new_tiles);
}
}
}
static gint
gimp_layer_get_opacity_at (GimpPickable *pickable,
gint x,