Fixed compile warnings about unsigned/signed integer comparisons

TMW-forks · Jul 25, 2009 · c7d5d82 · c7d5d82
1 parent 8d6636e
commit c7d5d82
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -253,8 +253,8 @@ tmw_SOURCES = gui/widgets/avatar.cpp \
 	      resources/resource.h \
 	      resources/resourcemanager.cpp \
 	      resources/resourcemanager.h \
-	      resources/sdlrescalefacility.h \
 	      resources/sdlrescalefacility.cpp \
+	      resources/sdlrescalefacility.h \
 	      resources/soundeffect.h \
 	      resources/soundeffect.cpp \
 	      resources/spritedef.h \

diff --git a/src/resources/image.cpp b/src/resources/image.cpp
@@ -405,7 +405,7 @@ float Image::getAlpha() const
     return mAlpha;
 }
 
-Image* Image::SDLgetScaledImage(unsigned int width, unsigned int height)
+Image* Image::SDLgetScaledImage(int width, int height)
 {
     // No scaling on incorrect new values.
     if (width == 0 || height == 0)

diff --git a/src/resources/image.h b/src/resources/image.h
@@ -95,7 +95,7 @@ class Image : public Resource
          *
          * @return A new Image* object.
          */        
-        Image* SDLgetScaledImage(unsigned int width, unsigned int height);
+        Image* SDLgetScaledImage(int width, int height);
 
         /**
          * Frees the resources created by SDL.

diff --git a/src/resources/sdlrescalefacility.cpp b/src/resources/sdlrescalefacility.cpp
@@ -266,7 +266,8 @@ int zoomSurfaceRGBA(SDL_Surface * src, SDL_Surface * dst, int flipx, int flipy,
 
 int zoomSurfaceY(SDL_Surface * src, SDL_Surface * dst, int flipx, int flipy)
 {
-    Uint32 x, y, sx, sy, *sax, *say, *csax, *csay, csx, csy, sstep;
+    int x, y;
+    Uint32 sx, sy, *sax, *say, *csax, *csay, csx, csy, sstep;
     Uint8 *sp, *dp, *csp;
     int dgap;