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

app/core/Makefile.am new files holding gimp_drawable_convert_rgb() and 

2005-02-18  Sven Neumann  <sven@gimp.org>

	* app/core/Makefile.am
	* app/core/gimpdrawable-convert.[ch]: new files holding
	gimp_drawable_convert_rgb() and gimp_drawable_convert_grayscale()
	moved out of gimpimage-convert.[ch].

	* app/core/gimpchannel.c
	* app/core/gimpimage-convert.[ch]
	* app/core/gimplayer.c: changed accordingly.
This commit is contained in:
Sven Neumann 2005-02-18 16:16:24 +00:00 committed by Sven Neumann
parent 6300a9632c
commit 52d6f00e56
10 changed files with 293 additions and 217 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,3 +1,14 @@
2005-02-18 Sven Neumann <sven@gimp.org>
* app/core/Makefile.am
* app/core/gimpdrawable-convert.[ch]: new files holding
gimp_drawable_convert_rgb() and gimp_drawable_convert_grayscale()
moved out of gimpimage-convert.[ch].
* app/core/gimpchannel.c
* app/core/gimpimage-convert.[ch]
* app/core/gimplayer.c: changed accordingly.
2005-02-18 Sven Neumann <sven@gimp.org>
* app/core/gimpimage-convert.c: some simple loop unrolling,

2
app/core/Makefile.am
View File

@ -80,6 +80,8 @@ libappcore_a_sources = \
gimpdrawable-bucket-fill.h \
gimpdrawable-combine.c \
gimpdrawable-combine.h \
gimpdrawable-convert.c \
gimpdrawable-convert.h \
gimpdrawable-desaturate.c \
gimpdrawable-desaturate.h \
gimpdrawable-equalize.c \

2
app/core/gimpchannel.c
View File

@ -42,8 +42,8 @@
#include "gimp.h"
#include "gimp-utils.h"
#include "gimpcontainer.h"
#include "gimpdrawable-convert.h"
#include "gimpimage.h"
#include "gimpimage-convert.h"
#include "gimpimage-qmask.h"
#include "gimpimage-undo.h"
#include "gimpimage-undo-push.h"

237
app/core/gimpdrawable-convert.c Normal file
View File

@ -0,0 +1,237 @@
/* The GIMP -- an image manipulation program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
* Copyright (C) 1997-2004 Adam D. Moss <adam@gimp.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#include "config.h"
#include <glib-object.h>
#include "libgimpcolor/gimpcolor.h"
#include "core-types.h"
#include "base/pixel-region.h"
#include "base/tile-manager.h"
#include "gimpdrawable.h"
#include "gimpdrawable-convert.h"
void
gimp_drawable_convert_rgb (GimpDrawable *drawable,
TileManager *new_tiles,
GimpImageBaseType old_base_type)
{
PixelRegion srcPR, destPR;
gint row, col;
gint offset;
gint has_alpha;
const guchar *src, *s;
guchar *dest, *d;
const guchar *cmap;
gpointer pr;
g_return_if_fail (GIMP_IS_DRAWABLE (drawable));
g_return_if_fail (new_tiles != NULL);
has_alpha = gimp_drawable_has_alpha (drawable);
g_return_if_fail (tile_manager_bpp (new_tiles) == (has_alpha ? 4 : 3));
cmap = gimp_drawable_cmap (drawable);
pixel_region_init (&srcPR, drawable->tiles,
0, 0,
GIMP_ITEM (drawable)->width,
GIMP_ITEM (drawable)->height,
FALSE);
pixel_region_init (&destPR, new_tiles,
0, 0,
GIMP_ITEM (drawable)->width,
GIMP_ITEM (drawable)->height,
TRUE);
switch (old_base_type)
{
case GIMP_GRAY:
for (pr = pixel_regions_register (2, &srcPR, &destPR);
pr != NULL;
pr = pixel_regions_process (pr))
{
src = srcPR.data;
dest = destPR.data;
for (row = 0; row < srcPR.h; row++)
{
s = src;
d = dest;
for (col = 0; col < srcPR.w; col++)
{
d[RED_PIX] = *s;
d[GREEN_PIX] = *s;
d[BLUE_PIX] = *s;
d += 3;
s++;
if (has_alpha)
*d++ = *s++;
}
src += srcPR.rowstride;
dest += destPR.rowstride;
}
}
break;
case GIMP_INDEXED:
for (pr = pixel_regions_register (2, &srcPR, &destPR);
pr != NULL;
pr = pixel_regions_process (pr))
{
src = srcPR.data;
dest = destPR.data;
for (row = 0; row < srcPR.h; row++)
{
s = src;
d = dest;
for (col = 0; col < srcPR.w; col++)
{
offset = *s++ * 3;
d[RED_PIX] = cmap[offset + 0];
d[GREEN_PIX] = cmap[offset + 1];
d[BLUE_PIX] = cmap[offset + 2];
d += 3;
if (has_alpha)
*d++ = *s++;
}
src += srcPR.rowstride;
dest += destPR.rowstride;
}
}
break;
default:
break;
}
}
void
gimp_drawable_convert_grayscale (GimpDrawable *drawable,
TileManager *new_tiles,
GimpImageBaseType old_base_type)
{
PixelRegion srcPR, destPR;
gint row, col;
gint offset, val;
gboolean has_alpha;
const guchar *src, *s;
guchar *dest, *d;
const guchar *cmap;
gpointer pr;
g_return_if_fail (GIMP_IS_DRAWABLE (drawable));
g_return_if_fail (new_tiles != NULL);
has_alpha = gimp_drawable_has_alpha (drawable);
g_return_if_fail (tile_manager_bpp (new_tiles) == (has_alpha ? 2 : 1));
cmap = gimp_drawable_cmap (drawable);
pixel_region_init (&srcPR, drawable->tiles,
0, 0,
GIMP_ITEM (drawable)->width,
GIMP_ITEM (drawable)->height,
FALSE);
pixel_region_init (&destPR, new_tiles,
0, 0,
GIMP_ITEM (drawable)->width,
GIMP_ITEM (drawable)->height,
TRUE);
switch (old_base_type)
{
case GIMP_RGB:
for (pr = pixel_regions_register (2, &srcPR, &destPR);
pr != NULL;
pr = pixel_regions_process (pr))
{
src = srcPR.data;
dest = destPR.data;
for (row = 0; row < srcPR.h; row++)
{
s = src;
d = dest;
for (col = 0; col < srcPR.w; col++)
{
val = GIMP_RGB_INTENSITY (s[RED_PIX],
s[GREEN_PIX],
s[BLUE_PIX]) + 0.5;
*d++ = (guchar) val;
s += 3;
if (has_alpha)
*d++ = *s++;
}
src += srcPR.rowstride;
dest += destPR.rowstride;
}
}
break;
case GIMP_INDEXED:
for (pr = pixel_regions_register (2, &srcPR, &destPR);
pr != NULL;
pr = pixel_regions_process (pr))
{
src = srcPR.data;
dest = destPR.data;
for (row = 0; row < srcPR.h; row++)
{
s = src;
d = dest;
for (col = 0; col < srcPR.w; col++)
{
offset = *s++ * 3;
val = GIMP_RGB_INTENSITY (cmap[offset+0],
cmap[offset+1],
cmap[offset+2]) + 0.5;
*d++ = (guchar) val;
if (has_alpha)
*d++ = *s++;
}
src += srcPR.rowstride;
dest += destPR.rowstride;
}
}
break;
default:
break;
}
}

31
app/core/gimpdrawable-convert.h Normal file
View File

@ -0,0 +1,31 @@
/* The GIMP -- an image manipulation program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef __GIMP_DRAWABLE_CONVERT_H__
#define __GIMP_DRAWABLE_CONVERT_H__
void gimp_drawable_convert_rgb (GimpDrawable *drawable,
TileManager *new_tiles,
GimpImageBaseType old_base_type);
void gimp_drawable_convert_grayscale (GimpDrawable *drawable,
TileManager *new_tiles,
GimpImageBaseType old_base_type);
#endif /* __GIMP_DRAWABLE_CONVERT_H__ */

208
app/core/gimpimage-convert.c
View File

@ -141,6 +141,7 @@
#include "gimp.h"
#include "gimpdrawable.h"
#include "gimpdrawable-convert.h"
#include "gimpimage.h"
#include "gimpimage-colormap.h"
#include "gimpimage-undo.h"
@ -752,7 +753,7 @@ remap_indexed_layer (GimpLayer *layer,
}
}
int
static int
color_quicksort (const void *c1,
const void *c2)
{
@ -1096,211 +1097,6 @@ gimp_image_convert (GimpImage *gimage,
}
void
gimp_drawable_convert_rgb (GimpDrawable *drawable,
TileManager *new_tiles,
GimpImageBaseType old_base_type)
{
PixelRegion srcPR, destPR;
gint row, col;
gint offset;
gint has_alpha;
const guchar *src, *s;
guchar *dest, *d;
const guchar *cmap;
gpointer pr;
g_return_if_fail (GIMP_IS_DRAWABLE (drawable));
g_return_if_fail (new_tiles != NULL);
has_alpha = gimp_drawable_has_alpha (drawable);
g_return_if_fail (tile_manager_bpp (new_tiles) == (has_alpha ? 4 : 3));
cmap = gimp_drawable_cmap (drawable);
pixel_region_init (&srcPR, drawable->tiles,
0, 0,
GIMP_ITEM (drawable)->width,
GIMP_ITEM (drawable)->height,
FALSE);
pixel_region_init (&destPR, new_tiles,
0, 0,
GIMP_ITEM (drawable)->width,
GIMP_ITEM (drawable)->height,
TRUE);
switch (old_base_type)
{
case GIMP_GRAY:
for (pr = pixel_regions_register (2, &srcPR, &destPR);
pr != NULL;
pr = pixel_regions_process (pr))
{
src = srcPR.data;
dest = destPR.data;
for (row = 0; row < srcPR.h; row++)
{
s = src;
d = dest;
for (col = 0; col < srcPR.w; col++)
{
d[RED_PIX] = *s;
d[GREEN_PIX] = *s;
d[BLUE_PIX] = *s;
d += 3;
s++;
if (has_alpha)
*d++ = *s++;
}
src += srcPR.rowstride;
dest += destPR.rowstride;
}
}
break;
case GIMP_INDEXED:
for (pr = pixel_regions_register (2, &srcPR, &destPR);
pr != NULL;
pr = pixel_regions_process (pr))
{
src = srcPR.data;
dest = destPR.data;
for (row = 0; row < srcPR.h; row++)
{
s = src;
d = dest;
for (col = 0; col < srcPR.w; col++)
{
offset = *s++ * 3;
d[RED_PIX] = cmap[offset + 0];
d[GREEN_PIX] = cmap[offset + 1];
d[BLUE_PIX] = cmap[offset + 2];
d += 3;
if (has_alpha)
*d++ = *s++;
}
src += srcPR.rowstride;
dest += destPR.rowstride;
}
}
break;
default:
break;
}
}
void
gimp_drawable_convert_grayscale (GimpDrawable *drawable,
TileManager *new_tiles,
GimpImageBaseType old_base_type)
{
PixelRegion srcPR, destPR;
gint row, col;
gint offset, val;
gboolean has_alpha;
const guchar *src, *s;
guchar *dest, *d;
const guchar *cmap;
gpointer pr;
g_return_if_fail (GIMP_IS_DRAWABLE (drawable));
g_return_if_fail (new_tiles != NULL);
has_alpha = gimp_drawable_has_alpha (drawable);
g_return_if_fail (tile_manager_bpp (new_tiles) == (has_alpha ? 2 : 1));
cmap = gimp_drawable_cmap (drawable);
pixel_region_init (&srcPR, drawable->tiles,
0, 0,
GIMP_ITEM (drawable)->width,
GIMP_ITEM (drawable)->height,
FALSE);
pixel_region_init (&destPR, new_tiles,
0, 0,
GIMP_ITEM (drawable)->width,
GIMP_ITEM (drawable)->height,
TRUE);
switch (old_base_type)
{
case GIMP_RGB:
for (pr = pixel_regions_register (2, &srcPR, &destPR);
pr != NULL;
pr = pixel_regions_process (pr))
{
src = srcPR.data;
dest = destPR.data;
for (row = 0; row < srcPR.h; row++)
{
s = src;
d = dest;
for (col = 0; col < srcPR.w; col++)
{
val = GIMP_RGB_INTENSITY (s[RED_PIX],
s[GREEN_PIX],
s[BLUE_PIX]) + 0.5;
*d++ = (guchar) val;
s += 3;
if (has_alpha)
*d++ = *s++;
}
src += srcPR.rowstride;
dest += destPR.rowstride;
}
}
break;
case GIMP_INDEXED:
for (pr = pixel_regions_register (2, &srcPR, &destPR);
pr != NULL;
pr = pixel_regions_process (pr))
{
src = srcPR.data;
dest = destPR.data;
for (row = 0; row < srcPR.h; row++)
{
s = src;
d = dest;
for (col = 0; col < srcPR.w; col++)
{
offset = *s++ * 3;
val = GIMP_RGB_INTENSITY (cmap[offset+0],
cmap[offset+1],
cmap[offset+2]) + 0.5;
*d++ = (guchar) val;
if (has_alpha)
*d++ = *s++;
}
src += srcPR.rowstride;
dest += destPR.rowstride;
}
}
break;
default:
break;
}
}
/*
* Indexed color conversion machinery
*/

7
app/core/gimpimage-convert.h
View File

@ -36,12 +36,5 @@ void gimp_image_convert (GimpImage *gimage,
GimpPalette *custom_palette,
GimpProgress *progress);
void gimp_drawable_convert_rgb (GimpDrawable *drawable,
TileManager *new_tiles,
GimpImageBaseType old_base_type);
void gimp_drawable_convert_grayscale (GimpDrawable *drawable,
TileManager *new_tiles,
GimpImageBaseType old_base_type);
#endif /* __GIMP_IMAGE_CONVERT_H__ */

2
app/core/gimplayer.c
View File

@ -37,8 +37,8 @@
#include "gimp-utils.h"
#include "gimpcontext.h"
#include "gimpcontainer.h"
#include "gimpdrawable-convert.h"
#include "gimpdrawable-invert.h"
#include "gimpimage-convert.h"
#include "gimpimage-undo-push.h"
#include "gimpimage-undo.h"
#include "gimpimage.h"

1
devel-docs/app/app-docs.sgml
View File

@ -201,6 +201,7 @@
<xi:include href="xml/gimpdrawable-blend.xml" />
<xi:include href="xml/gimpdrawable-bucket-fill.xml" />
<xi:include href="xml/gimpdrawable-combine.xml" />
<xi:include href="xml/gimpdrawable-convert.xml" />
<xi:include href="xml/gimpdrawable-desaturate.xml" />
<xi:include href="xml/gimpdrawable-equalize.xml" />
<xi:include href="xml/gimpdrawable-histogram.xml" />

9
devel-docs/app/app-sections.txt
View File

@ -6191,6 +6191,13 @@ gimp_drawable_real_apply_region
gimp_drawable_real_replace_region
</SECTION>
<SECTION>
<FILE>gimpdrawable-convert</FILE>
<TITLE>GimpDrawable-convert</TITLE>
gimp_drawable_convert_rgb
gimp_drawable_convert_grayscale
</SECTION>
<SECTION>
<FILE>gimpdrawable-desaturate</FILE>
<TITLE>GimpDrawable-desaturate</TITLE>
@ -6282,8 +6289,6 @@ gimp_image_contiguous_region_by_color
<TITLE>GimpImage-convert</TITLE>
MAXNUMCOLORS
gimp_image_convert
gimp_drawable_convert_rgb
gimp_drawable_convert_grayscale
</SECTION>
<SECTION>