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

rendering functions seem to work for all image types and zoom levels. 

Sun Mar 14 12:46:41 EST 1999 Matt Wilson <msw@gimp.org>

	* app/image_render.c: rendering functions seem to work for all
	image types and zoom levels.
This commit is contained in:
EST 1999 Matt Wilson 1999-03-14 18:25:41 +00:00 committed by Matt Wilson
parent 1b52e39b0a
commit ab91b338a1
4 changed files with 60 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
ChangeLog
View File

@ -1,15 +1,20 @@
Sun Mar 14 12:46:41 EST 1999 Matt Wilson <msw@gimp.org>
* app/image_render.c: rendering functions seem to work for all
image types and zoom levels.
Sat Mar 13 21:07:34 EST 1999 Matt Wilson <msw@gimp.org>
* image_render.c: Off by a factor of 3 vertical. GRAY and INDEXED
* app/image_render.c: Off by a factor of 3 vertical. GRAY and INDEXED
work. The rest appear to have endian and bitshift errors.
* gximage.[ch]: more gdk_rgb functionality
* gdisplay.c: updated to new gximage_put arguments
* app/gximage.[ch]: more gdk_rgb functionality
* app/gdisplay.c: updated to new gximage_put arguments
Sat Mar 13 21:07:34 EST 1999 Matt Wilson <msw@gimp.org>
* gdisplay.c, gximage.[ch], image_render.c: First steps to migrate
to gdk_rgb displays. You get half of the 256x256 image rendered
properly now.
* app/gdisplay.c, app/gximage.[ch], app/image_render.c: First
steps to migrate to gdk_rgb displays. You get half of the 256x256
image rendered properly now.
Sat Mar 13 20:22:00 EST 1999 Matt Wilson <msw@gimp.org>
@ -41,7 +46,7 @@ Sat Jan 2 15:04:16 PST 1999 Manish Singh <yosh@gimp.org>
correction isn't enabled
Wed Nov 18 17:35:38 MET 1998 Sven Neumann <sven@gimp.org>
* app/app_procs.c: fixed a longstanding bug in the splash-screen.
Finally it shouldn't resize any more even with LARGE fonts.
@ -133,7 +138,7 @@ Sun Sep 27 14:55:23 PDT 1998 Manish Singh <yosh@gimp.org>
Sun Sep 27 14:51:47 PDT 1998 Manish Singh <yosh@gimp.org>
* gimptool.in: sync with 1.1 gimptool
* gimptool.1: man page update
Mon Sep 21 02:11:27 PDT 1998 Manish Singh <yosh@gimp.org>
@ -148,7 +153,7 @@ Mon Sep 21 02:11:27 PDT 1998 Manish Singh <yosh@gimp.org>
* plug-ins/script-fu/script-fu.c
* plug-ins/script-fu/script-fu-console.[ch]: added an eval
PDB interface for running arbitrary scheme code
* app/batch.c: redid batch mode to use script-fu-eval
* app/main.c: fixed command line parsing for batch mode and
@ -251,8 +256,8 @@ Thu Jul 23 10:30:12 PDT 1998 Manish Singh <yosh@gimp.org>
Wed Jul 22 23:32:50 MEST 1998 Sven Neumann <sven@gimp.org>
* docs/quick_reference.ps
* docs/quick_reference.tar.gz:
Updated the Quick Reference Sheet to the much improved version made
* docs/quick_reference.tar.gz:
Updated the Quick Reference Sheet to the much improved version made
by Sven Anders <anderss@fmi.uni-passau.de>.
Fri Jul 17 01:37:21 PDT 1998 Manish Singh <yosh@gimp.org>
@ -300,7 +305,7 @@ Tue Jul 7 13:52:23 EST 1998 Kevin Cozens <kcozens@interlog.com>
foreground as a fill type option.
Mon Jul 6 5:12:00 CST 1998 Seth Burgess <sjburges@gimp.org>
* plug-ins/gbr/gbr.c: added gbr version 1 support
Mon Jul 6 12:07:37 PDT 1998 Manish Singh <yosh@gimp.org>

53
app/display/gimpdisplay-render.c
View File

@ -295,7 +295,7 @@ render_image_indexed (RenderInfo *info)
dest = info->dest;
g_return_if_fail (src != NULL);
for (x = info->x; x < xe; x++)
{
val = src[INDEXED_PIX] * 3;
@ -312,15 +312,7 @@ render_image_indexed (RenderInfo *info)
initial = FALSE;
if (error >= 1.0)
{
info->src_y += (int)error;
error -= (int)error;
info->src = render_image_tile_fault (info);
initial = TRUE;
}
error += step;
}
}
@ -410,14 +402,11 @@ render_image_indexed_a (RenderInfo *info)
initial = FALSE;
if (error >= 1.0)
if (((y + 1) % info->scaledest) == 0)
{
info->src_y += (int)error;
error -= (int)error;
info->src_y += info->scalesrc;
info->src = render_image_tile_fault (info);
initial = TRUE;
}
error += step;
}
}
@ -463,7 +452,7 @@ render_image_gray (RenderInfo *info)
{
src = info->src;
dest = info->dest;
g_return_if_fail (src != NULL);
for (x = info->x; x < xe; x++)
@ -481,16 +470,11 @@ render_image_gray (RenderInfo *info)
info->dest += info->dest_bpl;
initial = FALSE;
if (error >= 1.0)
if (((y + 1) % info->scaledest) == 0)
{
info->src_y += (int)error;
error -= (int)error;
info->src_y += info->scalesrc;
info->src = render_image_tile_fault (info);
initial = TRUE;
}
error += step;
}
}
@ -567,12 +551,10 @@ render_image_gray_a (RenderInfo *info)
initial = FALSE;
if (error >= 1.0)
if (((y + 1) % info->scaledest) == 0)
{
info->src_y += (int)error;
error -= (int)error;
info->src_y += info->scalesrc;
info->src = render_image_tile_fault (info);
initial = TRUE;
}
error += step;
@ -621,7 +603,7 @@ render_image_rgb (RenderInfo *info)
dest = info->dest;
g_return_if_fail (src != NULL);
/* replace this with memcpy, or better yet, avoid it altogether? */
for (x = info->x; x < xe; x++)
{
@ -638,15 +620,11 @@ render_image_rgb (RenderInfo *info)
initial = FALSE;
if (error >= 1.0)
if (((y + 1) % info->scaledest) == 0)
{
info->src_y += (int)error;
error -= (int)error;
info->src_y += info->scalesrc;
info->src = render_image_tile_fault (info);
initial = TRUE;
}
error += step;
}
}
@ -762,12 +740,10 @@ render_image_rgb_a (RenderInfo *info)
initial = FALSE;
if (error >= 1.0)
if (((y + 1) % info->scaledest) == 0)
{
info->src_y += (int)error;
error -= (int)error;
info->src_y += info->scalesrc;
info->src = render_image_tile_fault (info);
initial = TRUE;
}
error += step;
@ -884,7 +860,7 @@ render_image_tile_fault (RenderInfo *info)
(info->src_x % TILE_WIDTH)) * tile->bpp);
scale = info->scale;
step = info->scalesrc;
step = info->scalesrc * info->src_bpp;
dest = tile_buf;
x = info->src_x;
@ -920,4 +896,3 @@ render_image_tile_fault (RenderInfo *info)
tile_unref (tile, FALSE);
return tile_buf;
}

53
app/display/gimpdisplayshell-render.c
View File

@ -295,7 +295,7 @@ render_image_indexed (RenderInfo *info)
dest = info->dest;
g_return_if_fail (src != NULL);
for (x = info->x; x < xe; x++)
{
val = src[INDEXED_PIX] * 3;
@ -312,15 +312,7 @@ render_image_indexed (RenderInfo *info)
initial = FALSE;
if (error >= 1.0)
{
info->src_y += (int)error;
error -= (int)error;
info->src = render_image_tile_fault (info);
initial = TRUE;
}
error += step;
}
}
@ -410,14 +402,11 @@ render_image_indexed_a (RenderInfo *info)
initial = FALSE;
if (error >= 1.0)
if (((y + 1) % info->scaledest) == 0)
{
info->src_y += (int)error;
error -= (int)error;
info->src_y += info->scalesrc;
info->src = render_image_tile_fault (info);
initial = TRUE;
}
error += step;
}
}
@ -463,7 +452,7 @@ render_image_gray (RenderInfo *info)
{
src = info->src;
dest = info->dest;
g_return_if_fail (src != NULL);
for (x = info->x; x < xe; x++)
@ -481,16 +470,11 @@ render_image_gray (RenderInfo *info)
info->dest += info->dest_bpl;
initial = FALSE;
if (error >= 1.0)
if (((y + 1) % info->scaledest) == 0)
{
info->src_y += (int)error;
error -= (int)error;
info->src_y += info->scalesrc;
info->src = render_image_tile_fault (info);
initial = TRUE;
}
error += step;
}
}
@ -567,12 +551,10 @@ render_image_gray_a (RenderInfo *info)
initial = FALSE;
if (error >= 1.0)
if (((y + 1) % info->scaledest) == 0)
{
info->src_y += (int)error;
error -= (int)error;
info->src_y += info->scalesrc;
info->src = render_image_tile_fault (info);
initial = TRUE;
}
error += step;
@ -621,7 +603,7 @@ render_image_rgb (RenderInfo *info)
dest = info->dest;
g_return_if_fail (src != NULL);
/* replace this with memcpy, or better yet, avoid it altogether? */
for (x = info->x; x < xe; x++)
{
@ -638,15 +620,11 @@ render_image_rgb (RenderInfo *info)
initial = FALSE;
if (error >= 1.0)
if (((y + 1) % info->scaledest) == 0)
{
info->src_y += (int)error;
error -= (int)error;
info->src_y += info->scalesrc;
info->src = render_image_tile_fault (info);
initial = TRUE;
}
error += step;
}
}
@ -762,12 +740,10 @@ render_image_rgb_a (RenderInfo *info)
initial = FALSE;
if (error >= 1.0)
if (((y + 1) % info->scaledest) == 0)
{
info->src_y += (int)error;
error -= (int)error;
info->src_y += info->scalesrc;
info->src = render_image_tile_fault (info);
initial = TRUE;
}
error += step;
@ -884,7 +860,7 @@ render_image_tile_fault (RenderInfo *info)
(info->src_x % TILE_WIDTH)) * tile->bpp);
scale = info->scale;
step = info->scalesrc;
step = info->scalesrc * info->src_bpp;
dest = tile_buf;
x = info->src_x;
@ -920,4 +896,3 @@ render_image_tile_fault (RenderInfo *info)
tile_unref (tile, FALSE);
return tile_buf;
}

53
app/image_render.c
View File

@ -295,7 +295,7 @@ render_image_indexed (RenderInfo *info)
dest = info->dest;
g_return_if_fail (src != NULL);
for (x = info->x; x < xe; x++)
{
val = src[INDEXED_PIX] * 3;
@ -312,15 +312,7 @@ render_image_indexed (RenderInfo *info)
initial = FALSE;
if (error >= 1.0)
{
info->src_y += (int)error;
error -= (int)error;
info->src = render_image_tile_fault (info);
initial = TRUE;
}
error += step;
}
}
@ -410,14 +402,11 @@ render_image_indexed_a (RenderInfo *info)
initial = FALSE;
if (error >= 1.0)
if (((y + 1) % info->scaledest) == 0)
{
info->src_y += (int)error;
error -= (int)error;
info->src_y += info->scalesrc;
info->src = render_image_tile_fault (info);
initial = TRUE;
}
error += step;
}
}
@ -463,7 +452,7 @@ render_image_gray (RenderInfo *info)
{
src = info->src;
dest = info->dest;
g_return_if_fail (src != NULL);
for (x = info->x; x < xe; x++)
@ -481,16 +470,11 @@ render_image_gray (RenderInfo *info)
info->dest += info->dest_bpl;
initial = FALSE;
if (error >= 1.0)
if (((y + 1) % info->scaledest) == 0)
{
info->src_y += (int)error;
error -= (int)error;
info->src_y += info->scalesrc;
info->src = render_image_tile_fault (info);
initial = TRUE;
}
error += step;
}
}
@ -567,12 +551,10 @@ render_image_gray_a (RenderInfo *info)
initial = FALSE;
if (error >= 1.0)
if (((y + 1) % info->scaledest) == 0)
{
info->src_y += (int)error;
error -= (int)error;
info->src_y += info->scalesrc;
info->src = render_image_tile_fault (info);
initial = TRUE;
}
error += step;
@ -621,7 +603,7 @@ render_image_rgb (RenderInfo *info)
dest = info->dest;
g_return_if_fail (src != NULL);
/* replace this with memcpy, or better yet, avoid it altogether? */
for (x = info->x; x < xe; x++)
{
@ -638,15 +620,11 @@ render_image_rgb (RenderInfo *info)
initial = FALSE;
if (error >= 1.0)
if (((y + 1) % info->scaledest) == 0)
{
info->src_y += (int)error;
error -= (int)error;
info->src_y += info->scalesrc;
info->src = render_image_tile_fault (info);
initial = TRUE;
}
error += step;
}
}
@ -762,12 +740,10 @@ render_image_rgb_a (RenderInfo *info)
initial = FALSE;
if (error >= 1.0)
if (((y + 1) % info->scaledest) == 0)
{
info->src_y += (int)error;
error -= (int)error;
info->src_y += info->scalesrc;
info->src = render_image_tile_fault (info);
initial = TRUE;
}
error += step;
@ -884,7 +860,7 @@ render_image_tile_fault (RenderInfo *info)
(info->src_x % TILE_WIDTH)) * tile->bpp);
scale = info->scale;
step = info->scalesrc;
step = info->scalesrc * info->src_bpp;
dest = tile_buf;
x = info->src_x;
@ -920,4 +896,3 @@ render_image_tile_fault (RenderInfo *info)
tile_unref (tile, FALSE);
return tile_buf;
}