[Git][freetype/freetype-demos][master] 2 commits: graph/grobjs.c (grFindColor): Fix undefined left-shift behaviour.

[Werner Lemberg (@wl)]

Werner Lemberg pushed to branch master at FreeType / FreeType Demo Programs

Commits:

• 4484fd1b
  by Werner Lemberg at 2022-01-07T06:40:22+01:00

  graph/grobjs.c (grFindColor): Fix undefined left-shift behaviour.
  

• 7f36c5e4
  by Werner Lemberg at 2022-01-07T06:40:22+01:00

  * src/ftcommon.c (icon_span): Fix undefined left-shift behaviour.
  

2 changed files:

• graph/grobjs.c
• src/ftcommon.c

Changes:

graph/grobjs.c

---

...	...	@@ -14,31 +14,32 @@
14	14	{
15	15	grColor color;
16	16
	17	+
17	18	color.value = 0;
18	19
19		- switch (target->mode)
	20	+ switch ( target->mode )
20	21	{
21	22	case gr_pixel_mode_mono:
22		- if ( (red|green|blue) )
	23	+ if ( ( red | green | blue ) )
23	24	color.value = 1;
24	25	break;
25	26
26	27	case gr_pixel_mode_gray:
27		- color.value = ( 3*(red & 0xFF) +
28		- 6*(green & 0xFF) +
29		- (blue & 0xFF) ) / 10;
	28	+ color.value = ( 3 * ( red & 0xFF ) +
	29	+ 6 * ( green & 0xFF ) +
	30	+ ( blue & 0xFF ) ) / 10;
30	31	break;
31	32
32	33	case gr_pixel_mode_rgb555:
33		- color.value = (uint32_t)( ( red & 0xF8 ) << 7 ) |
34		- (uint32_t)( ( green & 0xF8 ) << 2 ) |
35		- (uint32_t)( ( blue & 0xF8 ) >> 3 );
	34	+ color.value = ( ( (uint32_t)red & 0xF8 ) << 7 ) |
	35	+ ( ( (uint32_t)green & 0xF8 ) << 2 ) |
	36	+ ( ( (uint32_t)blue & 0xF8 ) >> 3 );
36	37	break;
37	38
38	39	case gr_pixel_mode_rgb565:
39		- color.value = (uint32_t)( ( red & 0xF8 ) << 8 ) |
40		- (uint32_t)( ( green & 0xFC ) << 3 ) |
41		- (uint32_t)( ( blue & 0xF8 ) >> 3 );
	40	+ color.value = ( ( (uint32_t)red & 0xF8 ) << 8 ) |
	41	+ ( ( (uint32_t)green & 0xFC ) << 3 ) |
	42	+ ( ( (uint32_t)blue & 0xF8 ) >> 3 );
42	43	break;
43	44
44	45	case gr_pixel_mode_rgb24:
...	...	@@ -48,15 +49,16 @@
48	49	break;
49	50
50	51	case gr_pixel_mode_rgb32:
51		- color.value = (uint32_t)( ( alpha & 0xFF ) << 24 ) |
52		- (uint32_t)( ( red & 0xFF ) << 16 ) |
53		- (uint32_t)( ( green & 0xFF ) << 8 ) |
54		- (uint32_t)( ( blue & 0xFF ) );
	52	+ color.value = ( ( (uint32_t)alpha & 0xFF ) << 24 ) |
	53	+ ( ( (uint32_t)red & 0xFF ) << 16 ) |
	54	+ ( ( (uint32_t)green & 0xFF ) << 8 ) |
	55	+ ( ( (uint32_t)blue & 0xFF ) );
55	56	break;
56	57
57	58	default:
58	59	;
59	60	}
	61	+
60	62	return color;
61	63	}
62	64

src/ftcommon.c

---

...	...	@@ -468,7 +468,7 @@
468	468
469	469	for ( ; count--; spans++ )
470	470	for ( dst = dst_line + spans->x, w = spans->len; w--; dst++ )
471		- *dst = (FT_UInt32)( spans->coverage << 24 ) | color;
	471	+ *dst = ( (FT_UInt32)spans->coverage << 24 ) | color;
472	472	}
473	473
474	474

—
View it on GitLab.
You're receiving this email because of your account on gitlab.freedesktop.org. If you'd like to receive fewer emails, you can adjust your notification settings.