src/video/SDL_bmp.c
changeset 7677 871d43c6968a
parent 7378 3d5f62bac8e7
child 7678 286c42d7c5ed
     1.1 --- a/src/video/SDL_bmp.c	Tue Aug 20 23:20:32 2013 -0400
     1.2 +++ b/src/video/SDL_bmp.c	Wed Aug 21 09:43:09 2013 -0300
     1.3 @@ -97,23 +97,23 @@
     1.4  
     1.5      /* The Win32 BMP file header (14 bytes) */
     1.6      char magic[2];
     1.7 -    /*Uint32 bfSize = 0;*/
     1.8 -    /*Uint16 bfReserved1 = 0;*/
     1.9 -    /*Uint16 bfReserved2 = 0;*/
    1.10 +    /*Uint32 bfSize = 0; */
    1.11 +    /*Uint16 bfReserved1 = 0; */
    1.12 +    /*Uint16 bfReserved2 = 0; */
    1.13      Uint32 bfOffBits = 0;
    1.14  
    1.15      /* The Win32 BITMAPINFOHEADER struct (40 bytes) */
    1.16      Uint32 biSize = 0;
    1.17      Sint32 biWidth = 0;
    1.18      Sint32 biHeight = 0;
    1.19 -    /*Uint16 biPlanes = 0;*/
    1.20 +    /*Uint16 biPlanes = 0; */
    1.21      Uint16 biBitCount = 0;
    1.22      Uint32 biCompression = 0;
    1.23 -    /*Uint32 biSizeImage = 0;*/
    1.24 -    /*Sint32 biXPelsPerMeter = 0;*/
    1.25 -    /*Sint32 biYPelsPerMeter = 0;*/
    1.26 +    /*Uint32 biSizeImage = 0; */
    1.27 +    /*Sint32 biXPelsPerMeter = 0; */
    1.28 +    /*Sint32 biYPelsPerMeter = 0; */
    1.29      Uint32 biClrUsed = 0;
    1.30 -    /*Uint32 biClrImportant = 0;*/
    1.31 +    /*Uint32 biClrImportant = 0; */
    1.32  
    1.33      /* Make sure we are passed a valid data source */
    1.34      surface = NULL;
    1.35 @@ -136,9 +136,9 @@
    1.36          was_error = SDL_TRUE;
    1.37          goto done;
    1.38      }
    1.39 -    /*bfSize =*/ SDL_ReadLE32(src);
    1.40 -    /*bfReserved1 =*/ SDL_ReadLE16(src);
    1.41 -    /*bfReserved2 =*/ SDL_ReadLE16(src);
    1.42 +    /*bfSize = */ SDL_ReadLE32(src);
    1.43 +    /*bfReserved1 = */ SDL_ReadLE16(src);
    1.44 +    /*bfReserved2 = */ SDL_ReadLE16(src);
    1.45      bfOffBits = SDL_ReadLE32(src);
    1.46  
    1.47      /* Read the Win32 BITMAPINFOHEADER */
    1.48 @@ -146,20 +146,20 @@
    1.49      if (biSize == 12) {
    1.50          biWidth = (Uint32) SDL_ReadLE16(src);
    1.51          biHeight = (Uint32) SDL_ReadLE16(src);
    1.52 -        /*biPlanes =*/ SDL_ReadLE16(src);
    1.53 +        /*biPlanes = */ SDL_ReadLE16(src);
    1.54          biBitCount = SDL_ReadLE16(src);
    1.55          biCompression = BI_RGB;
    1.56      } else {
    1.57          biWidth = SDL_ReadLE32(src);
    1.58          biHeight = SDL_ReadLE32(src);
    1.59 -        /*biPlanes =*/ SDL_ReadLE16(src);
    1.60 +        /*biPlanes = */ SDL_ReadLE16(src);
    1.61          biBitCount = SDL_ReadLE16(src);
    1.62          biCompression = SDL_ReadLE32(src);
    1.63 -        /*biSizeImage =*/ SDL_ReadLE32(src);
    1.64 -        /*biXPelsPerMeter =*/ SDL_ReadLE32(src);
    1.65 -        /*biYPelsPerMeter =*/ SDL_ReadLE32(src);
    1.66 +        /*biSizeImage = */ SDL_ReadLE32(src);
    1.67 +        /*biXPelsPerMeter = */ SDL_ReadLE32(src);
    1.68 +        /*biYPelsPerMeter = */ SDL_ReadLE32(src);
    1.69          biClrUsed = SDL_ReadLE32(src);
    1.70 -        /*biClrImportant =*/ SDL_ReadLE32(src);
    1.71 +        /*biClrImportant = */ SDL_ReadLE32(src);
    1.72      }
    1.73      if (biHeight < 0) {
    1.74          topDown = SDL_TRUE;