diff options
| -rw-r--r-- | plugins/Popup/src/bitmap_funcs.cpp | 6 | ||||
| -rw-r--r-- | plugins/Popup/src/bitmap_funcs.h | 2 |
2 files changed, 4 insertions, 4 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();
diff --git a/plugins/Popup/src/bitmap_funcs.h b/plugins/Popup/src/bitmap_funcs.h index 3ac0c81f85..d4c8157c86 100644 --- a/plugins/Popup/src/bitmap_funcs.h +++ b/plugins/Popup/src/bitmap_funcs.h @@ -41,7 +41,7 @@ private: COLOR32 *bitsSave;
int width, height;
- void free();
+ void freemem();
bool loadFromFile_pixel(const char *fn, const char *fnAlpha = 0);
bool loadFromFile_gradient(const char *fn, const char *fnAlpha = 0);
|