diff options
author | Andrei Karas <akaras@inbox.ru> | 2016-12-12 20:26:59 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2016-12-12 20:26:59 +0300 |
commit | bebb71a3dfadb2b94ba46c0c66f0d40d6ef75e43 (patch) | |
tree | 4d631106f76ba8a052dc2ef8b23b8a968040db82 /src/resources/image | |
parent | 67638eeec5267977940dce29c5a94ce4d093ed69 (diff) | |
download | manaplus-bebb71a3dfadb2b94ba46c0c66f0d40d6ef75e43.tar.gz manaplus-bebb71a3dfadb2b94ba46c0c66f0d40d6ef75e43.tar.bz2 manaplus-bebb71a3dfadb2b94ba46c0c66f0d40d6ef75e43.tar.xz manaplus-bebb71a3dfadb2b94ba46c0c66f0d40d6ef75e43.zip |
Add noexcept in some files.
Diffstat (limited to 'src/resources/image')
-rw-r--r-- | src/resources/image/image.h | 26 | ||||
-rw-r--r-- | src/resources/image/subimage.h | 2 |
2 files changed, 14 insertions, 14 deletions
diff --git a/src/resources/image/image.h b/src/resources/image/image.h index bb78f685c..ca5a8a12e 100644 --- a/src/resources/image/image.h +++ b/src/resources/image/image.h @@ -96,19 +96,19 @@ class Image notfinal : public Resource /** * Tells is the image is loaded */ - bool isLoaded() const A_WARN_UNUSED + bool isLoaded() const noexcept2 A_WARN_UNUSED { return mLoaded; } /** * Returns the width of the image. */ - inline int getWidth() const A_WARN_UNUSED A_INLINE + inline int getWidth() const noexcept2 A_WARN_UNUSED A_INLINE { return mBounds.w; } /** * Returns the height of the image. */ - inline int getHeight() const A_WARN_UNUSED A_INLINE + inline int getHeight() const noexcept2 A_WARN_UNUSED A_INLINE { return mBounds.h; } /** @@ -149,7 +149,7 @@ class Image notfinal : public Resource /** * Get the alpha Channel of a SDL surface. */ - uint8_t *SDLgetAlphaChannel() const A_WARN_UNUSED + uint8_t *SDLgetAlphaChannel() const noexcept2 A_WARN_UNUSED { return mAlphaChannel; } void SDLCleanCache(); @@ -157,13 +157,13 @@ class Image notfinal : public Resource void SDLTerminateAlphaCache(); #ifdef USE_OPENGL - int getTextureWidth() const A_WARN_UNUSED + int getTextureWidth() const noexcept2 A_WARN_UNUSED { return mTexWidth; } - int getTextureHeight() const A_WARN_UNUSED + int getTextureHeight() const noexcept2 A_WARN_UNUSED { return mTexHeight; } - GLuint getGLImage() const A_WARN_UNUSED + GLuint getGLImage() const noexcept2 A_WARN_UNUSED { return mGLImage; } void decRef() override; @@ -173,27 +173,27 @@ class Image notfinal : public Resource int mTexHeight; #endif // USE_OPENGL - bool isHasAlphaChannel() const A_WARN_UNUSED + bool isHasAlphaChannel() const noexcept2 A_WARN_UNUSED { return mHasAlphaChannel; } - bool isAlphaVisible() const A_WARN_UNUSED + bool isAlphaVisible() const noexcept2 A_WARN_UNUSED { return mIsAlphaVisible; } void setAlphaVisible(const bool b) { mIsAlphaVisible = b; } - bool isAlphaCalculated() const A_WARN_UNUSED + bool isAlphaCalculated() const noexcept2 A_WARN_UNUSED { return mIsAlphaCalculated; } - void setAlphaCalculated(const bool b) + void setAlphaCalculated(const bool b) noexcept2 { mIsAlphaCalculated = b; } - SDL_Surface* getSDLSurface() + SDL_Surface* getSDLSurface() noexcept2 A_WARN_UNUSED { return mSDLSurface; } int calcMemoryLocal() const override; - virtual ImageTypeT getType() const + virtual ImageTypeT getType() const noexcept2 A_WARN_UNUSED { return ImageType::Image; } SDL_Rect mBounds; diff --git a/src/resources/image/subimage.h b/src/resources/image/subimage.h index 14decc14d..756298152 100644 --- a/src/resources/image/subimage.h +++ b/src/resources/image/subimage.h @@ -66,7 +66,7 @@ class SubImage final : public Image const int width, const int height) override final A_WARN_UNUSED; - ImageTypeT getType() const override final + ImageTypeT getType() const noexcept2 override final { return ImageType::SubImage; } int calcMemoryLocal() const override; |