- old PNG conversion code (png2dib, dib2png) removed;

- m_png.h also removed;
- all calls of LoadImage replaced with CallService(MS_IMG_LOAD);
- four invalid CloseHandle() calls removed;
- massive code cleaning for Popup, HistoryStats & SplashScreen plugins

git-svn-id: http://svn.miranda-ng.org/main/trunk@13974 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 2 insertions, 4 deletions

diff --git a/plugins/Popup/src/bitmap_funcs.h b/plugins/Popup/src/bitmap_funcs.h
index 6840e8f89e..64150200ee 100644
--- a/plugins/Popup/src/bitmap_funcs.h
+++ b/plugins/Popup/src/bitmap_funcs.h
@@ -45,18 +45,16 @@ private:
 

 	bool loadFromFile_pixel(const TCHAR *fn);

 	bool loadFromFile_gradient(const TCHAR *fn);

-	bool loadFromFile_png(const TCHAR *fn);

-	bool loadFromFile_default(const TCHAR *fn, const TCHAR *fnAlpha = 0);

 	void premultipleChannels();

 

 public:

 	MyBitmap();

 	MyBitmap(int w, int h);

-	MyBitmap(const TCHAR *fn, const TCHAR *fnAlpha = 0);

+	MyBitmap(const TCHAR *fn);

 	~MyBitmap();

 	void allocate(int w, int h);

 

-	bool loadFromFile(const TCHAR *fn, const TCHAR *fnAlpha = 0);

+	bool loadFromFile(const TCHAR *fn);

 

 	int getWidth() { return width; }

 	int getHeight() { return height; }