[Pingus-CVS] [pingus] 2 new revisions pushed by address@hidden on 2011-12-29 22:56 GMT

[pingus]

2 new revisions:

Revision: 15f9627988cf
Author:   Ingo Ruhnke <address@hidden>
Date:     Thu Dec 29 14:39:26 2011
Log:      Changed image-info to print info on RGBAmask/shift/loss
http://code.google.com/p/pingus/source/detail?r=15f9627988cf

Revision: 40adefba6334
Author:   Ingo Ruhnke <address@hidden>
Date:     Thu Dec 29 14:49:33 2011
Log:      Only use RGBA blitter when alpha channel is present
http://code.google.com/p/pingus/source/detail?r=40adefba6334

==============================================================================
Revision: 15f9627988cf
Author:   Ingo Ruhnke <address@hidden>
Date:     Thu Dec 29 14:39:26 2011
Log:      Changed image-info to print info on RGBAmask/shift/loss

http://code.google.com/p/pingus/source/detail?r=15f9627988cf

Modified:
 /extra/image-info.cpp

=======================================
--- /extra/image-info.cpp       Tue Dec 27 15:26:57 2011
+++ /extra/image-info.cpp       Thu Dec 29 14:39:26 2011
@@ -1,3 +1,4 @@
+#include <boost/format.hpp>
 #include <iostream>
 #include <SDL.h>
 #include <SDL_image.h>
@@ -23,9 +24,24 @@
       if (surface->flags & SDL_SRCCOLORKEY)
         std::cout << " colorkey";

-      std::cout << " bitsPerPixel:" <<  
static_cast<int>(surface->format->BitsPerPixel);
+      std::cout << " bitsPerPixel:"  <<  
static_cast<int>(surface->format->BitsPerPixel);
       std::cout << " bytesPerPixel:" <<  
static_cast<int>(surface->format->BytesPerPixel);

+      std::cout << " Rmask:" << boost::format("%08x") %  
surface->format->Rmask;
+      std::cout << " Gmask:" << boost::format("%08x") %  
surface->format->Gmask;
+      std::cout << " Bmask:" << boost::format("%08x") %  
surface->format->Bmask;
+      std::cout << " Amask:" << boost::format("%08x") %  
surface->format->Amask;
+
+      std::cout << " Rshift:" << static_cast<int>(surface->format->Rshift);
+      std::cout << " Gshift:" << static_cast<int>(surface->format->Gshift);
+      std::cout << " Bshift:" << static_cast<int>(surface->format->Bshift);
+      std::cout << " Ashift:" << static_cast<int>(surface->format->Ashift);
+
+      std::cout << " Rloss:" << static_cast<int>(surface->format->Rloss);
+      std::cout << " Gloss:" << static_cast<int>(surface->format->Gloss);
+      std::cout << " Bloss:" << static_cast<int>(surface->format->Bloss);
+      std::cout << " Aloss:" << static_cast<int>(surface->format->Aloss);
+
       std::cout << std::endl;
     }


==============================================================================
Revision: 40adefba6334
Author:   Ingo Ruhnke <address@hidden>
Date:     Thu Dec 29 14:49:33 2011
Log:      Only use RGBA blitter when alpha channel is present

http://code.google.com/p/pingus/source/detail?r=40adefba6334

Modified:
 /src/engine/display/surface.cpp

=======================================
--- /src/engine/display/surface.cpp     Thu Dec 29 11:55:44 2011
+++ /src/engine/display/surface.cpp     Thu Dec 29 14:49:33 2011
@@ -123,8 +123,9 @@
     log_error("trying to blit with an empty surface");
   }
   else if (get_surface()->format->BytesPerPixel == 4 &&
-           src.get_surface()->format->BytesPerPixel == 4)
-  {
+           src.get_surface()->format->BytesPerPixel == 4 &&
+           src.get_surface()->format->Amask)
+  {
     // RGBA to RGBA blit
     int start_x = std::max(0, -x_pos);
     int start_y = std::max(0, -y_pos);