pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-04-07 13:55:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #397 from ONLYOFFICE/feature/metafile

Browse Source 
Feature/metafile
This commit is contained in:
Elena Subbotina
2020-10-30 11:23:54 +03:00
committed by GitHub
parent f9b5f8ba01 3e5bc50e3d
commit 8b523427bf
3 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
DesktopEditor/freetype-2.5.2/include/ft2build.h
View File

@ -34,6 +34,7 @@
#ifndef __FT2BUILD_H__ #ifndef __FT2BUILD_H__
#define __FT2BUILD_H__ #define __FT2BUILD_H__
#include <internal/internal.h>
#include <config/ftheader.h> #include <config/ftheader.h>
#endif /* __FT2BUILD_H__ */ #endif /* __FT2BUILD_H__ */

19
DesktopEditor/raster/Metafile/TestMain.cpp
View File

@ -39,6 +39,25 @@
#include "../../../HtmlRenderer/include/ASCSVGWriter.h" #include "../../../HtmlRenderer/include/ASCSVGWriter.h"
#include "MetaFile.h" #include "MetaFile.h"
#if defined(_WIN64)
#if defined(_DEBUG)
#pragma comment(lib, "../../../build/lib/win_64/DEBUG/kernel.lib")
#pragma comment(lib, "../../../build/lib/win_64/DEBUG/UnicodeConverter.lib")
#else
#pragma comment(lib, "../../../build/lib/win_64/kernel.lib")
#pragma comment(lib, "../../../build/lib/win_64/UnicodeConverter.lib")
#endif
#pragma comment(lib, "../../build/bin/icu/win_64/icuuc.lib")
#elif defined (_WIN32)
#if defined(_DEBUG)
#pragma comment(lib, "../../../build/lib/win_32/DEBUG/kernel.lib")
#pragma comment(lib, "../../../build/lib/win_32/DEBUG/UnicodeConverter.lib")
#else
#pragma comment(lib, "../../../build/lib/win_32/kernel.lib")
#pragma comment(lib, "../../../build/lib/win_32/UnicodeConverter.lib")
#endif
#pragma comment(lib, "../../../build/bin/icu/win_32/icuuc.lib")
#endif
std::vector<std::wstring> GetAllFilesInFolder(std::wstring wsFolder, std::wstring wsExt) std::vector<std::wstring> GetAllFilesInFolder(std::wstring wsFolder, std::wstring wsExt)
{ {

4
DesktopEditor/raster/Metafile/Wmf/WmfFile.h
View File

@ -760,7 +760,7 @@ namespace MetaFile
else else
{ {
RegisterPoint(nX, nY); RegisterPoint(nX, nY);
RegisterPoint(nX + nW, nY + nH); RegisterPoint(nX + nW, nY + nH);
} }
} }
void UpdateOutputDC() void UpdateOutputDC()
@ -1568,7 +1568,7 @@ namespace MetaFile
{ {
short shX, shY; short shX, shY;
m_oStream >> shY >> shX; m_oStream >> shY >> shX;
m_pDC->SetWindowExt(shX, shY); m_pDC->SetWindowExt(fabs(shX), fabs(shY));
UpdateOutputDC(); UpdateOutputDC();
} }
void Read_META_SETWINDOWORG() void Read_META_SETWINDOWORG()