Mercurial > sdl-ios-xcode

comparison src/video/riscos/SDL_riscossprite.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
comparison
equal deleted inserted replaced
1335:c39265384763 1336:3692456e7b0f
68 { 68 {
69 bytesPerRow += 4 - (bytesPerRow & 3); 69 bytesPerRow += 4 - (bytesPerRow & 3);
70 } 70 }
71 size = bytesPerRow * height; 71 size = bytesPerRow * height;
72 72
73 buffer = malloc( (size_t) size + offsetToSpriteData ); 73 buffer = SDL_malloc( (size_t) size + offsetToSpriteData );
74 if (!buffer) return NULL; 74 if (!buffer) return NULL;
75 75
76 /* Initialise a sprite area */ 76 /* Initialise a sprite area */
77 77
78 *(unsigned int *)buffer = size + offsetToSpriteData; 78 *(unsigned int *)buffer = size + offsetToSpriteData;
127 } 127 }
128 */ 128 */
129 } 129 }
130 } else 130 } else
131 { 131 {
132 free(buffer); 132 SDL_free(buffer);
133 buffer = NULL; 133 buffer = NULL;
134 } 134 }
135 135
136 return buffer; 136 return buffer;
137 } 137 }
151 regs.r[4] = 0; /* Get size of buffer */ 151 regs.r[4] = 0; /* Get size of buffer */
152 regs.r[5] = 1|2|16; /* R1 - pointer to sprite and can use full palette words */ 152 regs.r[5] = 1|2|16; /* R1 - pointer to sprite and can use full palette words */
153 regs.r[6] = 0; 153 regs.r[6] = 0;
154 regs.r[7] = 0; 154 regs.r[7] = 0;
155 155
156 if (this->hidden->pixtrans) free(this->hidden->pixtrans); 156 if (this->hidden->pixtrans) SDL_free(this->hidden->pixtrans);
157 this->hidden->pixtrans = 0; 157 this->hidden->pixtrans = 0;
158 158
159 /* Get the size required for the buffer */ 159 /* Get the size required for the buffer */
160 _kernel_swi(ColourTrans_GenerateTable, &regs, &regs); 160 _kernel_swi(ColourTrans_GenerateTable, &regs, &regs);
161 if (regs.r[4]) 161 if (regs.r[4])
162 { 162 {
163 this->hidden->pixtrans = malloc(regs.r[4]); 163 this->hidden->pixtrans = SDL_malloc(regs.r[4]);
164 164
165 regs.r[4] = (unsigned int)this->hidden->pixtrans; 165 regs.r[4] = (unsigned int)this->hidden->pixtrans;
166 /* Actually read the buffer */ 166 /* Actually read the buffer */
167 _kernel_swi(ColourTrans_GenerateTable, &regs, &regs); 167 _kernel_swi(ColourTrans_GenerateTable, &regs, &regs);
168 } 168 }