Mercurial > sdl-ios-xcode

diff src/video/cybergfx/SDL_cgxwm.c @ 1336:3692456e7b0f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use SDL_ prefixed versions of C library functions. FIXME: Change #include <stdlib.h> to #include "SDL_stdlib.h" Change #include <string.h> to #include "SDL_string.h" Make sure nothing else broke because of this...
author Sam Lantinga <slouken@libsdl.org>
date Tue, 07 Feb 2006 06:59:48 +0000
parents c9b51268668f
children c71e05b4dc2e
line wrap: on
line diff
--- a/src/video/cybergfx/SDL_cgxwm.c	Mon Feb 06 17:28:04 2006 +0000
+++ b/src/video/cybergfx/SDL_cgxwm.c	Tue Feb 07 06:59:48 2006 +0000
@@ -78,7 +78,7 @@
 	   copy them */
 	if(SDL_Visual == dvis && SDL_XColorMap == SDL_DisplayColormap
 	   && this->screen->format->palette && sicon->format->palette) {
-	    memcpy(sicon->format->palette->colors,
+	    SDL_memcpy(sicon->format->palette->colors,
 		   this->screen->format->palette->colors,
 		   this->screen->format->palette->ncolors * sizeof(SDL_Color));
 	}
@@ -98,21 +98,21 @@
 		XColor wanted;
 
 		palette = sicon->format->palette;
-		color_tried = malloc(palette->ncolors);
+		color_tried = SDL_malloc(palette->ncolors);
 		if ( color_tried == NULL ) {
 			goto done;
 		}
 		if ( SDL_iconcolors != NULL ) {
-			free(SDL_iconcolors);
+			SDL_free(SDL_iconcolors);
 		}
-		SDL_iconcolors = malloc(palette->ncolors
+		SDL_iconcolors = SDL_malloc(palette->ncolors
 					* sizeof(*SDL_iconcolors));
 		if ( SDL_iconcolors == NULL ) {
-			free(color_tried);
+			SDL_free(color_tried);
 			goto done;
 		}
-		memset(color_tried, 0, palette->ncolors);
-		memset(SDL_iconcolors, 0,
+		SDL_memset(color_tried, 0, palette->ncolors);
+		SDL_memset(SDL_iconcolors, 0,
 		       palette->ncolors * sizeof(*SDL_iconcolors));
 
 		p = (Uint8 *)sicon->pixels; 
@@ -132,16 +132,16 @@
 		}
 	}
 	if ( color_tried != NULL ) {
-		free(color_tried);
+		SDL_free(color_tried);
 	}
 
 	/* Translate mask data to LSB order and set the icon mask */
 	i = (sicon->w/8)*sicon->h;
-	LSBmask = (Uint8 *)malloc(i);
+	LSBmask = (Uint8 *)SDL_malloc(i);
 	if ( LSBmask == NULL ) {
 		goto done;
 	}
-	memset(LSBmask, 0, i);
+	SDL_memset(LSBmask, 0, i);
 	while ( --i >= 0 ) {
 		for ( b=0; b<8; ++b )
 			LSBmask[i] |= (((mask[i]>>b)&0x01)<<(7-b));
@@ -163,7 +163,7 @@
 					0, 0, 0, 0, sicon->w, sicon->h);
 	XFreeGC(SDL_Display, GC);
 	XDestroyImage(icon_image);
-	free(LSBmask);
+	SDL_free(LSBmask);
 	sicon->pixels = NULL;
 
 #ifdef USE_ICON_WINDOW