src/video/SDL_bmp.c
changeset 1330 450721ad5436
parent 1329 bc67bbf87818
child 1336 3692456e7b0f
     1.1 --- a/src/video/SDL_bmp.c	Sat Feb 04 22:01:44 2006 +0000
     1.2 +++ b/src/video/SDL_bmp.c	Mon Feb 06 08:28:51 2006 +0000
     1.3 @@ -34,11 +34,10 @@
     1.4     This code currently supports Win32 DIBs in uncompressed 8 and 24 bpp.
     1.5  */
     1.6  
     1.7 -#include <string.h>
     1.8 -
     1.9  #include "SDL_error.h"
    1.10  #include "SDL_video.h"
    1.11  #include "SDL_endian.h"
    1.12 +#include "SDL_string.h"
    1.13  
    1.14  /* Compression encodings for BMP files */
    1.15  #ifndef BI_RGB
    1.16 @@ -238,7 +237,7 @@
    1.17  	}
    1.18  
    1.19  	/* Read the surface pixels.  Note that the bmp image is upside down */
    1.20 -	if ( SDL_RWseek(src, fp_offset+bfOffBits, SEEK_SET) < 0 ) {
    1.21 +	if ( SDL_RWseek(src, fp_offset+bfOffBits, RW_SEEK_SET) < 0 ) {
    1.22  		SDL_Error(SDL_EFSEEK);
    1.23  		was_error = 1;
    1.24  		goto done;
    1.25 @@ -319,7 +318,7 @@
    1.26  done:
    1.27  	if ( was_error ) {
    1.28  		if ( src ) {
    1.29 -			SDL_RWseek(src, fp_offset, SEEK_SET);
    1.30 +			SDL_RWseek(src, fp_offset, RW_SEEK_SET);
    1.31  		}
    1.32  		if ( surface ) {
    1.33  			SDL_FreeSurface(surface);
    1.34 @@ -475,11 +474,11 @@
    1.35  
    1.36  		/* Write the bitmap offset */
    1.37  		bfOffBits = SDL_RWtell(dst)-fp_offset;
    1.38 -		if ( SDL_RWseek(dst, fp_offset+10, SEEK_SET) < 0 ) {
    1.39 +		if ( SDL_RWseek(dst, fp_offset+10, RW_SEEK_SET) < 0 ) {
    1.40  			SDL_Error(SDL_EFSEEK);
    1.41  		}
    1.42  		SDL_WriteLE32(dst, bfOffBits);
    1.43 -		if ( SDL_RWseek(dst, fp_offset+bfOffBits, SEEK_SET) < 0 ) {
    1.44 +		if ( SDL_RWseek(dst, fp_offset+bfOffBits, RW_SEEK_SET) < 0 ) {
    1.45  			SDL_Error(SDL_EFSEEK);
    1.46  		}
    1.47  
    1.48 @@ -502,11 +501,11 @@
    1.49  
    1.50  		/* Write the BMP file size */
    1.51  		bfSize = SDL_RWtell(dst)-fp_offset;
    1.52 -		if ( SDL_RWseek(dst, fp_offset+2, SEEK_SET) < 0 ) {
    1.53 +		if ( SDL_RWseek(dst, fp_offset+2, RW_SEEK_SET) < 0 ) {
    1.54  			SDL_Error(SDL_EFSEEK);
    1.55  		}
    1.56  		SDL_WriteLE32(dst, bfSize);
    1.57 -		if ( SDL_RWseek(dst, fp_offset+bfSize, SEEK_SET) < 0 ) {
    1.58 +		if ( SDL_RWseek(dst, fp_offset+bfSize, RW_SEEK_SET) < 0 ) {
    1.59  			SDL_Error(SDL_EFSEEK);
    1.60  		}
    1.61