mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r17871) -Fix (r11342): memset() accepts only 1-byte argument

release/1.0
smatz 2009-10-25 17:36:24 +00:00
parent 95ffbc2476
commit 002f9c0075
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/os/macosx/splash.cpp
View File

@ -16,6 +16,7 @@
#include "../../gfx_func.h" #include "../../gfx_func.h"
#include "../../fileio_func.h" #include "../../fileio_func.h"
#include "../../blitter/factory.hpp" #include "../../blitter/factory.hpp"
#include "../../core/mem_func.hpp"
#include "splash.h" #include "splash.h"
@ -44,7 +45,6 @@ void DisplaySplashImage()
png_colorp palette; png_colorp palette;
int num_palette; int num_palette;
png_bytep *row_pointers; png_bytep *row_pointers;
uint8 *src;
uint y; uint y;
uint xoff, yoff; uint xoff, yoff;
int i; int i;
@ -119,13 +119,13 @@ void DisplaySplashImage()
switch (BlitterFactoryBase::GetCurrentBlitter()->GetScreenDepth()) { switch (BlitterFactoryBase::GetCurrentBlitter()->GetScreenDepth()) {
case 8: { case 8: {
uint8 *dst; uint8 *dst_ptr = (uint8 *)_screen.dst_ptr;
/* Initialize buffer */
memset(_screen.dst_ptr, 0xff, _screen.pitch * _screen.height); MemSetT(dst_ptr, 0xff, _screen.pitch * _screen.height);
for (y = 0; y < height; y++) { for (y = 0; y < height; y++) {
src = row_pointers[y]; uint8 *src = row_pointers[y];
dst = ((uint8 *) _screen.dst_ptr) + (yoff + y) * _screen.pitch + xoff; uint8 *dst = dst_ptr + (yoff + y) * _screen.pitch + xoff;
memcpy(dst, src, width); memcpy(dst, src, width);
} }
@ -147,17 +147,17 @@ void DisplaySplashImage()
} }
break; break;
case 32: { case 32: {
uint32 *dst; uint32 *dst_ptr = (uint32 *)_screen.dst_ptr;
uint x; /* Initialize buffer */
MemSetT(dst_ptr, 0, _screen.pitch * _screen.height);
memset(_screen.dst_ptr, 0xff000000, _screen.pitch * _screen.height * 4);
for (y = 0; y < height; y++) { for (y = 0; y < height; y++) {
src = row_pointers[y]; uint8 *src = row_pointers[y];
dst = ((uint32 *) _screen.dst_ptr) + (yoff + y) * _screen.pitch + xoff; uint32 *dst = dst_ptr + (yoff + y) * _screen.pitch + xoff;
for (x = 0; x < width; x++) for (x = 0; x < width; x++) {
dst[x] = palette[src[x]].blue | (palette[src[x]].green << 8) | (palette[src[x]].red << 16) | 0xff000000; dst[x] = palette[src[x]].blue | (palette[src[x]].green << 8) | (palette[src[x]].red << 16) | 0xff000000;
}
} }
} }
break; break;