procyberian/gimp
2
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gimp.git synced 2025-07-03 17:33:25 +00:00
Code Issues 1 Projects 1 Releases Packages Wiki Activity Actions

use a much simpler and shorter method of determining how to transform the

Browse source 
2003-09-28  Michael Natterer  <mitch@gimp.org>

	* app/core/gimpimage.c (gimp_image_transform_temp_buf): use a much
	simpler and shorter method of determining how to transform the
	TempBuf.
This commit is contained in:
Michael Natterer 2003-09-27 22:40:18 +00:00 • committed by Michael Natterer
parent 8060800b9d
commit 079101d656
2 changed files with 39 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2003-09-28 Michael Natterer <mitch@gimp.org>
* app/core/gimpimage.c (gimp_image_transform_temp_buf): use a much
simpler and shorter method of determining how to transform the
TempBuf.
2003-09-28 Michael Natterer <mitch@gimp.org> 2003-09-28 Michael Natterer <mitch@gimp.org>
* app/core/gimpdrawable-bucket-fill.c * app/core/gimpdrawable-bucket-fill.c

76
app/core/gimpimage.c
View file

@ -1768,69 +1768,59 @@ gimp_image_transform_temp_buf (const GimpImage *dest_image,
TempBuf *temp_buf, TempBuf *temp_buf,
gboolean *new_buf) gboolean *new_buf)
{ {
TempBuf *ret_buf; TempBuf *ret_buf;
GimpImageType ret_buf_type;
gboolean has_alpha;
gboolean is_rgb;
gint in_bytes;
gint out_bytes;
g_return_val_if_fail (GIMP_IMAGE (dest_image), NULL); g_return_val_if_fail (GIMP_IMAGE (dest_image), NULL);
g_return_val_if_fail (GIMP_DRAWABLE (dest_drawable), NULL); g_return_val_if_fail (GIMP_DRAWABLE (dest_drawable), NULL);
g_return_val_if_fail (temp_buf != NULL, NULL); g_return_val_if_fail (temp_buf != NULL, NULL);
g_return_val_if_fail (new_buf != NULL, NULL); g_return_val_if_fail (new_buf != NULL, NULL);
in_bytes = temp_buf->bytes;
has_alpha = (in_bytes == 2 || in_bytes == 4);
is_rgb = (in_bytes == 3 || in_bytes == 4);
ret_buf_type =
GIMP_IMAGE_TYPE_FROM_BASE_TYPE (gimp_image_base_type (dest_image));
if (has_alpha)
ret_buf_type = GIMP_IMAGE_TYPE_WITH_ALPHA (ret_buf_type);
out_bytes = GIMP_IMAGE_TYPE_BYTES (ret_buf_type);
/* If the pattern doesn't match the image in terms of color type, /* If the pattern doesn't match the image in terms of color type,
* transform it. (ie pattern is RGB, image is indexed) * transform it. (ie pattern is RGB, image is indexed)
*/ */
if (((temp_buf->bytes == 3 || temp_buf->bytes == 4) && if (in_bytes != out_bytes || gimp_drawable_is_indexed (dest_drawable))
! gimp_drawable_is_rgb (dest_drawable)) ||
((temp_buf->bytes == 1 || temp_buf->bytes == 2) &&
! gimp_drawable_is_gray (dest_drawable)))
{ {
guchar *d1, *d2; guchar *src;
gint size, in_bytes, out_bytes; guchar *dest;
gint size;
if (temp_buf->bytes == 2 && gimp_drawable_is_rgb (dest_drawable)) ret_buf = temp_buf_new (temp_buf->width, temp_buf->height,
{ out_bytes, 0, 0, NULL);
ret_buf = temp_buf_new (temp_buf->width,
temp_buf->height,
4, 0, 0, NULL);
}
else if (temp_buf->bytes == 1 && gimp_drawable_is_rgb (dest_drawable))
{
ret_buf = temp_buf_new (temp_buf->width,
temp_buf->height,
3, 0, 0, NULL);
}
else if (temp_buf->bytes == 4 && gimp_drawable_is_gray (dest_drawable))
{
ret_buf = temp_buf_new (temp_buf->width,
temp_buf->height,
2, 0, 0, NULL);
}
else
{
ret_buf = temp_buf_new (temp_buf->width,
temp_buf->height,
1, 0, 0, NULL);
}
d1 = temp_buf_data (temp_buf); src = temp_buf_data (temp_buf);
d2 = temp_buf_data (ret_buf); dest = temp_buf_data (ret_buf);
size = temp_buf->width * temp_buf->height; size = temp_buf->width * temp_buf->height;
in_bytes = temp_buf->bytes;
out_bytes = ret_buf->bytes;
while (size--) while (size--)
{ {
gimp_image_transform_color (dest_image, dest_drawable, d2, gimp_image_transform_color (dest_image, dest_drawable, dest,
(in_bytes == 3 || in_bytes == 4) ? is_rgb ? GIMP_RGB : GIMP_GRAY, src);
GIMP_RGB : GIMP_GRAY, d1);
/* Handle alpha */ /* Handle alpha */
if (in_bytes == 4 || in_bytes == 2 ) if (has_alpha)
d2[out_bytes - 1] = d1[in_bytes - 1]; dest[out_bytes - 1] = src[in_bytes - 1];
d1 += in_bytes; src += in_bytes;
d2 += out_bytes; dest += out_bytes;
} }
*new_buf = TRUE; *new_buf = TRUE;