[Git][freetype/freetype-demos][master] * graph/*: Fix clang compilation warnings.

[Werner Lemberg (@wl)]

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

Commits:

• 81bdba1f
  by Werner Lemberg at 2021-11-20T08:59:55+01:00

  * graph/*: Fix clang compilation warnings.
  
  Add casts for signed vs. unsigned issues.
  

4 changed files:

• graph/batch/grbatch.c
• graph/grfill.c
• graph/grobjs.c
• graph/x11/grx11.c

Changes:

graph/batch/grbatch.c

---

...	...	@@ -21,6 +21,7 @@
21	21	/* FT graphics subsystem */
22	22	#include "grobjs.h"
23	23	#include "grdevice.h"
	24	+#include "grbatch.h"
24	25
25	26
26	27	static int

graph/grfill.c

---

...	...	@@ -60,7 +60,7 @@ gr_fill_hline_4( unsigned char* line,
60	60	int incr,
61	61	grColor color )
62	62	{
63		- int col = color.value | (color.value << 4);
	63	+ int col = (int)( color.value | ( color.value << 4 ) );
64	64	int height;
65	65
66	66	line += (x >> 1);
...	...	@@ -95,7 +95,7 @@ gr_fill_hline_8( unsigned char* line,
95	95	line += x;
96	96
97	97	if ( incr == 1 )
98		- memset( line, color.value, (size_t)width );
	98	+ memset( line, (int)color.value, (size_t)width );
99	99	else
100	100	{
101	101	/* there might be some pitch */

graph/grobjs.c

---

...	...	@@ -30,15 +30,15 @@
30	30	break;
31	31
32	32	case gr_pixel_mode_rgb555:
33		- color.value = ((red & 0xF8) << 7) |
34		- ((green & 0xF8) << 2) |
35		- ((blue & 0xF8) >> 3);
	33	+ color.value = (uint32_t)( ( red & 0xF8 ) << 7 ) |
	34	+ (uint32_t)( ( green & 0xF8 ) << 2 ) |
	35	+ (uint32_t)( ( blue & 0xF8 ) >> 3 );
36	36	break;
37	37
38	38	case gr_pixel_mode_rgb565:
39		- color.value = ((red & 0xF8) << 8) |
40		- ((green & 0xFC) << 3) |
41		- ((blue & 0xF8) >> 3);
	39	+ color.value = (uint32_t)( ( red & 0xF8 ) << 8 ) |
	40	+ (uint32_t)( ( green & 0xFC ) << 3 ) |
	41	+ (uint32_t)( ( blue & 0xF8 ) >> 3 );
42	42	break;
43	43
44	44	case gr_pixel_mode_rgb24:
...	...	@@ -48,10 +48,10 @@
48	48	break;
49	49
50	50	case gr_pixel_mode_rgb32:
51		- color.value = ((alpha & 0xFF) << 24) |
52		- ((red & 0xFF) << 16) |
53		- ((green & 0xFF) << 8) |
54		- ((blue & 0xFF) );
	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 ) );
55	55	break;
56	56
57	57	default:

graph/x11/grx11.c

---

...	...	@@ -1012,7 +1012,10 @@
1012	1012	surface->convert( &blit );
1013	1013
1014	1014	/* without background defined, this only generates Expose event */
1015		- XClearArea( surface->display, surface->win, x, y, w, h, True );
	1015	+ XClearArea( surface->display, surface->win,
	1016	+ x, y,
	1017	+ (unsigned)w, (unsigned)h,
	1018	+ True );
1016	1019	}
1017	1020
1018	1021
...	...	@@ -1043,12 +1046,12 @@
1043	1046
1044	1047	sz = icon->rows * icon->width;
1045	1048
1046		- buffer = (unsigned long*)malloc( ( 2 + sz ) * sizeof( long) );
	1049	+ buffer = (unsigned long*)malloc( (size_t)( 2 + sz ) * sizeof ( long ) );
1047	1050	if ( !buffer )
1048	1051	return 0;
1049	1052
1050		- buffer[0] = icon->width;
1051		- buffer[1] = icon->rows;
	1053	+ buffer[0] = (unsigned long)icon->width;
	1054	+ buffer[1] = (unsigned long)icon->rows;
1052	1055
1053	1056	/* must convert to long array */
1054	1057	dst = buffer + 2;

—
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.