Mercurial > sdl-ios-xcode

comparison src/video/nanox/SDL_nxvideo.c @ 1338:604d73db6802

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Removed uses of stdlib.h and string.h
author Sam Lantinga <slouken@libsdl.org>
date Tue, 07 Feb 2006 09:29:18 +0000
parents b8d311d90021
children d02b552e5304
comparison
equal deleted inserted replaced
1337:c687f06c7473 1338:604d73db6802
23 23
24 Hsieh-Fu Tsai 24 Hsieh-Fu Tsai
25 clare@setabox.com 25 clare@setabox.com
26 */ 26 */
27 27
28 #include <stdlib.h> 28 #include "SDL_stdlib.h"
29 #include <string.h> 29 #include "SDL_string.h"
30
31 #include "SDL_video.h" 30 #include "SDL_video.h"
32 #include "SDL_pixels_c.h" 31 #include "SDL_pixels_c.h"
33 #include "SDL_events_c.h" 32 #include "SDL_events_c.h"
34 #include "SDL_thread.h" 33 #include "SDL_thread.h"
35 34
82 SDL_VideoDevice * device ; 81 SDL_VideoDevice * device ;
83 82
84 Dprintf ("enter NX_CreateDevice\n") ; 83 Dprintf ("enter NX_CreateDevice\n") ;
85 84
86 // Initialize all variables that we clean on shutdown 85 // Initialize all variables that we clean on shutdown
87 device = (SDL_VideoDevice *) malloc (sizeof (SDL_VideoDevice)) ; 86 device = (SDL_VideoDevice *) SDL_malloc (sizeof (SDL_VideoDevice)) ;
88 if (device) { 87 if (device) {
89 memset (device, 0, (sizeof * device)) ; 88 SDL_memset (device, 0, (sizeof * device)) ;
90 device -> hidden = (struct SDL_PrivateVideoData *) 89 device -> hidden = (struct SDL_PrivateVideoData *)
91 malloc ((sizeof * device -> hidden)) ; 90 SDL_malloc ((sizeof * device -> hidden)) ;
92 device -> gl_data = NULL ; 91 device -> gl_data = NULL ;
93 } 92 }
94 if ((device == NULL) || (device -> hidden == NULL)) { 93 if ((device == NULL) || (device -> hidden == NULL)) {
95 SDL_OutOfMemory () ; 94 SDL_OutOfMemory () ;
96 NX_DeleteDevice (device) ; 95 NX_DeleteDevice (device) ;
97 return 0 ; 96 return 0 ;
98 } 97 }
99 memset (device -> hidden, 0, (sizeof * device -> hidden)) ; 98 SDL_memset (device -> hidden, 0, (sizeof * device -> hidden)) ;
100 99
101 // Set the function pointers 100 // Set the function pointers
102 device -> VideoInit = NX_VideoInit ; 101 device -> VideoInit = NX_VideoInit ;
103 device -> ListModes = NX_ListModes ; 102 device -> ListModes = NX_ListModes ;
104 device -> SetVideoMode = NX_SetVideoMode ; 103 device -> SetVideoMode = NX_SetVideoMode ;
210 209
211 GrGetScreenInfo (& si) ; 210 GrGetScreenInfo (& si) ;
212 SDL_Visual.bpp = si.bpp ; 211 SDL_Visual.bpp = si.bpp ;
213 212
214 // GetVideoMode 213 // GetVideoMode
215 SDL_modelist = (SDL_Rect **) malloc (sizeof (SDL_Rect *) * 2) ; 214 SDL_modelist = (SDL_Rect **) SDL_malloc (sizeof (SDL_Rect *) * 2) ;
216 if (SDL_modelist) { 215 if (SDL_modelist) {
217 SDL_modelist [0] = (SDL_Rect *) malloc (sizeof(SDL_Rect)) ; 216 SDL_modelist [0] = (SDL_Rect *) SDL_malloc (sizeof(SDL_Rect)) ;
218 if (SDL_modelist [0]) { 217 if (SDL_modelist [0]) {
219 SDL_modelist [0] -> x = 0 ; 218 SDL_modelist [0] -> x = 0 ;
220 SDL_modelist [0] -> y = 0 ; 219 SDL_modelist [0] -> y = 0 ;
221 SDL_modelist [0] -> w = si.cols ; 220 SDL_modelist [0] -> w = si.cols ;
222 SDL_modelist [0] -> h = si.rows ; 221 SDL_modelist [0] -> h = si.rows ;
484 483
485 Dprintf ("enter NX_SetGammaRamp\n") ; 484 Dprintf ("enter NX_SetGammaRamp\n") ;
486 485
487 if (SDL_Visual.bpp != 32 && SDL_Visual.bpp != 24) return -1 ; 486 if (SDL_Visual.bpp != 32 && SDL_Visual.bpp != 24) return -1 ;
488 487
489 if (! GammaRamp_R) GammaRamp_R = (Uint16 *) malloc (sizeof (Uint16) * CI_SIZE) ; 488 if (! GammaRamp_R) GammaRamp_R = (Uint16 *) SDL_malloc (sizeof (Uint16) * CI_SIZE) ;
490 if (! GammaRamp_G) GammaRamp_G = (Uint16 *) malloc (sizeof (Uint16) * CI_SIZE) ; 489 if (! GammaRamp_G) GammaRamp_G = (Uint16 *) SDL_malloc (sizeof (Uint16) * CI_SIZE) ;
491 if (! GammaRamp_B) GammaRamp_B = (Uint16 *) malloc (sizeof (Uint16) * CI_SIZE) ; 490 if (! GammaRamp_B) GammaRamp_B = (Uint16 *) SDL_malloc (sizeof (Uint16) * CI_SIZE) ;
492 if ((! GammaRamp_R) || (! GammaRamp_G) || (! GammaRamp_B)) { 491 if ((! GammaRamp_R) || (! GammaRamp_G) || (! GammaRamp_B)) {
493 SDL_OutOfMemory () ; 492 SDL_OutOfMemory () ;
494 return -1 ; 493 return -1 ;
495 } 494 }
496 495