encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SDL_bmp.c: restore most of the original formatting.

This commit is contained in:
Ozkan Sezer 2019-09-02 12:35:00 +03:00
parent 847bd8d983
commit b21338eb54
1 changed files with 156 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

114
src/video/SDL_bmp.c
View File

@ -71,15 +71,15 @@ static int readRlePixels(SDL_Surface * surface, SDL_RWops * src, int isRle8)
#define COPY_PIXEL(x) spot = &bits[ofs++]; if(spot >= start && spot < end) *spot = (x) #define COPY_PIXEL(x) spot = &bits[ofs++]; if(spot >= start && spot < end) *spot = (x)
for (;;) { for (;;) {
if ( !SDL_RWread(src, &ch, 1, 1) ) return 1; if (!SDL_RWread(src, &ch, 1, 1)) return 1;
/* /*
| encoded mode starts with a run length, and then a byte | encoded mode starts with a run length, and then a byte
| with two colour indexes to alternate between for the run | with two colour indexes to alternate between for the run
*/ */
if ( ch ) { if (ch) {
Uint8 pixel; Uint8 pixel;
if ( !SDL_RWread(src, &pixel, 1, 1) ) return 1; if (!SDL_RWread(src, &pixel, 1, 1)) return 1;
if ( isRle8 ) { /* 256-color bitmap, compressed */ if (isRle8) { /* 256-color bitmap, compressed */
do { do {
COPY_PIXEL(pixel); COPY_PIXEL(pixel);
} while (--ch); } while (--ch);
@ -99,7 +99,7 @@ static int readRlePixels(SDL_Surface * surface, SDL_RWops * src, int isRle8)
| a cursor move, or some absolute data. | a cursor move, or some absolute data.
| zero tag may be absolute mode or an escape | zero tag may be absolute mode or an escape
*/ */
if ( !SDL_RWread(src, &ch, 1, 1) ) return 1; if (!SDL_RWread(src, &ch, 1, 1)) return 1;
switch (ch) { switch (ch) {
case 0: /* end of line */ case 0: /* end of line */
ofs = 0; ofs = 0;
@ -108,24 +108,24 @@ static int readRlePixels(SDL_Surface * surface, SDL_RWops * src, int isRle8)
case 1: /* end of bitmap */ case 1: /* end of bitmap */
return 0; /* success! */ return 0; /* success! */
case 2: /* delta */ case 2: /* delta */
if ( !SDL_RWread(src, &ch, 1, 1) ) return 1; if (!SDL_RWread(src, &ch, 1, 1)) return 1;
ofs += ch; ofs += ch;
if ( !SDL_RWread(src, &ch, 1, 1) ) return 1; if (!SDL_RWread(src, &ch, 1, 1)) return 1;
bits -= (ch * pitch); bits -= (ch * pitch);
break; break;
default: /* no compression */ default: /* no compression */
if (isRle8) { if (isRle8) {
needsPad = ( ch & 1 ); needsPad = (ch & 1);
do { do {
Uint8 pixel; Uint8 pixel;
if ( !SDL_RWread(src, &pixel, 1, 1) ) return 1; if (!SDL_RWread(src, &pixel, 1, 1)) return 1;
COPY_PIXEL(pixel); COPY_PIXEL(pixel);
} while (--ch); } while (--ch);
} else { } else {
needsPad = ( ((ch+1)>>1) & 1 ); /* (ch+1)>>1: bytes size */ needsPad = (((ch+1)>>1) & 1); /* (ch+1)>>1: bytes size */
for (;;) { for (;;) {
Uint8 pixel; Uint8 pixel;
if ( !SDL_RWread(src, &pixel, 1, 1) ) return 1; if (!SDL_RWread(src, &pixel, 1, 1)) return 1;
COPY_PIXEL(pixel >> 4); COPY_PIXEL(pixel >> 4);
if (!--ch) break; if (!--ch) break;
COPY_PIXEL(pixel & 0x0F); COPY_PIXEL(pixel & 0x0F);
@ -133,7 +133,7 @@ static int readRlePixels(SDL_Surface * surface, SDL_RWops * src, int isRle8)
} }
} }
/* pad at even boundary */ /* pad at even boundary */
if ( needsPad && !SDL_RWread(src, &ch, 1, 1) ) return 1; if (needsPad && !SDL_RWread(src, &ch, 1, 1)) return 1;
break; break;
} }
} }
@ -213,7 +213,7 @@ SDL_LoadBMP_RW(SDL_RWops * src, int freesrc)
/* Make sure we are passed a valid data source */ /* Make sure we are passed a valid data source */
surface = NULL; surface = NULL;
was_error = SDL_FALSE; was_error = SDL_FALSE;
if ( src == NULL ) { if (src == NULL) {
was_error = SDL_TRUE; was_error = SDL_TRUE;
goto done; goto done;
} }
@ -221,12 +221,12 @@ SDL_LoadBMP_RW(SDL_RWops * src, int freesrc)
/* Read in the BMP file header */ /* Read in the BMP file header */
fp_offset = SDL_RWtell(src); fp_offset = SDL_RWtell(src);
SDL_ClearError(); SDL_ClearError();
if ( SDL_RWread(src, magic, 1, 2) != 2 ) { if (SDL_RWread(src, magic, 1, 2) != 2) {
SDL_Error(SDL_EFREAD); SDL_Error(SDL_EFREAD);
was_error = SDL_TRUE; was_error = SDL_TRUE;
goto done; goto done;
} }
if ( SDL_strncmp(magic, "BM", 2) != 0 ) { if (SDL_strncmp(magic, "BM", 2) != 0) {
SDL_SetError("File is not a Windows BMP file"); SDL_SetError("File is not a Windows BMP file");
was_error = SDL_TRUE; was_error = SDL_TRUE;
goto done; goto done;
@ -238,9 +238,9 @@ SDL_LoadBMP_RW(SDL_RWops * src, int freesrc)
/* Read the Win32 BITMAPINFOHEADER */ /* Read the Win32 BITMAPINFOHEADER */
biSize = SDL_ReadLE32(src); biSize = SDL_ReadLE32(src);
if ( biSize == 12 ) { /* really old BITMAPCOREHEADER */ if (biSize == 12) { /* really old BITMAPCOREHEADER */
biWidth = (Uint32)SDL_ReadLE16(src); biWidth = (Uint32) SDL_ReadLE16(src);
biHeight = (Uint32)SDL_ReadLE16(src); biHeight = (Uint32) SDL_ReadLE16(src);
biPlanes = SDL_ReadLE16(src); biPlanes = SDL_ReadLE16(src);
biBitCount = SDL_ReadLE16(src); biBitCount = SDL_ReadLE16(src);
biCompression = BI_RGB; biCompression = BI_RGB;
@ -390,17 +390,18 @@ SDL_LoadBMP_RW(SDL_RWops * src, int freesrc)
} }
/* Create a compatible surface, note that the colors are RGB ordered */ /* Create a compatible surface, note that the colors are RGB ordered */
surface = SDL_CreateRGBSurface(0, surface =
biWidth, biHeight, biBitCount, Rmask, Gmask, Bmask, Amask); SDL_CreateRGBSurface(0, biWidth, biHeight, biBitCount, Rmask, Gmask,
if ( surface == NULL ) { Bmask, Amask);
if (surface == NULL) {
was_error = SDL_TRUE; was_error = SDL_TRUE;
goto done; goto done;
} }
/* Load the palette, if any */ /* Load the palette, if any */
palette = (surface->format)->palette; palette = (surface->format)->palette;
if ( palette ) { if (palette) {
if ( SDL_RWseek(src, fp_offset+14+biSize, RW_SEEK_SET) < 0 ) { if (SDL_RWseek(src, fp_offset+14+biSize, RW_SEEK_SET) < 0) {
SDL_Error(SDL_EFSEEK); SDL_Error(SDL_EFSEEK);
was_error = SDL_TRUE; was_error = SDL_TRUE;
goto done; goto done;
@ -410,18 +411,18 @@ SDL_LoadBMP_RW(SDL_RWops * src, int freesrc)
| guich: always use 1<<bpp b/c some bitmaps can bring wrong information | guich: always use 1<<bpp b/c some bitmaps can bring wrong information
| for colorsUsed | for colorsUsed
*/ */
/* if ( biClrUsed == 0 ) { */ /* if (biClrUsed == 0) { */
biClrUsed = 1 << biBitCount; biClrUsed = 1 << biBitCount;
/* } */ /* } */
if ( biSize == 12 ) { if (biSize == 12) {
for ( i = 0; i < (int)biClrUsed; ++i ) { for (i = 0; i < (int) biClrUsed; ++i) {
SDL_RWread(src, &palette->colors[i].b, 1, 1); SDL_RWread(src, &palette->colors[i].b, 1, 1);
SDL_RWread(src, &palette->colors[i].g, 1, 1); SDL_RWread(src, &palette->colors[i].g, 1, 1);
SDL_RWread(src, &palette->colors[i].r, 1, 1); SDL_RWread(src, &palette->colors[i].r, 1, 1);
palette->colors[i].a = SDL_ALPHA_OPAQUE; palette->colors[i].a = SDL_ALPHA_OPAQUE;
} }
} else { } else {
for ( i = 0; i < (int)biClrUsed; ++i ) { for (i = 0; i < (int) biClrUsed; ++i) {
SDL_RWread(src, &palette->colors[i].b, 1, 1); SDL_RWread(src, &palette->colors[i].b, 1, 1);
SDL_RWread(src, &palette->colors[i].g, 1, 1); SDL_RWread(src, &palette->colors[i].g, 1, 1);
SDL_RWread(src, &palette->colors[i].r, 1, 1); SDL_RWread(src, &palette->colors[i].r, 1, 1);
@ -438,7 +439,7 @@ SDL_LoadBMP_RW(SDL_RWops * src, int freesrc)
} }
/* Read the surface pixels. Note that the bmp image is upside down */ /* Read the surface pixels. Note that the bmp image is upside down */
if ( SDL_RWseek(src, fp_offset+bfOffBits, RW_SEEK_SET) < 0 ) { if (SDL_RWseek(src, fp_offset + bfOffBits, RW_SEEK_SET) < 0) {
SDL_Error(SDL_EFSEEK); SDL_Error(SDL_EFSEEK);
was_error = SDL_TRUE; was_error = SDL_TRUE;
goto done; goto done;
@ -453,31 +454,30 @@ SDL_LoadBMP_RW(SDL_RWops * src, int freesrc)
switch (ExpandBMP) { switch (ExpandBMP) {
case 1: case 1:
bmpPitch = (biWidth + 7) >> 3; bmpPitch = (biWidth + 7) >> 3;
pad = (((bmpPitch)%4) ? (4-((bmpPitch)%4)) : 0); pad = (((bmpPitch) % 4) ? (4 - ((bmpPitch) % 4)) : 0);
break; break;
case 4: case 4:
bmpPitch = (biWidth + 1) >> 1; bmpPitch = (biWidth + 1) >> 1;
pad = (((bmpPitch)%4) ? (4-((bmpPitch)%4)) : 0); pad = (((bmpPitch) % 4) ? (4 - ((bmpPitch) % 4)) : 0);
break; break;
default: default:
pad = ((surface->pitch%4) ? pad = ((surface->pitch % 4) ? (4 - (surface->pitch % 4)) : 0);
(4-(surface->pitch%4)) : 0);
break; break;
} }
if ( topDown ) { if (topDown) {
bits = top; bits = top;
} else { } else {
bits = end - surface->pitch; bits = end - surface->pitch;
} }
while ( bits >= top && bits < end ) { while (bits >= top && bits < end) {
switch (ExpandBMP) { switch (ExpandBMP) {
case 1: case 1:
case 4: { case 4:{
Uint8 pixel = 0; Uint8 pixel = 0;
int shift = (8-ExpandBMP); int shift = (8 - ExpandBMP);
for ( i=0; i<surface->w; ++i ) { for (i = 0; i < surface->w; ++i) {
if ( i%(8/ExpandBMP) == 0 ) { if (i % (8 / ExpandBMP) == 0) {
if ( !SDL_RWread(src, &pixel, 1, 1) ) { if (!SDL_RWread(src, &pixel, 1, 1)) {
SDL_SetError("Error reading from BMP"); SDL_SetError("Error reading from BMP");
was_error = SDL_TRUE; was_error = SDL_TRUE;
goto done; goto done;
@ -495,12 +495,12 @@ SDL_LoadBMP_RW(SDL_RWops * src, int freesrc)
break; break;
default: default:
if ( SDL_RWread(src, bits, 1, surface->pitch) != surface->pitch ) { if (SDL_RWread(src, bits, 1, surface->pitch) != surface->pitch) {
SDL_Error(SDL_EFREAD); SDL_Error(SDL_EFREAD);
was_error = SDL_TRUE; was_error = SDL_TRUE;
goto done; goto done;
} }
if (biBitCount == 8 && palette && biClrUsed < (1 << biBitCount)) { if (biBitCount == 8 && palette && biClrUsed < (1u << biBitCount)) {
for (i = 0; i < surface->w; ++i) { for (i = 0; i < surface->w; ++i) {
if (bits[i] >= biClrUsed) { if (bits[i] >= biClrUsed) {
SDL_SetError("A BMP image contains a pixel with a color out of the palette"); SDL_SetError("A BMP image contains a pixel with a color out of the palette");
@ -512,18 +512,18 @@ SDL_LoadBMP_RW(SDL_RWops * src, int freesrc)
#if SDL_BYTEORDER == SDL_BIG_ENDIAN #if SDL_BYTEORDER == SDL_BIG_ENDIAN
/* Byte-swap the pixels if needed. Note that the 24bpp /* Byte-swap the pixels if needed. Note that the 24bpp
case has already been taken care of above. */ case has already been taken care of above. */
switch(biBitCount) { switch (biBitCount) {
case 15: case 15:
case 16: { case 16:{
Uint16 *pix = (Uint16 *)bits; Uint16 *pix = (Uint16 *) bits;
for(i = 0; i < surface->w; i++) for (i = 0; i < surface->w; i++)
pix[i] = SDL_Swap16(pix[i]); pix[i] = SDL_Swap16(pix[i]);
break; break;
} }
case 32: { case 32:{
Uint32 *pix = (Uint32 *)bits; Uint32 *pix = (Uint32 *) bits;
for(i = 0; i < surface->w; i++) for (i = 0; i < surface->w; i++)
pix[i] = SDL_Swap32(pix[i]); pix[i] = SDL_Swap32(pix[i]);
break; break;
} }
@ -532,13 +532,13 @@ SDL_LoadBMP_RW(SDL_RWops * src, int freesrc)
break; break;
} }
/* Skip padding bytes, ugh */ /* Skip padding bytes, ugh */
if ( pad ) { if (pad) {
Uint8 padbyte; Uint8 padbyte;
for ( i=0; i<pad; ++i ) { for (i = 0; i < pad; ++i) {
SDL_RWread(src, &padbyte, 1, 1); SDL_RWread(src, &padbyte, 1, 1);
} }
} }
if ( topDown ) { if (topDown) {
bits += surface->pitch; bits += surface->pitch;
} else { } else {
bits -= surface->pitch; bits -= surface->pitch;
@ -547,20 +547,20 @@ SDL_LoadBMP_RW(SDL_RWops * src, int freesrc)
if (correctAlpha) { if (correctAlpha) {
CorrectAlphaChannel(surface); CorrectAlphaChannel(surface);
} }
done: done:
if ( was_error ) { if (was_error) {
if ( src ) { if (src) {
SDL_RWseek(src, fp_offset, RW_SEEK_SET); SDL_RWseek(src, fp_offset, RW_SEEK_SET);
} }
if ( surface ) { if (surface) {
SDL_FreeSurface(surface); SDL_FreeSurface(surface);
} }
surface = NULL; surface = NULL;
} }
if ( freesrc && src ) { if (freesrc && src) {
SDL_RWclose(src); SDL_RWclose(src);
} }
return(surface); return (surface);
} }
int int