From a7ebdbabac4c0d17ea3a7999b9f5f12faaa149a1 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sun, 30 Mar 2014 21:23:14 +0000
Subject: fix for a function name

git-svn-id: http://svn.miranda-ng.org/main/trunk@8802 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/Popup/src/bitmap_funcs.cpp | 6 +++---
 plugins/Popup/src/bitmap_funcs.h   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'plugins/Popup')

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);
-- 
cgit v1.2.3