ProtoGetAvatarFormat, ProtoGetAvatarFileFormat, ProtoGetBufferFormat, ProtoGetAvatarExtension - standard helpers for protocol avatars' processing instead of the zoo that existed previously

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

3 files changed, 1 insertions, 38 deletions

diff --git a/protocols/Skype/src/skype_avatars.cpp b/protocols/Skype/src/skype_avatars.cpp
index 4f29a2e8cf..fbf8af6138 100644
--- a/protocols/Skype/src/skype_avatars.cpp
+++ b/protocols/Skype/src/skype_avatars.cpp
@@ -21,39 +21,6 @@ bool CSkypeProto::IsAvatarChanged(const SEBinary &avatar, HANDLE hContact)
 	return result;

 }

 

-int CSkypeProto::DetectAvatarFormatBuffer(const char *pBuffer)

-{

-	if (!strncmp(pBuffer, "%PNG", 4))

-		return PA_FORMAT_PNG;

-

-	if (!strncmp(pBuffer, "GIF8", 4))

-		return PA_FORMAT_GIF;

-

-	if (!_strnicmp(pBuffer, "<?xml", 5))

-		return PA_FORMAT_XML;

-

-	if ((((DWORD *)pBuffer)[0] == 0xE0FFD8FFul) || (((DWORD *)pBuffer)[0] == 0xE1FFD8FFul))

-		return PA_FORMAT_JPEG;

-

-	if (!strncmp(pBuffer, "BM", 2))

-		return PA_FORMAT_BMP;

-

-	return PA_FORMAT_UNKNOWN;

-}

-

-int CSkypeProto::DetectAvatarFormat(const wchar_t *path)

-{

-	int src = _wopen(path, _O_BINARY | _O_RDONLY, 0);

-	if (src == -1)

-		return PA_FORMAT_UNKNOWN;

-

-	char pBuf[32];

-	_read(src, pBuf, 32);

-	_close(src);

-

-	return CSkypeProto::DetectAvatarFormatBuffer(pBuf);

-}

-

 wchar_t * CSkypeProto::GetContactAvatarFilePath(HANDLE hContact)

 {

 	wchar_t *path = (wchar_t*)::mir_alloc(MAX_PATH * sizeof(wchar_t));

diff --git a/protocols/Skype/src/skype_profile.cpp b/protocols/Skype/src/skype_profile.cpp
index 699f667491..faf8e27e08 100644
--- a/protocols/Skype/src/skype_profile.cpp
+++ b/protocols/Skype/src/skype_profile.cpp
@@ -25,8 +25,7 @@ void CSkypeProto::UpdateProfileAvatar(SEObject *obj, HANDLE hContact)
 

 				if (hContact)

 				{

-					PROTO_AVATAR_INFORMATIONW pai = {0};

-					pai.cbSize = sizeof(pai);

+					PROTO_AVATAR_INFORMATIONW pai = { sizeof(pai) };

 					pai.format = PA_FORMAT_JPEG;

 					pai.hContact = hContact;

 					::wcscpy(pai.filename, path);

diff --git a/protocols/Skype/src/skype_proto.h b/protocols/Skype/src/skype_proto.h
index 432ca34dc7..20ae6437e0 100644
--- a/protocols/Skype/src/skype_proto.h
+++ b/protocols/Skype/src/skype_proto.h
@@ -283,9 +283,6 @@ protected:
 	// avatars

 	bool IsAvatarChanged(const SEBinary &avatar, HANDLE hContact = NULL);

 

-	static int DetectAvatarFormatBuffer(const char *pBuffer);

-	static int DetectAvatarFormat(const wchar_t *path);

-

 	wchar_t* GetContactAvatarFilePath(HANDLE hContact);

 

 	INT_PTR __cdecl GetAvatarInfo(WPARAM, LPARAM);