From 4a4c7fbfde640545495d8bc62248ffd14a4cabc8 Mon Sep 17 00:00:00 2001 From: Mark Vejvoda Date: Tue, 19 Nov 2013 06:24:22 +0000 Subject: [PATCH] - code cleanup based on additional gcc warnings --- source/shared_lib/include/util/util.h | 2 +- source/shared_lib/sources/graphics/pixmap.cpp | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/source/shared_lib/include/util/util.h b/source/shared_lib/include/util/util.h index e707e04e..8e8714f0 100644 --- a/source/shared_lib/include/util/util.h +++ b/source/shared_lib/include/util/util.h @@ -52,7 +52,7 @@ public: static uint64 getFlags() { return flags; } static void setFlag(GlobalStaticFlagTypes flag) { flags |= flag; } - static bool isFlagSet(GlobalStaticFlagTypes flag) { return (flags & flag) == flag; } + static bool isFlagSet(GlobalStaticFlagTypes flag) { return (flags & (unsigned int)flag) == flag; } protected: static bool isNonGraphicalMode; diff --git a/source/shared_lib/sources/graphics/pixmap.cpp b/source/shared_lib/sources/graphics/pixmap.cpp index 9e777f78..c910e007 100644 --- a/source/shared_lib/sources/graphics/pixmap.cpp +++ b/source/shared_lib/sources/graphics/pixmap.cpp @@ -976,22 +976,22 @@ void Pixmap2D::Scale(int format, int newW, int newH) { uint8 *newpixels= new uint8[newW * newH * useComponents]; glPixelStorei(GL_PACK_ALIGNMENT, 1); - int error = gluScaleImage( format, + GLenum glErr = gluScaleImage( format, w, h, GL_UNSIGNED_BYTE, pixels, newW, newH, GL_UNSIGNED_BYTE, newpixels); glPixelStorei(GL_UNPACK_ALIGNMENT, 1); - if(error == GL_NO_ERROR) { + if(glErr == GL_NO_ERROR) { init(newW,newH,this->components); pixels = newpixels; if(SystemFlags::VERBOSE_MODE_ENABLED) printf("Scaled image from [%d x %d] to [%d x %d]\n",originalW,originalH,w,h); } else { - const char *errorString= reinterpret_cast(gluErrorString(error)); - printf("ERROR Scaling image from [%d x %d] to [%d x %d] error: %d [%s]\n",originalW,originalH,w,h,error,errorString); + const char *errorString= reinterpret_cast(gluErrorString(glErr)); + printf("ERROR Scaling image from [%d x %d] to [%d x %d] error: %u [%s]\n",originalW,originalH,w,h,glErr,errorString); - assertGlWithErrorNumber(error); + assertGlWithErrorNumber(glErr); } CalculatePixelsCRC(pixels,getPixelByteCount(), crc);