diff options
| author | Thorbjørn Lindeijer <bjorn@lindeijer.nl> | 2009-07-25 22:25:01 +0200 |
|---|---|---|
| committer | Thorbjørn Lindeijer <bjorn@lindeijer.nl> | 2009-07-25 22:32:48 +0200 |
| commit | c7d5d825999912892d99c295ba7b583eaaa884ff (patch) | |
| tree | 71036239d82b1759e239bffa34c2ee448004b1e3 | |
| parent | 8d6636e69bc5e579190d2f5fd635e6a44ef1fdca (diff) | |
| download | mana-c7d5d825999912892d99c295ba7b583eaaa884ff.tar.gz mana-c7d5d825999912892d99c295ba7b583eaaa884ff.tar.bz2 mana-c7d5d825999912892d99c295ba7b583eaaa884ff.tar.xz mana-c7d5d825999912892d99c295ba7b583eaaa884ff.zip | |
Fixed compile warnings about unsigned/signed integer comparisons
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/resources/image.cpp | 2 | ||||
| -rw-r--r-- | src/resources/image.h | 2 | ||||
| -rw-r--r-- | src/resources/sdlrescalefacility.cpp | 3 |
4 files changed, 5 insertions, 4 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 75040d02..25fdb140 100644 --- 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 index 66f87ccb..dafc3e87 100644 --- 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 index dc06a5f3..25339e68 100644 --- 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 index cc478483..54021bd0 100644 --- 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; |