From 22822eca936423a2ace7c0a5c4549bdc6237453a Mon Sep 17 00:00:00 2001 From: mazze Date: Sat, 28 Jul 2012 13:06:08 +0000 Subject: [PATCH] Added type conversion to red, green and blue components, otherwise e.g. the value 0xabababab will be printed as 0xffffffffabababab. That causes compiler warnings for the generated source code. Unneeded variable y removed. git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@45346 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- tools/ilbmtoc/Makefile | 2 +- tools/ilbmtoc/ilbmtoc.c | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/ilbmtoc/Makefile b/tools/ilbmtoc/Makefile index fd38be3c6e..bf2137b819 100644 --- a/tools/ilbmtoc/Makefile +++ b/tools/ilbmtoc/Makefile @@ -17,7 +17,7 @@ all : $(ILBMTOC) $(ILBMTOC) : ilbmtoc.c @$(MECHO) "Compiling $(notdir $@)..." - @$(HOST_CC) $(HOST_CFLAGS) $< -o $@ + @$(HOST_CC) $(HOST_CFLAGS) $(USER_CFLAGS) $< -o $@ @$(HOST_STRIP) $@ clean: diff --git a/tools/ilbmtoc/ilbmtoc.c b/tools/ilbmtoc/ilbmtoc.c index 49dbfc7ecc..def244be50 100644 --- a/tools/ilbmtoc/ilbmtoc.c +++ b/tools/ilbmtoc/ilbmtoc.c @@ -588,7 +588,7 @@ static void packdata(void) static void gensource(void) { unsigned char *buffer; - LONG i, x, y, buffersize; + LONG i, x, buffersize; printf("#include \n"); printf("\n"); @@ -661,9 +661,9 @@ static void genbrush2csource(void) for (i = 0; i < cmapentries; i++) { printf("\t0x%08lx,0x%08lx,0x%08lx,\n", - (long) (red[i] << 24 | red[i] << 16 | red[i] << 8 | red[i]), - (long) (green[i] << 24 | green[i] << 16 | green[i] << 8 | green[i]), - (long) (blue[i] << 24 | blue[i] << 16 | blue[i] << 8 | blue[i])); + (long) ((ULONG)red[i] << 24 | (ULONG)red[i] << 16 | (ULONG)red[i] << 8 | (ULONG)red[i]), + (long) ((ULONG)green[i] << 24 | (ULONG)green[i] << 16 | (ULONG)green[i] << 8 | (ULONG)green[i]), + (long) ((ULONG)blue[i] << 24 | (ULONG)blue[i] << 16 | (ULONG)blue[i] << 8 | (ULONG)blue[i])); } printf("};\n"); printf("#endif\n\n"); @@ -709,9 +709,9 @@ static void genbrush2pixsource(void) for (i = 0; i < cmapentries; i++) { printf("\t0x%08lx,0x%08lx,0x%08lx,\n", - (long)(red[i] << 24 | red[i] << 16 | red[i] << 8 | red[i]), - (long)(green[i] << 24 | green[i] << 16 | green[i] << 8 | green[i]), - (long)(blue[i] << 24 | blue[i] << 16 | blue[i] << 8 | blue[i])); + (long)((ULONG)red[i] << 24 | (ULONG)red[i] << 16 | (ULONG)red[i] << 8 | (ULONG)red[i]), + (long)((ULONG)green[i] << 24 | (ULONG)green[i] << 16 | (ULONG)green[i] << 8 | (ULONG)green[i]), + (long)((ULONG)blue[i] << 24 | (ULONG)blue[i] << 16 | (ULONG)blue[i] << 8 | (ULONG)blue[i])); } printf("};\n\n"); } -- 2.11.4.GIT