diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-04-08 20:30:40 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-04-08 20:30:40 +0300 |
| commit | fd3223578c0a0789627a92cc63235c24e75f87c3 (patch) | |
| tree | 48b90671150a8ea4a7d3b9306d3eabca349d556a /src/resources/image | |
| parent | 27a2dd4fce2d529cd1d96aa5ddce1e74b4f54a2f (diff) | |
| download | manaplus-fd3223578c0a0789627a92cc63235c24e75f87c3.tar.gz manaplus-fd3223578c0a0789627a92cc63235c24e75f87c3.tar.bz2 manaplus-fd3223578c0a0789627a92cc63235c24e75f87c3.tar.xz manaplus-fd3223578c0a0789627a92cc63235c24e75f87c3.zip | |
Remove most setters and getters from Resource class.
Diffstat (limited to 'src/resources/image')
| -rw-r--r-- | src/resources/image/image.cpp | 2 | ||||
| -rw-r--r-- | src/resources/image/subimage.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/resources/image/image.cpp b/src/resources/image/image.cpp index f295be9cb..7d96cb0af 100644 --- a/src/resources/image/image.cpp +++ b/src/resources/image/image.cpp @@ -519,7 +519,7 @@ int Image::calcMemoryLocal() const #ifdef USE_OPENGL void Image::decRef() { - if (mGLImage && getRefCount() <= 1) + if (mGLImage && mRefCount <= 1) OpenGLImageHelper::invalidate(mGLImage); Resource::decRef(); } diff --git a/src/resources/image/subimage.cpp b/src/resources/image/subimage.cpp index 32e781af7..20ed676d7 100644 --- a/src/resources/image/subimage.cpp +++ b/src/resources/image/subimage.cpp @@ -97,13 +97,13 @@ SubImage::SubImage(Image *const parent, mHasAlphaChannel = mParent->hasAlphaChannel(); mIsAlphaVisible = mHasAlphaChannel; mAlphaChannel = mParent->SDLgetAlphaChannel(); - mSource = parent->getIdPath(); + mSource = parent->mIdPath; #ifdef DEBUG_IMAGES logger->log("set name2 %p, %s", static_cast<void*>(this), mSource.c_str()); #endif // DEBUG_IMAGES #ifdef DEBUG_BIND_TEXTURE - mIdPath = parent->getIdPath(); + mIdPath = parent->mIdPath; #endif // DEBUG_BIND_TEXTURE } else @@ -159,13 +159,13 @@ SubImage::SubImage(Image *const parent, mInternalBounds.y = mParent->mBounds.y; mInternalBounds.w = mParent->mBounds.w; mInternalBounds.h = mParent->mBounds.h; - mSource = parent->getIdPath(); + mSource = parent->mIdPath; #ifdef DEBUG_IMAGES logger->log("set name2 %p, %s", static_cast<void*>(this), mSource.c_str()); #endif // DEBUG_IMAGES #ifdef DEBUG_BIND_TEXTURE - mIdPath = parent->getIdPath(); + mIdPath = parent->mIdPath; #endif // DEBUG_BIND_TEXTURE } else |