callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

app/core/gimpdrawable-foreground-extract.c app/core/gimpdrawable-preview.c

Browse Source 
2008-11-10  Michael Natterer  <mitch@gimp.org>

	* app/core/gimpdrawable-foreground-extract.c
	* app/core/gimpdrawable-preview.c 
	* app/core/gimplayer-project.c: use gimp_drawable_get_colormap()
	instead of gimp_image_get_colormap().


svn path=/trunk/; revision=27592
This commit is contained in:
Michael Natterer
2008-11-10 01:43:34 +00:00
committed by Michael Natterer
parent 13ba72e93f
commit 6f6ecb4ffa
4 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2008-11-10 Michael Natterer <mitch@gimp.org>
* app/core/gimpdrawable-foreground-extract.c
* app/core/gimpdrawable-preview.c
* app/core/gimplayer-project.c: use gimp_drawable_get_colormap()
instead of gimp_image_get_colormap().
2008-11-09 Martin Nordholts <martinn@svn.gnome.org> 2008-11-09 Martin Nordholts <martinn@svn.gnome.org>
Bug 558549 – Stroking a single-point path with a paint tool Bug 558549 – Stroking a single-point path with a paint tool

8
app/core/gimpdrawable-foreground-extract.c
View File

@ -32,7 +32,6 @@
#include "gimpdrawable.h" #include "gimpdrawable.h"
#include "gimpdrawable-foreground-extract.h" #include "gimpdrawable-foreground-extract.h"
#include "gimpimage.h" #include "gimpimage.h"
#include "gimpimage-colormap.h"
#include "gimpprogress.h" #include "gimpprogress.h"
#include "gimp-intl.h" #include "gimp-intl.h"
@ -80,7 +79,6 @@ gimp_drawable_foreground_extract_siox_init (GimpDrawable *drawable,
gint width, gint width,
gint height) gint height)
{ {
GimpImage *image;
const guchar *colormap = NULL; const guchar *colormap = NULL;
gboolean intersect; gboolean intersect;
gint offset_x; gint offset_x;
@ -89,10 +87,8 @@ gimp_drawable_foreground_extract_siox_init (GimpDrawable *drawable,
g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), NULL); g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), NULL);
g_return_val_if_fail (gimp_item_is_attached (GIMP_ITEM (drawable)), NULL); g_return_val_if_fail (gimp_item_is_attached (GIMP_ITEM (drawable)), NULL);
image = gimp_item_get_image (GIMP_ITEM (drawable)); if (gimp_drawable_is_indexed (drawable))
colormap = gimp_drawable_get_colormap (drawable);
if (gimp_image_base_type (image) == GIMP_INDEXED)
colormap = gimp_image_get_colormap (image);
gimp_item_get_offset (GIMP_ITEM (drawable), &offset_x, &offset_y); gimp_item_get_offset (GIMP_ITEM (drawable), &offset_x, &offset_y);

5
app/core/gimpdrawable-preview.c
View File

@ -37,7 +37,6 @@
#include "gimp.h" #include "gimp.h"
#include "gimpchannel.h" #include "gimpchannel.h"
#include "gimpimage.h" #include "gimpimage.h"
#include "gimpimage-colormap.h"
#include "gimpdrawable-preview.h" #include "gimpdrawable-preview.h"
#include "gimplayer.h" #include "gimplayer.h"
#include "gimppreviewcache.h" #include "gimppreviewcache.h"
@ -70,7 +69,7 @@ gimp_drawable_get_preview (GimpViewable *viewable,
GimpImage *image; GimpImage *image;
drawable = GIMP_DRAWABLE (viewable); drawable = GIMP_DRAWABLE (viewable);
image = gimp_item_get_image (GIMP_ITEM (drawable)); image = gimp_item_get_image (GIMP_ITEM (drawable));
if (! image->gimp->config->layer_previews) if (! image->gimp->config->layer_previews)
return NULL; return NULL;
@ -154,7 +153,7 @@ gimp_drawable_get_sub_preview (GimpDrawable *drawable,
if (GIMP_IMAGE_TYPE_BASE_TYPE (gimp_drawable_type (drawable)) == GIMP_INDEXED) if (GIMP_IMAGE_TYPE_BASE_TYPE (gimp_drawable_type (drawable)) == GIMP_INDEXED)
return gimp_drawable_indexed_preview (drawable, return gimp_drawable_indexed_preview (drawable,
gimp_image_get_colormap (image), gimp_drawable_get_colormap (drawable),
src_x, src_y, src_width, src_height, src_x, src_y, src_width, src_height,
dest_width, dest_height); dest_width, dest_height);

5
app/core/gimplayer-project.c
View File

@ -30,7 +30,6 @@
#include "paint-funcs/paint-funcs.h" #include "paint-funcs/paint-funcs.h"
#include "gimpimage.h" #include "gimpimage.h"
#include "gimpimage-colormap.h"
#include "gimplayer.h" #include "gimplayer.h"
#include "gimplayer-project.h" #include "gimplayer-project.h"
#include "gimplayermask.h" #include "gimplayermask.h"
@ -108,13 +107,13 @@ gimp_layer_project_region (GimpDrawable *drawable,
break; break;
case GIMP_INDEXED_IMAGE: case GIMP_INDEXED_IMAGE:
colormap = gimp_image_get_colormap (image), colormap = gimp_drawable_get_colormap (drawable),
initial_mode = INITIAL_INDEXED; initial_mode = INITIAL_INDEXED;
combination_mode = COMBINE_INTEN_A_INDEXED; combination_mode = COMBINE_INTEN_A_INDEXED;
break; break;
case GIMP_INDEXEDA_IMAGE: case GIMP_INDEXEDA_IMAGE:
colormap = gimp_image_get_colormap (image), colormap = gimp_drawable_get_colormap (drawable),
initial_mode = INITIAL_INDEXED_ALPHA; initial_mode = INITIAL_INDEXED_ALPHA;
combination_mode = COMBINE_INTEN_A_INDEXED_A; combination_mode = COMBINE_INTEN_A_INDEXED_A;
break; break;