AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Fix problem with precendence of >> and & which was keeping composite_color

Browse Source 
2000-03-27  Owen Taylor  <otaylor@redhat.com>

	* gdk-pixbuf/pixops/pixops.c: Fix problem with
	precendence of >> and & which was keeping composite_color
	from working with non-gray images.
This commit is contained in:
Owen Taylor 2000-03-28 04:49:42 +00:00 committed by Owen Taylor
parent a6e85956d2
commit 06aed52437
2 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gdk-pixbuf/ChangeLog
View File

@ -1,3 +1,9 @@
2000-03-27 Owen Taylor <otaylor@redhat.com>
* gdk-pixbuf/pixops/pixops.c: Fix problem with
precendence of >> and & which was keeping composite_color
from working with non-gray images.
2000-03-08 Jonathan Blandford <jrb@redhat.com> 2000-03-08 Jonathan Blandford <jrb@redhat.com>
* gdk-pixbuf/io-gif.c (gdk_pixbuf__gif_image_load): free the context. * gdk-pixbuf/io-gif.c (gdk_pixbuf__gif_image_load): free the context.

32
gdk-pixbuf/pixops/pixops.c
View File

@ -249,22 +249,22 @@ pixops_composite_color_nearest (art_u8 *dest_buf,
if (((i + check_y) >> check_shift) & 1) if (((i + check_y) >> check_shift) & 1)
{ {
r1 = color2 & 0xff0000 >> 16; r1 = (color2 & 0xff0000) >> 16;
g1 = color2 & 0xff00 >> 8; g1 = (color2 & 0xff00) >> 8;
b1 = color2 & 0xff; b1 = color2 & 0xff;
r2 = color1 & 0xff0000 >> 16; r2 = (color1 & 0xff0000) >> 16;
g2 = color1 & 0xff00 >> 8; g2 = (color1 & 0xff00) >> 8;
b2 = color1 & 0xff; b2 = color1 & 0xff;
} }
else else
{ {
r1 = color1 & 0xff0000 >> 16; r1 = (color1 & 0xff0000) >> 16;
g1 = color1 & 0xff00 >> 8; g1 = (color1 & 0xff00) >> 8;
b1 = color1 & 0xff; b1 = color1 & 0xff;
r2 = color2 & 0xff0000 >> 16; r2 = (color2 & 0xff0000) >> 16;
g2 = color2 & 0xff00 >> 8; g2 = (color2 & 0xff00) >> 8;
b2 = color2 & 0xff; b2 = color2 & 0xff;
} }
@ -512,14 +512,14 @@ composite_pixel_color (art_u8 *dest, int dest_x, int dest_channels, int dest_has
if ((dest_x >> check_shift) & 1) if ((dest_x >> check_shift) & 1)
{ {
dest_r = color2 & 0xff0000 >> 16; dest_r = (color2 & 0xff0000) >> 16;
dest_g = color2 & 0xff00 >> 8; dest_g = (color2 & 0xff00) >> 8;
dest_b = color2 & 0xff; dest_b = color2 & 0xff;
} }
else else
{ {
dest_r = color1 & 0xff0000 >> 16; dest_r = (color1 & 0xff0000) >> 16;
dest_g = color1 & 0xff00 >> 8; dest_g = (color1 & 0xff00) >> 8;
dest_b = color1 & 0xff; dest_b = color1 & 0xff;
} }
@ -548,12 +548,12 @@ composite_line_color (int *weights, int n_x, int n_y,
g_return_val_if_fail (check_size != 0, dest); g_return_val_if_fail (check_size != 0, dest);
dest_r1 = color1 & 0xff0000 >> 16; dest_r1 = (color1 & 0xff0000) >> 16;
dest_g1 = color1 & 0xff00 >> 8; dest_g1 = (color1 & 0xff00) >> 8;
dest_b1 = color1 & 0xff; dest_b1 = color1 & 0xff;
dest_r2 = color2 & 0xff0000 >> 16; dest_r2 = (color2 & 0xff0000) >> 16;
dest_g2 = color2 & 0xff00 >> 8; dest_g2 = (color2 & 0xff00) >> 8;
dest_b2 = color2 & 0xff; dest_b2 = color2 & 0xff;
while (dest < dest_end) while (dest < dest_end)