github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-08-28 06:12:53 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

.CtrlCore: MetaFile patch (thanks mr_ped)

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@3090 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2011-01-25 12:20:22 +00:00
parent 62dcbf77db
commit 520cdec84e
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
uppsrc/CtrlCore/DrawWin32.h
View file

@ -151,7 +151,7 @@ public:
void Attach(HENHMETAFILE emf);
HENHMETAFILE *Detach();
void Set(const void *data, int len);
void Set(const void *data, dword len);
void Set(const String& data) { Set(~data, data.GetCount()); }
String Get() const;

5
uppsrc/CtrlCore/MetaFile.cpp
View file

@ -93,7 +93,7 @@ struct PLACEABLE_METAFILEHEADER
};
#pragma pack(pop)
void WinMetaFile::Set(const void *data, int len)
void WinMetaFile::Set(const void *data, dword len)
{
Clear();
@ -106,7 +106,8 @@ void WinMetaFile::Set(const void *data, int len)
if((hemf = ::SetEnhMetaFileBits(len, (const BYTE *)data)) != NULL)
Attach(hemf);
else
if(first == 0x9AC6CDD7) {
if(first == (int)0x9AC6CDD7) {
if ( len <= 22 ) return;
const PLACEABLE_METAFILEHEADER *mfh = (const PLACEABLE_METAFILEHEADER *)data;
Attach(::SetWinMetaFileBits(len - 22, (const BYTE *)data + 22, NULL, NULL));
size = 600 * Size(mfh->right - mfh->left, mfh->bottom - mfh->top) / 2540;