Mercurial > sdl-ios-xcode

diff src/video/ps2gs/SDL_gsyuv.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 604d73db6802
line wrap: on
line diff
--- a/src/video/ps2gs/SDL_gsyuv.c	Mon Feb 06 17:28:04 2006 +0000
+++ b/src/video/ps2gs/SDL_gsyuv.c	Tue Feb 07 06:59:48 2006 +0000
@@ -114,12 +114,12 @@
 	}
 
 	/* Create the overlay structure */
-	overlay = (SDL_Overlay *)malloc(sizeof *overlay);
+	overlay = (SDL_Overlay *)SDL_malloc(sizeof *overlay);
 	if ( overlay == NULL ) {
 		SDL_OutOfMemory();
 		return(NULL);
 	}
-	memset(overlay, 0, (sizeof *overlay));
+	SDL_memset(overlay, 0, (sizeof *overlay));
 
 	/* Fill in the basic members */
 	overlay->format = format;
@@ -131,7 +131,7 @@
 	overlay->hw_overlay = 1;
 
 	/* Create the pixel data */
-	hwdata = (struct private_yuvhwdata *)malloc(sizeof *hwdata);
+	hwdata = (struct private_yuvhwdata *)SDL_malloc(sizeof *hwdata);
 	overlay->hwdata = hwdata;
 	if ( hwdata == NULL ) {
 		SDL_FreeYUVOverlay(overlay);
@@ -139,7 +139,7 @@
 		return(NULL);
 	}
 	hwdata->ipu_fd = -1;
-	hwdata->pixels = (Uint8 *)malloc(width*height*2);
+	hwdata->pixels = (Uint8 *)SDL_malloc(width*height*2);
 	if ( hwdata->pixels == NULL ) {
 		SDL_FreeYUVOverlay(overlay);
 		SDL_OutOfMemory();
@@ -202,7 +202,7 @@
 
 	/* Allocate memory for the DMA packets */
 	hwdata->plist.num = hwdata->macroblocks * 4 + 1;
-	hwdata->plist.packet = (struct ps2_packet *)malloc(
+	hwdata->plist.packet = (struct ps2_packet *)SDL_malloc(
 	                       hwdata->plist.num*sizeof(struct ps2_packet));
 	if ( ! hwdata->plist.packet ) {
 		SDL_FreeYUVOverlay(overlay);
@@ -453,11 +453,11 @@
 			munmap(hwdata->dma_mem, hwdata->dma_len);
 		}
 		if ( hwdata->plist.packet ) {
-			free(hwdata->plist.packet);
+			SDL_free(hwdata->plist.packet);
 		}
 		if ( hwdata->pixels ) {
-			free(hwdata->pixels);
+			SDL_free(hwdata->pixels);
 		}
-		free(hwdata);
+		SDL_free(hwdata);
 	}
 }