From ab53b72bf7067feb9dede0fd76b5a3cbc13863b9 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 2 Jun 2015 15:55:48 +0000 Subject: - 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 --- include/delphi/custom_api.inc | 1 - include/m_png.h | 62 ------------------------------------------- include/m_string.h | 9 ++++--- 3 files changed, 6 insertions(+), 66 deletions(-) delete mode 100644 include/m_png.h (limited to 'include') diff --git a/include/delphi/custom_api.inc b/include/delphi/custom_api.inc index 92558ac10b..1dceb20658 100644 --- a/include/delphi/custom_api.inc +++ b/include/delphi/custom_api.inc @@ -23,7 +23,6 @@ {$include m_notify.inc} {$include m_nudge.inc} {$include m_nxsn.inc} -{$include m_png.inc} {$include m_proto_listeningto.inc} {$include m_quickcontacts.inc} {$include m_quotes.inc} diff --git a/include/m_png.h b/include/m_png.h deleted file mode 100644 index c4d130fb71..0000000000 --- a/include/m_png.h +++ /dev/null @@ -1,62 +0,0 @@ -/* - -Miranda NG: the free IM client for Microsoft* Windows* - -Copyright (ñ) 2012-15 Miranda NG project (http://miranda-ng.org) -Copyright (c) 2004-05 George Hazan (ghazan@postman.ru) - -Portions of this code are gotten from the libpng codebase. -Copyright 2000, Willem van Schaik. For conditions of distribution and -use, see the copyright/license/disclaimer notice in png.h - -Miranda IM: the free icq client for MS Windows -Copyright (C) 2000-2002 Richard Hughes, Roland Rabien & Tristan Van de Vreede - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ - -/* Image/Dib2Png -Converts a Device Independent Bitmap to a png stored in memory - wParam=0 - lParam=(WPARAM)(DIB2PNG*)descr -*/ - -typedef struct -{ - BITMAPINFO* pbmi; - BYTE* pDiData; - BYTE* pResult; - long* pResultLen; -} - DIB2PNG; - -#define MS_DIB2PNG "Image/Dib2Png" - -/* Image/Png2Dib -Converts a png stored in memory to a Device Independent Bitmap - wParam=0 - lParam=(WPARAM)(PNG2DIB*)descr -*/ - -typedef struct -{ - BYTE* pSource; - DWORD cbSourceSize; - BITMAPINFOHEADER** pResult; -} - PNG2DIB; - -#define MS_PNG2DIB "Image/Png2Dib" diff --git a/include/m_string.h b/include/m_string.h index 82e279f31f..ae769e52bc 100644 --- a/include/m_string.h +++ b/include/m_string.h @@ -607,18 +607,21 @@ public: return _vscwprintf(pszFormat, args); } -#pragma warning(push) -#pragma warning(disable : 4995 4996) static int __stdcall Format(LPWSTR pszBuffer, LPCWSTR pszFormat, va_list args) { + #pragma warning(push) + #pragma warning(disable : 4996) return vswprintf(pszBuffer, pszFormat, args); + #pragma warning(pop) } static int __stdcall Format(LPWSTR pszBuffer, size_t nLength, LPCWSTR pszFormat, va_list args) { + #pragma warning(push) + #pragma warning(disable : 4996) return _vsnwprintf(pszBuffer, nLength, pszFormat, args); + #pragma warning(pop) } -#pragma warning(pop) static int __stdcall GetBaseTypeLength(LPCSTR pszSrc) { -- cgit v1.2.3