Browse Source

Fixed assertion loading button.bmp in testgamecontroller

Sam Lantinga 11 years ago
parent
commit
229b438d42
1 changed files with 7 additions and 3 deletions
  1. 7 3
      test/testgamecontroller.c

+ 7 - 3
test/testgamecontroller.c

@@ -85,9 +85,13 @@ LoadTexture(SDL_Renderer *renderer, char *file, SDL_bool transparent)
     } else {
     } else {
         /* Set transparent pixel as the pixel at (0,0) */
         /* Set transparent pixel as the pixel at (0,0) */
         if (transparent) {
         if (transparent) {
-            SDL_assert(!temp->format->palette);
-            SDL_assert(temp->format->BitsPerPixel == 24);
-            SDL_SetColorKey(temp, SDL_TRUE, (*(Uint32 *) temp->pixels) & 0x00FFFFFF);
+            if (temp->format->BytesPerPixel == 1) {
+                SDL_SetColorKey(temp, SDL_TRUE, *(Uint8 *)temp->pixels);
+            } else {
+                SDL_assert(!temp->format->palette);
+                SDL_assert(temp->format->BitsPerPixel == 24);
+                SDL_SetColorKey(temp, SDL_TRUE, (*(Uint32 *)temp->pixels) & 0x00FFFFFF);
+            }
         }
         }
 
 
         texture = SDL_CreateTextureFromSurface(renderer, temp);
         texture = SDL_CreateTextureFromSurface(renderer, temp);