diff options
author | George Hazan <george.hazan@gmail.com> | 2016-03-02 11:06:38 +0000 |
---|---|---|
committer | George Hazan <george.hazan@gmail.com> | 2016-03-02 11:06:38 +0000 |
commit | 14bdc60ec9715ed7a0e74ade4072cf86f3fefb4a (patch) | |
tree | 7c8c30ba5af1343682c972527caf6d0c22f3c75c /plugins/SmileyAdd/src/imagecache.cpp | |
parent | cbb56a2046b7894f4bb09e98dfb8b56febf1cb0f (diff) |
- crash fix on smiley pack change;
- massive code cleaning
git-svn-id: http://svn.miranda-ng.org/main/trunk@16389 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/SmileyAdd/src/imagecache.cpp')
-rw-r--r-- | plugins/SmileyAdd/src/imagecache.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/plugins/SmileyAdd/src/imagecache.cpp b/plugins/SmileyAdd/src/imagecache.cpp index c90d355e5f..fa6220934b 100644 --- a/plugins/SmileyAdd/src/imagecache.cpp +++ b/plugins/SmileyAdd/src/imagecache.cpp @@ -18,8 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "stdafx.h"
-static FI_INTERFACE *fei;
-
static HANDLE g_hMutexIm;
static OBJLIST<ImageBase> g_imagecache(25, ImageType::CompareImg);
@@ -294,7 +292,7 @@ ImageType::ImageType(const unsigned id, const CMString& file, IStream* pStream) if (pStream)
m_bmp = new Gdiplus::Bitmap(pStream);
else
- m_bmp = new Gdiplus::Bitmap(T2W_SM(file.c_str()));
+ m_bmp = new Gdiplus::Bitmap(file.c_str());
if (m_bmp->GetLastStatus() != Gdiplus::Ok) {
delete m_bmp;
@@ -335,7 +333,7 @@ ImageType::ImageType(const unsigned id, const CMString& file, const int index, c break;
case icoFile:
- m_bmp = new Gdiplus::Bitmap(T2W_SM(file.c_str()));
+ m_bmp = new Gdiplus::Bitmap(file.c_str());
break;
default:
@@ -513,7 +511,6 @@ void ImageFType::GetSize(SIZE& size) void InitImageCache(void)
{
g_hMutexIm = CreateMutex(NULL, FALSE, NULL);
- CallService(MS_IMG_GETINTERFACE, FI_IF_VERSION, (LPARAM)&fei);
}
void DestroyImageCache(void)
|