summaryrefslogtreecommitdiff
path: root/src/mesa/main/image.c
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>1999-10-13 18:42:49 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>1999-10-13 18:42:49 +0000
commitbd5cdaf4442872d3cd2ff94eeafadd481d27fcfb (patch)
tree0adfaaa95b9d0b5334a7a45e3599ef905b188bb2 /src/mesa/main/image.c
parent1a3b8ffe01a3844d990627db3d5f2f04006f17eb (diff)
removed GL_ prefix from memory macros
Diffstat (limited to 'src/mesa/main/image.c')
-rw-r--r--src/mesa/main/image.c30
1 files changed, 15 insertions, 15 deletions
diff --git a/src/mesa/main/image.c b/src/mesa/main/image.c
index 781efad855..8eaa328152 100644
--- a/src/mesa/main/image.c
+++ b/src/mesa/main/image.c
@@ -1,4 +1,4 @@
-/* $Id: image.c,v 1.5 1999/10/10 13:04:17 brianp Exp $ */
+/* $Id: image.c,v 1.6 1999/10/13 18:42:50 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -483,7 +483,7 @@ GLvoid *gl_pixel_addr_in_image( const struct gl_pixelstore_attrib *packing,
*/
static struct gl_image *alloc_image( void )
{
- return GL_CALLOC_STRUCT(gl_image);
+ return CALLOC_STRUCT(gl_image);
}
@@ -515,9 +515,9 @@ static struct gl_image *alloc_error_image( GLint width, GLint height,
void gl_free_image( struct gl_image *image )
{
if (image->Data) {
- GL_FREE(image->Data);
+ FREE(image->Data);
}
- GL_FREE(image);
+ FREE(image);
}
@@ -575,15 +575,15 @@ unpack_depth_image( GLcontext *ctx, GLenum type, GLint width, GLint height,
image->Format = GL_DEPTH_COMPONENT;
if (type==GL_UNSIGNED_SHORT) {
image->Type = GL_UNSIGNED_SHORT;
- image->Data = GL_ALLOC( width * height * sizeof(GLushort));
+ image->Data = MALLOC( width * height * sizeof(GLushort));
}
else if (type==GL_UNSIGNED_INT) {
image->Type = GL_UNSIGNED_INT;
- image->Data = GL_ALLOC( width * height * sizeof(GLuint));
+ image->Data = MALLOC( width * height * sizeof(GLuint));
}
else {
image->Type = GL_FLOAT;
- image->Data = GL_ALLOC( width * height * sizeof(GLfloat));
+ image->Data = MALLOC( width * height * sizeof(GLfloat));
}
image->RefCount = 0;
if (!image->Data)
@@ -711,7 +711,7 @@ unpack_stencil_image( GLcontext *ctx, GLenum type, GLint width, GLint height,
image->Components = 1;
image->Format = GL_STENCIL_INDEX;
image->Type = GL_UNSIGNED_BYTE;
- image->Data = GL_ALLOC( width * height * sizeof(GLubyte));
+ image->Data = MALLOC( width * height * sizeof(GLubyte));
image->RefCount = 0;
if (!image->Data)
return image;
@@ -825,7 +825,7 @@ unpack_bitmap( GLenum format, GLint width, GLint height,
/* Alloc dest storage */
bytes = ((width+7)/8 * height);
if (bytes>0 && pixels!=NULL) {
- buffer = (GLubyte *) GL_ALLOC( bytes );
+ buffer = (GLubyte *) MALLOC( bytes );
if (!buffer) {
return NULL;
}
@@ -838,7 +838,7 @@ unpack_bitmap( GLenum format, GLint width, GLint height,
GL_COLOR_INDEX, GL_BITMAP,
0, i, 0 );
if (!src) {
- GL_FREE(buffer);
+ FREE(buffer);
return NULL;
}
MEMCPY( dst, src, width_in_bytes );
@@ -866,7 +866,7 @@ unpack_bitmap( GLenum format, GLint width, GLint height,
image->RefCount = 0;
}
else {
- GL_FREE( buffer );
+ FREE( buffer );
return NULL;
}
@@ -943,7 +943,7 @@ unpack_ubyte_image( GLint width, GLint height,
components = gl_components_in_format( format );
width_in_bytes = width * components * sizeof(GLubyte);
- buffer = (GLubyte *) GL_ALLOC( height * width_in_bytes * depth );
+ buffer = (GLubyte *) MALLOC( height * width_in_bytes * depth );
if (!buffer) {
return NULL;
}
@@ -956,7 +956,7 @@ unpack_ubyte_image( GLint width, GLint height,
pixels, width, height, format, GL_UNSIGNED_BYTE,
d, i, 0 );
if (!src) {
- GL_FREE(buffer);
+ FREE(buffer);
return NULL;
}
MEMCPY( dst, src, width_in_bytes );
@@ -1016,7 +1016,7 @@ unpack_ubyte_image( GLint width, GLint height,
image->RefCount = 0;
}
else {
- GL_FREE( buffer );
+ FREE( buffer );
}
return image;
@@ -1077,7 +1077,7 @@ unpack_float_image( GLcontext *ctx, GLint width, GLint height, GLint depth,
else
image->Format = format;
image->Type = GL_FLOAT;
- image->Data = GL_ALLOC( elems_per_row * height * depth * sizeof(GLfloat));
+ image->Data = MALLOC( elems_per_row * height * depth * sizeof(GLfloat));
image->RefCount = 0;
if (!image->Data)
return image;