Sped up recoloring of transparent pixels.

2 files changed, 6 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 8f41a806..0a8ea89f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@
 	resource deletion by 30 seconds.
 	* src/net/connection.cpp, src/resources/mapreader.cpp,
 	src/net/network.cpp: Reduced noise in log file.
+	* src/resources/image.cpp: Sped up recoloring of transparent pixels.
 
 2007-11-16  Eugenio Favalli  <elvenprogrammer@gmail.com>
 
diff --git a/src/resources/image.cpp b/src/resources/image.cpp
index fb441bbf..d0dae462 100644
--- a/src/resources/image.cpp
+++ b/src/resources/image.cpp
@@ -113,16 +113,16 @@ Resource *Image::load(void *buffer, unsigned bufferSize, Dye const &dye)
     SDL_FreeSurface(tmpImage);
 
     Uint32 *pixels = static_cast< Uint32 * >(surf->pixels);
-    for (int i = 0, i_end = surf->w * surf->h; i != i_end; ++i)
+    for (Uint32 *p_end = pixels + surf->w * surf->h; pixels != p_end; ++pixels)
     {
-        int v[4];
+        int alpha = *pixels & 255;
+        if (!alpha) continue;
+        int v[3];
         v[0] = (*pixels >> 24) & 255;
         v[1] = (*pixels >> 16) & 255;
         v[2] = (*pixels >> 8 ) & 255;
-        v[3] = (*pixels      ) & 255;
         dye.update(v);
-        *pixels = (v[0] << 24) | (v[1] << 16) | (v[2] << 8) | v[3];
-        ++pixels;
+        *pixels = (v[0] << 24) | (v[1] << 16) | (v[2] << 8) | alpha;
     }
 
     Image *image = load(surf);