diff options
author | George Hazan <george.hazan@gmail.com> | 2014-03-30 21:23:14 +0000 |
---|---|---|
committer | George Hazan <george.hazan@gmail.com> | 2014-03-30 21:23:14 +0000 |
commit | a7ebdbabac4c0d17ea3a7999b9f5f12faaa149a1 (patch) | |
tree | 18505129d3047f1ebb31485f553b1d2ab3e6b5c9 /plugins/Popup/src/bitmap_funcs.cpp | |
parent | e72bfde5e74dbaea2d6871558e5e3959d8deee9a (diff) |
fix for a function name
git-svn-id: http://svn.miranda-ng.org/main/trunk@8802 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Popup/src/bitmap_funcs.cpp')
-rw-r--r-- | plugins/Popup/src/bitmap_funcs.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/plugins/Popup/src/bitmap_funcs.cpp b/plugins/Popup/src/bitmap_funcs.cpp index add146491f..6d819dbc16 100644 --- a/plugins/Popup/src/bitmap_funcs.cpp +++ b/plugins/Popup/src/bitmap_funcs.cpp @@ -69,7 +69,7 @@ MyBitmap::~MyBitmap() {
if (bitsSave)
delete [] bitsSave;
- free();
+ freemem();
}
void MyBitmap::makeOpaque()
@@ -922,7 +922,7 @@ bool MyBitmap::loadFromFile_default(const char *fn, const char *fnAlpha) bool MyBitmap::loadFromFile(const char *fn, const char *fnAlpha)
{
- if (bits) free();
+ if (bits) freemem();
if (!strncmp(fn, "pixel:", lstrlenA("pixel:")))
{
@@ -974,7 +974,7 @@ void MyBitmap::allocate(int w, int h) GdiFlush();
}
-void MyBitmap::free()
+void MyBitmap::freemem()
{
GdiFlush();
|