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

Fixed a thinko/bug in the recent optimizations. 

Sun Jan 17 18:28:58 GMT 1999 Adam D. Moss <adam@gimp.org>

        * app/gdisplay.c app/paint_funcs.c: Fixed a thinko/bug
        in the recent optimizations.
This commit is contained in:
GMT 1999 Adam D. Moss 1999-01-17 18:32:59 +00:00 committed by Adam D. Moss
parent 64a6d4571d
commit 9277932a67
6 changed files with 27 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Sun Jan 17 18:28:58 GMT 1999 Adam D. Moss <adam@gimp.org>
* app/gdisplay.c app/paint_funcs.c: Fixed a thinko/bug
in the recent optimizations.
Sun Jan 17 16:56:25 GMT 1999 Adam D. Moss <adam@gimp.org>
* app/blend.c app/bucket_fill.c app/convert.c app/crop.c

3
app/core/gimpprojection.c
View File

@ -211,11 +211,8 @@ gdisplay_delete (GDisplay *gdisp)
deactivate the idlerendering thread before deletion! */
if (gdisp->idle_render.active)
{
printf(_("Deleted idlerendering gdisp %p...\n"), gdisp); fflush(stdout);
printf(_("\tIdlerender stops now!\n")); fflush(stdout);
gtk_idle_remove (gdisp->idle_render.idleid);
gdisp->idle_render.active = FALSE;
printf(_("\tDeletion finished.\n")); fflush(stdout);
}
if (gdisp->scroll_gc)

3
app/display/gimpdisplay.c
View File

@ -211,11 +211,8 @@ gdisplay_delete (GDisplay *gdisp)
deactivate the idlerendering thread before deletion! */
if (gdisp->idle_render.active)
{
printf(_("Deleted idlerendering gdisp %p...\n"), gdisp); fflush(stdout);
printf(_("\tIdlerender stops now!\n")); fflush(stdout);
gtk_idle_remove (gdisp->idle_render.idleid);
gdisp->idle_render.active = FALSE;
printf(_("\tDeletion finished.\n")); fflush(stdout);
}
if (gdisp->scroll_gc)

3
app/gdisplay.c
View File

@ -211,11 +211,8 @@ gdisplay_delete (GDisplay *gdisp)
deactivate the idlerendering thread before deletion! */
if (gdisp->idle_render.active)
{
printf(_("Deleted idlerendering gdisp %p...\n"), gdisp); fflush(stdout);
printf(_("\tIdlerender stops now!\n")); fflush(stdout);
gtk_idle_remove (gdisp->idle_render.idleid);
gdisp->idle_render.active = FALSE;
printf(_("\tDeletion finished.\n")); fflush(stdout);
}
if (gdisp->scroll_gc)

22
app/paint-funcs/paint-funcs.c
View File

@ -2037,17 +2037,17 @@ combine_inten_a_and_inten_a_pixels (const unsigned char *src1,
}
else
{
src1 += bytes * sizeof(int);
src2 += bytes * sizeof(int);
j = sizeof(int);
j = bytes * sizeof(int);
src2 += j;
while (j--)
{
dest[alpha] = 255;
dest += bytes;
*(dest++) = *(src1++);
}
}
mask_ip++;
}
m = (const unsigned char*)mask_ip;
/* TAIL */
while (length--)
@ -2138,7 +2138,7 @@ combine_inten_a_and_inten_a_pixels (const unsigned char *src1,
dest[alpha] = (src1[alpha]) ? src1[alpha] :
(affect[alpha] ? new_alpha : src1[alpha]);
}
m++;
src1 += bytes;
src2 += bytes;
@ -2148,17 +2148,17 @@ combine_inten_a_and_inten_a_pixels (const unsigned char *src1,
}
else
{
src1 += bytes * sizeof(int);
src2 += bytes * sizeof(int);
j = sizeof(int);
j = bytes * sizeof(int);
src2 += j;
while (j--)
{
dest[alpha] = 255;
dest += bytes;
*(dest++) = *(src1++);
}
}
mask_ip++;
}
m = (const unsigned char*)mask_ip;
/* TAIL */
while (length--)

22
app/paint_funcs.c
View File

@ -2037,17 +2037,17 @@ combine_inten_a_and_inten_a_pixels (const unsigned char *src1,
}
else
{
src1 += bytes * sizeof(int);
src2 += bytes * sizeof(int);
j = sizeof(int);
j = bytes * sizeof(int);
src2 += j;
while (j--)
{
dest[alpha] = 255;
dest += bytes;
*(dest++) = *(src1++);
}
}
mask_ip++;
}
m = (const unsigned char*)mask_ip;
/* TAIL */
while (length--)
@ -2138,7 +2138,7 @@ combine_inten_a_and_inten_a_pixels (const unsigned char *src1,
dest[alpha] = (src1[alpha]) ? src1[alpha] :
(affect[alpha] ? new_alpha : src1[alpha]);
}
m++;
src1 += bytes;
src2 += bytes;
@ -2148,17 +2148,17 @@ combine_inten_a_and_inten_a_pixels (const unsigned char *src1,
}
else
{
src1 += bytes * sizeof(int);
src2 += bytes * sizeof(int);
j = sizeof(int);
j = bytes * sizeof(int);
src2 += j;
while (j--)
{
dest[alpha] = 255;
dest += bytes;
*(dest++) = *(src1++);
}
}
mask_ip++;
}
m = (const unsigned char*)mask_ip;
/* TAIL */
while (length--)