diff src/video/quartz/SDL_QuartzYUV.m @ 1659:14717b52abc0 SDL-1.3

Merge trunk-1.3-3
author Sam Lantinga <slouken@libsdl.org>
date Wed, 17 May 2006 08:18:28 +0000
parents 9f59d4c5aaea
children 782fd950bd46 4d11f2ae7582
line wrap: on
line diff
--- a/src/video/quartz/SDL_QuartzYUV.m	Mon May 01 06:58:33 2006 +0000
+++ b/src/video/quartz/SDL_QuartzYUV.m	Wed May 17 08:18:28 2006 +0000
@@ -91,16 +91,16 @@
     CDSequenceEnd (yuv_seq);
     ExitMovies();
 
-    free (overlay->hwfuncs);
-    free (overlay->pitches);
-    free (overlay->pixels);
+    SDL_free (overlay->hwfuncs);
+    SDL_free (overlay->pitches);
+    SDL_free (overlay->pixels);
 
     if (SDL_VideoSurface->flags & SDL_FULLSCREEN) {
         [ qz_window close ];
         qz_window = nil;
     }
 
-    free (yuv_matrix);
+    SDL_free (yuv_matrix);
     DisposeHandle ((Handle)yuv_idh);
 }
 
@@ -134,7 +134,7 @@
         return NULL;
     }
 
-    yuv_matrix = (MatrixRecordPtr) malloc (sizeof(MatrixRecord));
+    yuv_matrix = (MatrixRecordPtr) SDL_malloc (sizeof(MatrixRecord));
     if (yuv_matrix == NULL) {
         SDL_OutOfMemory();
         return NULL;
@@ -234,7 +234,7 @@
         return NULL;
     }
     
-    overlay = (SDL_Overlay*) malloc (sizeof(*overlay));
+    overlay = (SDL_Overlay*) SDL_malloc (sizeof(*overlay));
     if (overlay == NULL) {
         SDL_OutOfMemory();
         return NULL;
@@ -267,15 +267,15 @@
             return NULL;
         }
 
-        pixels = (Uint8**) malloc (sizeof(*pixels) * 3);
-        pitches = (Uint16*) malloc (sizeof(*pitches) * 3);
+        pixels = (Uint8**) SDL_malloc (sizeof(*pixels) * 3);
+        pitches = (Uint16*) SDL_malloc (sizeof(*pitches) * 3);
         if (pixels == NULL || pitches == NULL) {
             SDL_OutOfMemory();
             return NULL;
         }
 
         yuv_pixmap = (PlanarPixmapInfoYUV420*)
-            malloc (sizeof(PlanarPixmapInfoYUV420) +
+            SDL_malloc (sizeof(PlanarPixmapInfoYUV420) +
                     (width * height * 2));
         if (yuv_pixmap == NULL) {
             SDL_OutOfMemory ();
@@ -310,7 +310,7 @@
         overlay->pitches = pitches;
     }
 
-    overlay->hwfuncs = malloc (sizeof(*overlay->hwfuncs));
+    overlay->hwfuncs = SDL_malloc (sizeof(*overlay->hwfuncs));
     if (overlay->hwfuncs == NULL) {
         SDL_OutOfMemory();
         return NULL;