gimp r27592 - in trunk: . app/core
- From: mitch svn gnome org
- To: svn-commits-list gnome org
- Subject: gimp r27592 - in trunk: . app/core
- Date: Mon, 10 Nov 2008 01:43:34 +0000 (UTC)
Author: mitch
Date: Mon Nov 10 01:43:34 2008
New Revision: 27592
URL: http://svn.gnome.org/viewvc/gimp?rev=27592&view=rev
Log:
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().
Modified:
trunk/ChangeLog
trunk/app/core/gimpdrawable-foreground-extract.c
trunk/app/core/gimpdrawable-preview.c
trunk/app/core/gimplayer-project.c
Modified: trunk/app/core/gimpdrawable-foreground-extract.c
==============================================================================
--- trunk/app/core/gimpdrawable-foreground-extract.c (original)
+++ trunk/app/core/gimpdrawable-foreground-extract.c Mon Nov 10 01:43:34 2008
@@ -32,7 +32,6 @@
#include "gimpdrawable.h"
#include "gimpdrawable-foreground-extract.h"
#include "gimpimage.h"
-#include "gimpimage-colormap.h"
#include "gimpprogress.h"
#include "gimp-intl.h"
@@ -80,7 +79,6 @@
gint width,
gint height)
{
- GimpImage *image;
const guchar *colormap = NULL;
gboolean intersect;
gint offset_x;
@@ -89,10 +87,8 @@
g_return_val_if_fail (GIMP_IS_DRAWABLE (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_image_base_type (image) == GIMP_INDEXED)
- colormap = gimp_image_get_colormap (image);
+ if (gimp_drawable_is_indexed (drawable))
+ colormap = gimp_drawable_get_colormap (drawable);
gimp_item_get_offset (GIMP_ITEM (drawable), &offset_x, &offset_y);
Modified: trunk/app/core/gimpdrawable-preview.c
==============================================================================
--- trunk/app/core/gimpdrawable-preview.c (original)
+++ trunk/app/core/gimpdrawable-preview.c Mon Nov 10 01:43:34 2008
@@ -37,7 +37,6 @@
#include "gimp.h"
#include "gimpchannel.h"
#include "gimpimage.h"
-#include "gimpimage-colormap.h"
#include "gimpdrawable-preview.h"
#include "gimplayer.h"
#include "gimppreviewcache.h"
@@ -70,7 +69,7 @@
GimpImage *image;
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)
return NULL;
@@ -154,7 +153,7 @@
if (GIMP_IMAGE_TYPE_BASE_TYPE (gimp_drawable_type (drawable)) == GIMP_INDEXED)
return gimp_drawable_indexed_preview (drawable,
- gimp_image_get_colormap (image),
+ gimp_drawable_get_colormap (drawable),
src_x, src_y, src_width, src_height,
dest_width, dest_height);
Modified: trunk/app/core/gimplayer-project.c
==============================================================================
--- trunk/app/core/gimplayer-project.c (original)
+++ trunk/app/core/gimplayer-project.c Mon Nov 10 01:43:34 2008
@@ -30,7 +30,6 @@
#include "paint-funcs/paint-funcs.h"
#include "gimpimage.h"
-#include "gimpimage-colormap.h"
#include "gimplayer.h"
#include "gimplayer-project.h"
#include "gimplayermask.h"
@@ -108,13 +107,13 @@
break;
case GIMP_INDEXED_IMAGE:
- colormap = gimp_image_get_colormap (image),
+ colormap = gimp_drawable_get_colormap (drawable),
initial_mode = INITIAL_INDEXED;
combination_mode = COMBINE_INTEN_A_INDEXED;
break;
case GIMP_INDEXEDA_IMAGE:
- colormap = gimp_image_get_colormap (image),
+ colormap = gimp_drawable_get_colormap (drawable),
initial_mode = INITIAL_INDEXED_ALPHA;
combination_mode = COMBINE_INTEN_A_INDEXED_A;
break;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]