From bb66fe9fc5ba324e473d2dbcd913679ecb372fa5 Mon Sep 17 00:00:00 2001
From: Oleg Korshul <Oleg.Korshul@onlyoffice.com>
Date: Thu, 4 Aug 2022 19:18:14 +0300
Subject: [PATCH] Refactoring graphics project

---
 DesktopEditor/common/SystemUtils.cpp          |   2 +-
 DesktopEditor/graphics/GraphicsRenderer.cpp   |   3 +
 DesktopEditor/graphics/ImageFilesCache.h      | 152 ++---
 .../graphics/MetafileToGraphicsRenderer.cpp   |   9 +-
 DesktopEditor/graphics/pro/Image.h            |   2 +
 DesktopEditor/graphics/pro/fontengine.pri     |  60 ++
 DesktopEditor/graphics/pro/freetype.pri       |  38 +-
 DesktopEditor/graphics/pro/graphics.pro       | 554 +++---------------
 .../graphics/pro/js/qt/raster/raster.pro      | 351 ++---------
 DesktopEditor/graphics/pro/metafile.pri       |  89 +++
 .../graphics/pro/pro_Fonts_empty.cpp          |  86 +++
 .../graphics/pro/pro_Graphics_empty.cpp       |  38 ++
 DesktopEditor/graphics/pro/pro_Image.cpp      |   6 +-
 DesktopEditor/graphics/pro/pro_base.cpp       |  70 +--
 DesktopEditor/graphics/pro/raster.pri         |  97 ++-
 DesktopEditor/raster/Metafile/MetaFile.cpp    |  37 ++
 DesktopEditor/raster/Metafile/MetaFile.h      |  12 +
 17 files changed, 642 insertions(+), 964 deletions(-)
 create mode 100644 DesktopEditor/graphics/pro/fontengine.pri
 create mode 100644 DesktopEditor/graphics/pro/metafile.pri
 create mode 100644 DesktopEditor/graphics/pro/pro_Fonts_empty.cpp
 create mode 100644 DesktopEditor/graphics/pro/pro_Graphics_empty.cpp

diff --git a/DesktopEditor/common/SystemUtils.cpp b/DesktopEditor/common/SystemUtils.cpp
index 61222a1b4d..a8da484c89 100644
--- a/DesktopEditor/common/SystemUtils.cpp
+++ b/DesktopEditor/common/SystemUtils.cpp
@@ -86,7 +86,7 @@ namespace NSSystemUtils
 #ifdef _WIN32
         wchar_t sAppDataLocal[65535];
 
-        if (SUCCEEDED(SHGetFolderPath(NULL, CSIDL_LOCAL_APPDATA, NULL, 0, sAppDataLocal)))
+		if (SUCCEEDED(SHGetFolderPathW(NULL, CSIDL_LOCAL_APPDATA, NULL, 0, sAppDataLocal)))
         {
             sAppDataPath = std::wstring(sAppDataLocal);
         }
diff --git a/DesktopEditor/graphics/GraphicsRenderer.cpp b/DesktopEditor/graphics/GraphicsRenderer.cpp
index b6adde2980..c4b0068e6e 100644
--- a/DesktopEditor/graphics/GraphicsRenderer.cpp
+++ b/DesktopEditor/graphics/GraphicsRenderer.cpp
@@ -31,7 +31,10 @@
  */
 #include "GraphicsRenderer.h"
 #include <algorithm>
+
+#ifndef GRAPHICS_DISABLE_METAFILE
 #include "../raster/Metafile/MetaFile.h"
+#endif
 
 #if 0
 static void LOGGING(char* buffer, ...)
diff --git a/DesktopEditor/graphics/ImageFilesCache.h b/DesktopEditor/graphics/ImageFilesCache.h
index 7fa8b60bfc..793f58f37b 100644
--- a/DesktopEditor/graphics/ImageFilesCache.h
+++ b/DesktopEditor/graphics/ImageFilesCache.h
@@ -35,10 +35,12 @@
 #include "Image.h"
 #include "TemporaryCS.h"
 #include <map>
-#include "../fontengine/ApplicationFonts.h"
-#include "../raster/Metafile/MetaFile.h"
 #include "../common/File.h"
 
+#ifndef GRAPHICS_DISABLE_METAFILE
+#include "../raster/Metafile/MetaFile.h"
+#endif
+
 #if defined (GetTempPath)
 #undef GetTempPath
 #endif
@@ -51,41 +53,45 @@ private:
 	Aggplus::CImage m_oImage;
 
 public:
-    CCacheImage(CApplicationFonts* pFonts) : NSImages::ICacheImage(), m_oImage()
+	CCacheImage(NSFonts::IApplicationFonts* pFonts) : NSImages::ICacheImage(), m_oImage()
 	{
 	}
 
-    CCacheImage(CApplicationFonts* pFonts, const std::wstring& strFile) : NSImages::ICacheImage()
+	CCacheImage(NSFonts::IApplicationFonts* pFonts, const std::wstring& strFile) : NSImages::ICacheImage()
 	{
-        if (NULL == pFonts)
-        {
-            m_oImage.Create(strFile);
-        }
-        else
-        {
-            MetaFile::IMetaFile* pMetafile = MetaFile::Create(pFonts);
-            bool bIsMetafile = pMetafile->LoadFromFile(strFile.c_str());
-            if (!bIsMetafile)
-            {
-                m_oImage.Create(strFile);
-            }
-            else
-            {
-                std::wstring sTempFile = NSFile::CFileBinary::CreateTempFileWithUniqueName(NSFile::CFileBinary::GetTempPath(), L"AscMetafile_");
-                pMetafile->ConvertToRaster(sTempFile.c_str(), 4, 1000, -1);
-                m_oImage.Create(sTempFile);
+		if (NULL == pFonts)
+		{
+			m_oImage.Create(strFile);
+		}
+		else
+		{
+#ifdef GRAPHICS_DISABLE_METAFILE
+			m_oImage.Create(strFile);
+#else
+			MetaFile::IMetaFile* pMetafile = MetaFile::Create(pFonts);
+			bool bIsMetafile = pMetafile->LoadFromFile(strFile.c_str());
+			if (!bIsMetafile)
+			{
+				m_oImage.Create(strFile);
+			}
+			else
+			{
+				std::wstring sTempFile = NSFile::CFileBinary::CreateTempFileWithUniqueName(NSFile::CFileBinary::GetTempPath(), L"AscMetafile_");
+				pMetafile->ConvertToRaster(sTempFile.c_str(), 4, 1000, -1);
+				m_oImage.Create(sTempFile);
 
-                NSFile::CFileBinary::Remove(sTempFile);
-            }
-            RELEASEINTERFACE(pMetafile);
-        }
+				NSFile::CFileBinary::Remove(sTempFile);
+			}
+			RELEASEINTERFACE(pMetafile);
+#endif
+		}
 	}
 
-    virtual ~CCacheImage()
-    {
-    }
+	virtual ~CCacheImage()
+	{
+	}
 
-    virtual Aggplus::CImage* GetImage()
+	virtual Aggplus::CImage* GetImage()
 	{
 		return &m_oImage;
 	}
@@ -97,30 +103,30 @@ private:
 	std::map<std::wstring, CCacheImage*> m_mapImages;
 	LONG m_lMaxCount;
 
-    CApplicationFonts* m_pApplicationFonts;
+	NSFonts::IApplicationFonts* m_pApplicationFonts;
 
 	NSCriticalSection::CRITICAL_SECTION m_oCS;
 
 public:
-    CImageFilesCache(CApplicationFonts* pFonts = NULL) : NSImages::IImageFilesCache()
+	CImageFilesCache(NSFonts::IApplicationFonts* pFonts = NULL) : NSImages::IImageFilesCache()
 	{
-        m_pApplicationFonts = pFonts;
+		m_pApplicationFonts = pFonts;
 		m_lMaxCount = 10;
 
 		m_oCS.InitializeCriticalSection();
 
-        ADDREFINTERFACE(m_pApplicationFonts);
+		ADDREFINTERFACE(m_pApplicationFonts);
 	}
 
-    virtual ~CImageFilesCache()
+	virtual ~CImageFilesCache()
 	{
 		Clear();
 		m_oCS.DeleteCriticalSection();
 
-        RELEASEINTERFACE(m_pApplicationFonts);
+		RELEASEINTERFACE(m_pApplicationFonts);
 	}
 
-    virtual void Clear()
+	virtual void Clear()
 	{
 		CTemporaryCS oCS(&m_oCS);
 
@@ -132,7 +138,7 @@ public:
 		m_mapImages.clear();
 	}
 
-    virtual NSImages::ICacheImage* Lock(const std::wstring& strFile)
+	virtual NSImages::ICacheImage* Lock(const std::wstring& strFile)
 	{
 		CTemporaryCS oCS(&m_oCS);
 
@@ -149,44 +155,44 @@ public:
 		{
 			int nNeedDelete = nCount - m_lMaxCount;
 
-            while (nNeedDelete > 0)
-            {
-                std::map<std::wstring,CCacheImage*>::iterator it2 = m_mapImages.begin();
-                if (it2 != m_mapImages.end())
-                {
-                    it2->second->Release();
-                    m_mapImages.erase(it2);
-                }
-                --nNeedDelete;
-            }
-        }
+			while (nNeedDelete > 0)
+			{
+				std::map<std::wstring,CCacheImage*>::iterator it2 = m_mapImages.begin();
+				if (it2 != m_mapImages.end())
+				{
+					it2->second->Release();
+					m_mapImages.erase(it2);
+				}
+				--nNeedDelete;
+			}
+		}
 
-        CCacheImage* pImage = new CCacheImage(m_pApplicationFonts, strFile);
+		CCacheImage* pImage = new CCacheImage(m_pApplicationFonts, strFile);
 
-        if (pImage->GetImage()->GetLastStatus() != Aggplus::Ok)
-            return pImage;
+		if (pImage->GetImage()->GetLastStatus() != Aggplus::Ok)
+			return pImage;
 
 		m_mapImages[strFile] = pImage;
 		pImage->AddRef();
 		return pImage;
 	}
 
-    virtual bool UnLock(const std::wstring& strFile)
-    {
-        CTemporaryCS oCS(&m_oCS);
+	virtual bool UnLock(const std::wstring& strFile)
+	{
+		CTemporaryCS oCS(&m_oCS);
 
-        std::map<std::wstring,CCacheImage*>::iterator it = m_mapImages.find(strFile);
-        if (it != m_mapImages.end())
-        {
-            it->second->Release();
-            m_mapImages.erase(it);
-            return true;
-        }
+		std::map<std::wstring,CCacheImage*>::iterator it = m_mapImages.find(strFile);
+		if (it != m_mapImages.end())
+		{
+			it->second->Release();
+			m_mapImages.erase(it);
+			return true;
+		}
 
-        return false;
-    }
+		return false;
+	}
 	
-    virtual int Release()
+	virtual int Release()
 	{
 		m_oCS.Enter();
 		--m_lRef;
@@ -201,15 +207,15 @@ public:
 		m_oCS.Leave();
 		return m_lRef;
 	}
-    
-    virtual void SetApplicationFonts(NSFonts::IApplicationFonts* pApplicationFonts)
-    {
-        if (m_pApplicationFonts)
-            m_pApplicationFonts->Release();
-        m_pApplicationFonts = (CApplicationFonts*)pApplicationFonts;
-        if (m_pApplicationFonts)
-            m_pApplicationFonts->AddRef();
-    }
+
+	virtual void SetApplicationFonts(NSFonts::IApplicationFonts* pApplicationFonts)
+	{
+		if (m_pApplicationFonts)
+			m_pApplicationFonts->Release();
+		m_pApplicationFonts = pApplicationFonts;
+		if (m_pApplicationFonts)
+			m_pApplicationFonts->AddRef();
+	}
 };
 
 #endif // _BUILD_IMAGEFILESCACHE_H_
diff --git a/DesktopEditor/graphics/MetafileToGraphicsRenderer.cpp b/DesktopEditor/graphics/MetafileToGraphicsRenderer.cpp
index d7e0bbdc87..d5ae5e7aec 100644
--- a/DesktopEditor/graphics/MetafileToGraphicsRenderer.cpp
+++ b/DesktopEditor/graphics/MetafileToGraphicsRenderer.cpp
@@ -32,6 +32,7 @@
 #include "./MetafileToGraphicsRenderer.h"
 #include "./MetafileToRendererCheck.h"
 #include "GraphicsRenderer.h"
+#include "../common/StringExt.h"
 
 namespace NSOnlineOfficeBinToPdf
 {
@@ -42,7 +43,7 @@ namespace NSOnlineOfficeBinToPdf
         std::wstring wsThemesPlace;
         std::wstring wsTempDir;
 
-        CApplicationFonts* appFonts;
+		NSFonts::IApplicationFonts* appFonts;
 
         int m_nRasterFormat;
         int m_nSaveType; // 0 = stretch, 1 = aspect (width == maxsize)
@@ -208,8 +209,8 @@ namespace NSOnlineOfficeBinToPdf
         if (m_internal->m_bIsOnlyFirst)
             nPagesCount = 1;
 
-        CFontManager* pFontManager = (CFontManager*)m_internal->appFonts->GenerateFontManager();
-        CFontsCache* pFontsCache = new CFontsCache();
+		NSFonts::IFontManager* pFontManager = m_internal->appFonts->GenerateFontManager();
+		NSFonts::IFontsCache* pFontsCache = NSFonts::NSFontCache::Create();
         pFontsCache->SetStreams(m_internal->appFonts->GetStreams());
         pFontManager->SetOwnerCache(pFontsCache);
 
@@ -366,7 +367,7 @@ namespace NSOnlineOfficeBinToPdf
 
     void CMetafileToRenderterRaster::SetApplication(NSFonts::IApplicationFonts* pFonts)
     {
-        m_internal->appFonts = (CApplicationFonts*)pFonts;
+		m_internal->appFonts = pFonts;
     }
 
     int CMetafileToRenderterRaster::GetRasterFormat()
diff --git a/DesktopEditor/graphics/pro/Image.h b/DesktopEditor/graphics/pro/Image.h
index ec372ab4c0..0a709b8036 100644
--- a/DesktopEditor/graphics/pro/Image.h
+++ b/DesktopEditor/graphics/pro/Image.h
@@ -107,6 +107,7 @@ namespace NSImages
     };
 }
 
+#ifndef GRAPHICS_DISABLE_METAFILE
 namespace MetaFile
 {
     const int c_lMetaWmf = 0x01;
@@ -141,5 +142,6 @@ namespace MetaFile
 
     GRAPHICS_DECL IMetaFile* Create(NSFonts::IApplicationFonts *pAppFonts);
 }
+#endif
 
 #endif // _GRAPHICS_EXPORTS_IMAGE_H_
diff --git a/DesktopEditor/graphics/pro/fontengine.pri b/DesktopEditor/graphics/pro/fontengine.pri
new file mode 100644
index 0000000000..92a9aea8a8
--- /dev/null
+++ b/DesktopEditor/graphics/pro/fontengine.pri
@@ -0,0 +1,60 @@
+include(freetype.pri)
+
+FONT_ENGINE_PATH = $$PWD/../../fontengine
+
+HEADERS += \
+    $$PWD/Fonts.h \
+	$$FONT_ENGINE_PATH/ApplicationFonts.h \
+	$$FONT_ENGINE_PATH/FontFile.h \
+	$$FONT_ENGINE_PATH/FontPath.h \
+	$$FONT_ENGINE_PATH/GlyphString.h \
+	$$FONT_ENGINE_PATH/FontManager.h \
+	$$FONT_ENGINE_PATH/FontConverter.h
+
+SOURCES += \
+    $$FONT_ENGINE_PATH/ApplicationFonts.cpp \
+	$$FONT_ENGINE_PATH/FontFile.cpp \
+	$$FONT_ENGINE_PATH/FontManager.cpp \
+	$$FONT_ENGINE_PATH/FontPath.cpp \
+	$$FONT_ENGINE_PATH/GlyphString.cpp
+
+# Application fonts worker
+HEADERS += $$FONT_ENGINE_PATH/ApplicationFontsWorker.h
+SOURCES += $$FONT_ENGINE_PATH/ApplicationFontsWorker.cpp
+
+# deprecated!!! remove after 6.5 ------------------
+HEADERS += $$FONT_ENGINE_PATH/FontsAssistant.h
+SOURCES += $$FONT_ENGINE_PATH/FontsAssistant.cpp
+# -------------------------------------------------
+
+# ------------------- shaper ----------------------
+HEADERS += $$FONT_ENGINE_PATH/TextShaper.h
+SOURCES += $$FONT_ENGINE_PATH/TextShaper.cpp
+
+include($$PWD/textshaper.pri)
+
+enable_support_shaper {
+    include($$PWD/../../../Common/3dParty/harfbuzz/harfbuzz.pri)
+}
+# -------------------------------------------------
+
+core_ios {
+
+    OBJECTIVE_SOURCES += \
+	    $$FONT_ENGINE_PATH/ApplicationFonts_ios.mm \
+
+    LIBS += -framework Foundation
+}
+
+SOURCES += $$PWD/pro_Fonts.cpp
+
+support_font_converter {
+SOURCES += \
+    $$FONT_ENGINE_PATH/fontconverter/StringExt.cpp \
+	$$FONT_ENGINE_PATH/fontconverter/Hash.cpp \
+	$$FONT_ENGINE_PATH/fontconverter/FontConverter.cpp \
+	$$FONT_ENGINE_PATH/fontconverter/FontFileEncodings.cpp \
+	$$FONT_ENGINE_PATH/fontconverter/FontFileTrueType.cpp \
+	$$FONT_ENGINE_PATH/fontconverter/FontFileType1.cpp \
+	$$FONT_ENGINE_PATH/fontconverter/FontFileType1C.cpp
+}
diff --git a/DesktopEditor/graphics/pro/freetype.pri b/DesktopEditor/graphics/pro/freetype.pri
index da96ced034..3b88a4207c 100644
--- a/DesktopEditor/graphics/pro/freetype.pri
+++ b/DesktopEditor/graphics/pro/freetype.pri
@@ -2,27 +2,33 @@ DEFINES += FT_CONFIG_OPTION_SYSTEM_ZLIB
 DEFINES += FT2_BUILD_LIBRARY
 FREETYPE_VERSION=2.10.4
 
-OFFICEUTILS_PATH = $$PWD/../../../OfficeUtils
 FREETYPE_PATH = $$PWD/../../freetype-$$FREETYPE_VERSION
 
 INCLUDEPATH += \
-	$$OFFICEUTILS_PATH/src/zlib-1.2.11 \
-	$$OFFICEUTILS_PATH/src \
 	$$FREETYPE_PATH/include \
     $$FREETYPE_PATH/include/freetype
-	
-SOURCES += \
-    $$OFFICEUTILS_PATH/src/zlib-1.2.11/crc32.c \
-    $$OFFICEUTILS_PATH/src/zlib-1.2.11/adler32.c \
-    $$OFFICEUTILS_PATH/src/zlib-1.2.11/deflate.c \
-    $$OFFICEUTILS_PATH/src/zlib-1.2.11/inffast.c \
-    $$OFFICEUTILS_PATH/src/zlib-1.2.11/inflate.c \
-    $$OFFICEUTILS_PATH/src/zlib-1.2.11/inftrees.c \
-    $$OFFICEUTILS_PATH/src/zlib-1.2.11/trees.c \
-    $$OFFICEUTILS_PATH/src/zlib-1.2.11/zutil.c \
-    $$OFFICEUTILS_PATH/src/zlib-1.2.11/uncompr.c \
-    $$OFFICEUTILS_PATH/src/zlib-1.2.11/compress.c \
-    $$OFFICEUTILS_PATH/src/zlib_addon.c
+
+!config_zlip_image {
+    OFFICEUTILS_PATH = $$PWD/../../../OfficeUtils
+	INCLUDEPATH += \
+	    $$OFFICEUTILS_PATH/src/zlib-1.2.11 \
+		$$OFFICEUTILS_PATH/src
+
+    SOURCES += \
+	    $$OFFICEUTILS_PATH/src/zlib-1.2.11/crc32.c \
+		$$OFFICEUTILS_PATH/src/zlib-1.2.11/adler32.c \
+		$$OFFICEUTILS_PATH/src/zlib-1.2.11/deflate.c \
+		$$OFFICEUTILS_PATH/src/zlib-1.2.11/inffast.c \
+		$$OFFICEUTILS_PATH/src/zlib-1.2.11/inflate.c \
+		$$OFFICEUTILS_PATH/src/zlib-1.2.11/inftrees.c \
+		$$OFFICEUTILS_PATH/src/zlib-1.2.11/trees.c \
+		$$OFFICEUTILS_PATH/src/zlib-1.2.11/zutil.c \
+		$$OFFICEUTILS_PATH/src/zlib-1.2.11/uncompr.c \
+		$$OFFICEUTILS_PATH/src/zlib-1.2.11/compress.c \
+		$$OFFICEUTILS_PATH/src/zlib_addon.c
+
+    CONFIG += config_zlip_image
+}
 
 SOURCES += \
     $$FREETYPE_PATH/src/autofit/autofit.c \
diff --git a/DesktopEditor/graphics/pro/graphics.pro b/DesktopEditor/graphics/pro/graphics.pro
index ff6da621e1..e0906c4b8c 100644
--- a/DesktopEditor/graphics/pro/graphics.pro
+++ b/DesktopEditor/graphics/pro/graphics.pro
@@ -5,6 +5,7 @@ TEMPLATE = lib
 
 CONFIG += graphics_dynamic_library
 
+DEFINES += _QT
 graphics_dynamic_library {
     CONFIG += shared
     CONFIG += plugin
@@ -18,512 +19,101 @@ graphics_dynamic_library {
 CORE_ROOT_DIR = $$PWD/../../..
 PWD_ROOT_DIR = $$PWD
 include(../../../Common/base.pri)
-include(freetype.pri)
 
 ADD_DEPENDENCY(UnicodeConverter, kernel)
 
-DEFINES += \
-    _QT \
-    FT2_BUILD_LIBRARY \
-    EXCLUDE_JPG_SUPPORT \
-    MNG_SUPPORT_DISPLAY \
-    MNG_SUPPORT_READ \
-    MNG_SUPPORT_WRITE \
-    MNG_ACCESS_CHUNKS \
-    MNG_STORE_CHUNKS\
-    MNG_ERROR_TELLTALE
-
-DEFINES += FT_SUPPORT_UTF8_IN_NAMES
-
-core_linux {
-    DEFINES += HAVE_UNISTD_H HAVE_FCNTL_H
-    QMAKE_CXXFLAGS += -Wno-narrowing
-}
-
-core_mac {
-    DEFINES += HAVE_UNISTD_H HAVE_FCNTL_H
-}
-
 core_windows {
-    DEFINES += \
-    JAS_WIN_MSVC_BUILD \
-    NOMINMAX
-
-    DEFINES -= UNICODE
-    DEFINES -= _UNICODE
-
     LIBS += -lAdvapi32
-    LIBS += -lShell32
-    LIBS += -lUser32
+	LIBS += -lShell32
 }
 
-LIB_GRAPHICS_PRI_PATH = $$PWD/../..
+HEADERS += ./../config.h
+
+GRAPHICS_AGG_PATH = $$PWD/../../agg-2.4
 
 INCLUDEPATH += \
-    $$LIB_GRAPHICS_PRI_PATH/agg-2.4/include \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/include \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/png
+    $$GRAPHICS_AGG_PATH/include
 
+# matrix
 HEADERS += \
-    ../../raster/Metafile/CXmlOutput.h \
-    ../../raster/Metafile/Common/CPathConverter.h \
-    ../../raster/Metafile/Common/IOutputDevice.h \
-    ../../raster/Metafile/Common/MetaFile.h \
-    ../../raster/Metafile/Common/MetaFileClip.h \
-    ../../raster/Metafile/Common/MetaFileObjects.h \
-    ../../raster/Metafile/Common/MetaFileRenderer.h \
-    ../../raster/Metafile/Common/MetaFileTypes.h \
-    ../../raster/Metafile/Common/MetaFileUtils.h \
-    ../../raster/Metafile/Emf/EmfInterpretator/CEmfInterpretator.h \
-    ../../raster/Metafile/Emf/EmfInterpretator/CEmfInterpretatorArray.h \
-    ../../raster/Metafile/Emf/EmfInterpretator/CEmfInterpretatorBase.h \
-    ../../raster/Metafile/Emf/EmfInterpretator/CEmfInterpretatorRender.h \
-    ../../raster/Metafile/Emf/EmfInterpretator/CEmfInterpretatorSvg.h \
-    ../../raster/Metafile/Emf/EmfInterpretator/CEmfInterpretatorXml.h \
-    ../../raster/Metafile/Emf/EmfParser/CEmfParser.h \
-    ../../raster/Metafile/Emf/EmfParser/CEmfParserBase.h \
-    ../../raster/Metafile/Emf/EmfParser/CEmfPlusParser.h \
-    ../../raster/Metafile/Emf/EmfParser/CEmfxParser.h \
-    ../../raster/Metafile/Wmf/WmfInterpretator/CWmfInterpretatorSvg.h \
-    ../../raster/Metafile/Wmf/WmfParser/CWmfParser.h \
-    ../../raster/Metafile/Wmf/WmfParser/CWmfParserBase.h \
-    ../../raster/Metafile/Wmf/WmfInterpretator/CWmfInterpretatorBase.h \
-    ../../raster/Metafile/Wmf/WmfInterpretator/CWmfInterpretatorRender.h \
-    ../../raster/Metafile/Wmf/WmfInterpretator/CWmfInterpretator.h \
-    ./../config.h \
-    \
-    ./../Matrix.h \
     ./../Matrix_private.h \
-    ./../GraphicsPath.h \
+	./../Matrix.h
+
+SOURCES += \
+    ./../Matrix.cpp
+
+SOURCES += \
+    $$GRAPHICS_AGG_PATH/src/agg_trans_affine.cpp
+
+# paths
+HEADERS += \
     ./../GraphicsPath_private.h \
-    \
-    ./../../raster/BgraFrame.h \
-    ./../../raster/ImageFileFormatChecker.h \
-    ./../../raster/Metafile/Metafile.h \
-    \
-    ./../ArrowHead.h \
-    ./../Brush.h \
-    ./../Clip.h \
-    ./../Color.h \
-    ./../Defines.h \
-    ./../Graphics.h \
-    ./../Image.h \
-    ./../ImageFilesCache.h \
-    ./../MetafileToRenderer.h \
-    ./../MetafileToRendererCheck.h \
-    ./../MetafileToGraphicsRenderer.h \
-    ./../structures.h \
-    ./../Graphics.h \
-    ./../GraphicsRenderer.h \
-    \
-    ./../../fontengine/ApplicationFonts.h \
-    ./../../fontengine/FontFile.h \
-    ./../../fontengine/FontPath.h \
-    ./../../fontengine/GlyphString.h \
-    ./../../fontengine/FontManager.h \
-    ./../../fontengine/FontConverter.h \
-    \
-    ./Fonts.h \
-    ./Graphics.h \
-    ./Image.h \
-    ./../../raster/Metafile/svg/SVGFramework.h \
-    ./../../raster/Metafile/svg/SVGTransformer.h
+	./../GraphicsPath.h
 
 SOURCES += \
-    ../../raster/Metafile/CXmlOutput.cpp \
-    ../../raster/Metafile/Common/CPathConverter.cpp \
-    ./../../raster/Metafile/Common/MetaFileTypes.cpp \
-    ./../../raster/Metafile/Common/MetaFileUtils.cpp \
-    ../../raster/Metafile/Emf/EmfInterpretator/CEmfInterpretator.cpp \
-    ../../raster/Metafile/Emf/EmfInterpretator/CEmfInterpretatorArray.cpp \
-    ../../raster/Metafile/Emf/EmfInterpretator/CEmfInterpretatorRender.cpp \
-    ../../raster/Metafile/Emf/EmfInterpretator/CEmfInterpretatorSvg.cpp \
-    ../../raster/Metafile/Emf/EmfInterpretator/CEmfInterpretatorXml.cpp \
-    ../../raster/Metafile/Emf/EmfParser/CEmfParser.cpp \
-    ../../raster/Metafile/Emf/EmfParser/CEmfParserBase.cpp \
-    ../../raster/Metafile/Emf/EmfParser/CEmfPlusParser.cpp \
-    ../../raster/Metafile/Emf/EmfParser/CEmfxParser.cpp \
-    ../../raster/Metafile/Wmf/WmfInterpretator/CWmfInterpretatorSvg.cpp \
-    ../../raster/Metafile/Wmf/WmfParser/CWmfParser.cpp \
-    ../../raster/Metafile/Wmf/WmfParser/CWmfParserBase.cpp \
-    ../../raster/Metafile/Wmf/WmfInterpretator/CWmfInterpretatorRender.cpp \
-    ../../raster/Metafile/Wmf/WmfInterpretator/CWmfInterpretator.cpp \
-    ./../Matrix.cpp \
-    ./../GraphicsPath.cpp \
-    ./../../raster/BgraFrame.cpp \
-    ./../../raster/ImageFileFormatChecker.cpp \
-    ./../../raster/Metafile/MetaFile.cpp \
-    \
-    ./../ArrowHead.cpp \
-    ./../Brush.cpp \
-    ./../Clip.cpp \
-    ./../Graphics.cpp \
-    ./../GraphicsRenderer.cpp \
-    ./../Image.cpp \
-    ./../MetafileToRenderer.cpp \
-    ./../MetafileToGraphicsRenderer.cpp \
-    \
-    ./../../fontengine/ApplicationFonts.cpp \
-    ./../../fontengine/FontFile.cpp \
-    ./../../fontengine/FontManager.cpp \
-    ./../../fontengine/FontPath.cpp \
-    ./../../fontengine/GlyphString.cpp \
-    \
-    ./pro_Fonts.cpp \
-    ./pro_Image.cpp \
-    ./pro_Graphics.cpp \
-    ./../../raster/Metafile/svg/SVGFramework.cpp \
-    ./../../raster/Metafile/svg/SVGTransformer.cpp
+    ./../GraphicsPath.cpp
 
 SOURCES += \
-    ./../../agg-2.4/src/agg_arc.cpp \
-    ./../../agg-2.4/src/agg_bezier_arc.cpp \
-    ./../../agg-2.4/src/agg_arrowhead.cpp \
-    ./../../agg-2.4/src/ctrl/agg_cbox_ctrl.cpp \
-    ./../../agg-2.4/src/agg_curves.cpp \
-    ./../../agg-2.4/src/agg_gsv_text.cpp \
-    ./../../agg-2.4/src/agg_image_filters.cpp \
-    ./../../agg-2.4/src/agg_line_aa_basics.cpp \
-    ./../../agg-2.4/src/agg_line_profile_aa.cpp \
-    ./../../agg-2.4/src/agg_rounded_rect.cpp \
-    ./../../agg-2.4/src/agg_sqrt_tables.cpp \
-    ./../../agg-2.4/src/agg_trans_affine.cpp \
-    ./../../agg-2.4/src/agg_bspline.cpp \
-    ./../../agg-2.4/src/agg_vcgen_bspline.cpp \
-    ./../../agg-2.4/src/agg_vcgen_contour.cpp \
-    ./../../agg-2.4/src/agg_vcgen_dash.cpp \
-    ./../../agg-2.4/src/agg_vcgen_markers_term.cpp \
-    ./../../agg-2.4/src/agg_vcgen_smooth_poly1.cpp \
-    ./../../agg-2.4/src/agg_vcgen_stroke.cpp \
-    \
-    ./../../fontengine/fontconverter/StringExt.cpp \
-    ./../../fontengine/fontconverter/Hash.cpp \
-    ./../../fontengine/fontconverter/FontConverter.cpp \
-    ./../../fontengine/fontconverter/FontFileEncodings.cpp \
-    ./../../fontengine/fontconverter/FontFileTrueType.cpp \
-    ./../../fontengine/fontconverter/FontFileType1.cpp \
-    ./../../fontengine/fontconverter/FontFileType1C.cpp \
-    \
-    ./../../raster/Jp2/J2kFile.cpp \
-    ./../../raster/Jp2/Reader.cpp \
-    \
-    ./../../raster/Metafile/Emf/EmfClip.cpp \
-    ./../../raster/Metafile/Emf/EmfObjects.cpp \
-    ./../../raster/Metafile/Emf/EmfPath.cpp \
-    ./../../raster/Metafile/Emf/EmfPlayer.cpp \
-    ./../../raster/Metafile/Emf/EmfFile.cpp \
-    ./../../raster/Metafile/Wmf/WmfClip.cpp \
-    ./../../raster/Metafile/Wmf/WmfObjects.cpp \
-    ./../../raster/Metafile/Wmf/WmfPlayer.cpp \
-    \
-    ./../../raster/JBig2/source/JBig2File.cpp \
-    \
-    ./../../raster/Metafile/StarView/SvmClip.cpp \
-    ./../../raster/Metafile/StarView/SvmFile.cpp \
-    ./../../raster/Metafile/StarView/SvmObjects.cpp \
-    ./../../raster/Metafile/StarView/SvmPlayer.cpp
+    $$GRAPHICS_AGG_PATH/src/agg_arc.cpp \
+	$$GRAPHICS_AGG_PATH/src/agg_bezier_arc.cpp \
+	$$GRAPHICS_AGG_PATH/src/agg_curves.cpp \
+	$$GRAPHICS_AGG_PATH/src/agg_bspline.cpp \
+	$$GRAPHICS_AGG_PATH/src/agg_vcgen_bspline.cpp \
+	$$GRAPHICS_AGG_PATH/src/agg_vcgen_stroke.cpp \
+	$$GRAPHICS_AGG_PATH/src/agg_vcgen_contour.cpp
 
-SOURCES += \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/base/jas_cm.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/base/jas_debug.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/base/jas_getopt.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/base/jas_icc.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/base/jas_iccdata.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/base/jas_image.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/base/jas_init.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/base/jas_malloc.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/base/jas_stream.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/base/jas_seq.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/base/jas_string.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/base/jas_tvp.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/base/jas_version.c \
-    \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/bmp/bmp_cod.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/bmp/bmp_dec.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/bmp/bmp_enc.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/jp2/jp2_cod.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/jp2/jp2_dec.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/jp2/jp2_enc.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/jpc/jpc_bs.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/jpc/jpc_cs.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/jpc/jpc_dec.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/jpc/jpc_enc.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/jpc/jpc_math.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/jpc/jpc_mct.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/jpc/jpc_mqcod.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/jpc/jpc_mqdec.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/jpc/jpc_mqenc.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/jpc/jpc_qmfb.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/jpc/jpc_t1cod.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/jpc/jpc_t1dec.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/jpc/jpc_t1enc.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/jpc/jpc_t2cod.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/jpc/jpc_t2dec.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/jpc/jpc_t2enc.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/jpc/jpc_tagtree.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/jpc/jpc_tsfb.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/jpc/jpc_util.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/jpg/jpg_dummy.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/jpg/jpg_val.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/mif/mif_cod.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/pgx/pgx_cod.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/pgx/pgx_dec.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/pgx/pgx_enc.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/pnm/pnm_cod.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/pnm/pnm_dec.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/pnm/pnm_enc.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/ras/ras_cod.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/ras/ras_dec.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/ras/ras_enc.c \
-    \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jbig/jbig.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jbig/jbig_tab.c \
-    \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/wrtarga.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/wrrle.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/wrppm.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/wrjpgcom.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/wrgif.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/wrbmp.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/transupp.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/rdtarga.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/rdswitch.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/rdrle.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/rdppm.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/rdjpgcom.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/rdgif.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/rdcolmap.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/rdbmp.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jutils.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jpegtran.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jquant1.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jquant2.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jdpostct.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jdsample.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jdtrans.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jerror.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jfdctflt.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jfdctfst.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jfdctint.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jidctflt.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jidctfst.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jidctint.c \
-    #$$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jmemansi.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jmemmgr.c \
-    #$$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jmemname.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jmemnobs.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jaricom.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jcapimin.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jcapistd.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jcarith.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jccoefct.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jccolor.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jcdctmgr.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jchuff.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jcinit.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jcmainct.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jcmarker.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jcmaster.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jcomapi.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jcparam.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jcprepct.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jcsample.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jctrans.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jdapimin.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jdapistd.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jdarith.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jdatadst.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jdatasrc.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jdcoefct.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jdcolor.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jddctmgr.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jdhuff.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jdinput.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jdmainct.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jdmarker.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jdmaster.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jdmerge.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/cdjpeg.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/cjpeg.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/ckconfig.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/djpeg.c
+include(raster.pri)
 
-SOURCES += ./libpsd_pri.c
-SOURCES += ./libpsd_pri2.c
-SOURCES += ./libpsd_pri3.c
+#CONFIG += graphics_disable_metafile
+graphics_disable_metafile {
+    DEFINES += GRAPHICS_DISABLE_METAFILE
+} else {
+    include(metafile.pri)
+}
 
-SOURCES += \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/mng/libmng_callback_xs.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/mng/libmng_chunk_descr.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/mng/libmng_chunk_io.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/mng/libmng_chunk_prc.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/mng/libmng_chunk_xs.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/mng/libmng_cms.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/mng/libmng_display.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/mng/libmng_dither.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/mng/libmng_error.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/mng/libmng_filter.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/mng/libmng_hlapi.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/mng/libmng_jpeg.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/mng/libmng_object_prc.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/mng/libmng_pixels.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/mng/libmng_prop_xs.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/mng/libmng_read.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/mng/libmng_trace.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/mng/libmng_write.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/mng/libmng_zlib.c \
-    \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/png/png.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/png/pngerror.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/png/pngget.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/png/pngmem.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/png/pngpread.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/png/pngread.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/png/pngrio.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/png/pngrtran.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/png/pngrutil.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/png/pngset.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/png/pngtrans.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/png/pngwio.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/png/pngwrite.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/png/pngwtran.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/png/pngwutil.c \
-    \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/raw/libdcr.c \
-    \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_stream.cxx \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_aux.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_close.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_codec.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_color.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_compress.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_dir.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_dirinfo.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_dirread.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_dirwrite.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_dumpmode.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_error.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_extension.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_fax3.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_fax3sm.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_flush.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_getimage.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_jbig.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_jpeg.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_luv.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_lzw.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_next.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_ojpeg.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_open.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_packbits.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_pixarlog.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_predict.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_print.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_read.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_strip.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_swab.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_thunder.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_tile.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_unix.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_version.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_warning.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_write.c \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_zip.c \
-    \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/tif_xfile.cpp \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/ximabmp.cpp \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/ximadsp.cpp \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/ximaenc.cpp \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/ximaexif.cpp \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/ximage.cpp \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/ximagif.cpp \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/ximahist.cpp \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/ximaico.cpp \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/ximainfo.cpp \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/ximaint.cpp \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/ximajas.cpp \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/ximajbg.cpp \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/ximajpg.cpp \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/ximalpha.cpp \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/ximalyr.cpp \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/ximamng.cpp \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/ximapal.cpp \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/ximapcx.cpp \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/ximapng.cpp \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/ximapsd.cpp \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/ximaraw.cpp \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/ximasel.cpp \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/ximaska.cpp \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/ximatga.cpp \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/ximath.cpp \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/ximatif.cpp \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/ximatran.cpp \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/ximawbmp.cpp \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/ximawmf.cpp \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/ximawnd.cpp \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/xmemfile.cpp
-
-SOURCES += \
-    $$LIB_GRAPHICS_PRI_PATH/raster/JBig2/source/Encoder/jbig2arith.cpp \
-    $$LIB_GRAPHICS_PRI_PATH/raster/JBig2/source/Encoder/jbig2enc.cpp \
-    $$LIB_GRAPHICS_PRI_PATH/raster/JBig2/source/Encoder/jbig2sym.cpp
-
-SOURCES += ./lepton_lib_all.cpp
-
-SOURCES += \
-    $$LIB_GRAPHICS_PRI_PATH/raster/JBig2/source/LeptonLib/boxbasic.cpp \
-    $$LIB_GRAPHICS_PRI_PATH/raster/JBig2/source/LeptonLib/ccbord.cpp \
-    $$LIB_GRAPHICS_PRI_PATH/raster/JBig2/source/LeptonLib/dwacomb.2.cpp \
-    $$LIB_GRAPHICS_PRI_PATH/raster/JBig2/source/LeptonLib/dwacomblow.2.cpp \
-    $$LIB_GRAPHICS_PRI_PATH/raster/JBig2/source/LeptonLib/fhmtgen.1.cpp \
-    $$LIB_GRAPHICS_PRI_PATH/raster/JBig2/source/LeptonLib/fliphmtgen.cpp \
-    $$LIB_GRAPHICS_PRI_PATH/raster/JBig2/source/LeptonLib/fmorphauto.cpp \
-    $$LIB_GRAPHICS_PRI_PATH/raster/JBig2/source/LeptonLib/fmorphgen.1.cpp \
-    $$LIB_GRAPHICS_PRI_PATH/raster/JBig2/source/LeptonLib/numabasic.cpp \
-    $$LIB_GRAPHICS_PRI_PATH/raster/JBig2/source/LeptonLib/pix5.cpp \
-    $$LIB_GRAPHICS_PRI_PATH/raster/JBig2/source/LeptonLib/pixabasic.cpp \
-    $$LIB_GRAPHICS_PRI_PATH/raster/JBig2/source/LeptonLib/pixafunc1.cpp \
-    $$LIB_GRAPHICS_PRI_PATH/raster/JBig2/source/LeptonLib/pixcomp.cpp \
-    $$LIB_GRAPHICS_PRI_PATH/raster/JBig2/source/LeptonLib/ptabasic.cpp \
-    $$LIB_GRAPHICS_PRI_PATH/raster/JBig2/source/LeptonLib/ptra.cpp \
-    $$LIB_GRAPHICS_PRI_PATH/raster/JBig2/source/LeptonLib/ropiplow.cpp \
-    $$LIB_GRAPHICS_PRI_PATH/raster/JBig2/source/LeptonLib/roplow.cpp \
-    $$LIB_GRAPHICS_PRI_PATH/raster/JBig2/source/LeptonLib/rotateam.cpp \
-    $$LIB_GRAPHICS_PRI_PATH/raster/JBig2/source/LeptonLib/rotateshear.cpp \
-    $$LIB_GRAPHICS_PRI_PATH/raster/JBig2/source/LeptonLib/sarray.cpp \
-    $$LIB_GRAPHICS_PRI_PATH/raster/JBig2/source/LeptonLib/sel1.cpp \
-    $$LIB_GRAPHICS_PRI_PATH/raster/JBig2/source/LeptonLib/sel2.cpp \
-    $$LIB_GRAPHICS_PRI_PATH/raster/JBig2/source/LeptonLib/skew.cpp
-
-# Application fonts worker
-HEADERS += ./../../fontengine/ApplicationFontsWorker.h
-SOURCES += ./../../fontengine/ApplicationFontsWorker.cpp
+CONFIG += support_font_converter
+include(fontengine.pri)
 
 # drawing file
 HEADERS += ./officedrawingfile.h
 SOURCES += ./officedrawingfile.cpp
 
-# deprecated!!! remove after 6.5 ------------------
-HEADERS += ./../../fontengine/FontsAssistant.h
-SOURCES += ./../../fontengine/FontsAssistant.cpp
-# -------------------------------------------------
+# graphics
+SOURCES += \
+    $$GRAPHICS_AGG_PATH/src/agg_arrowhead.cpp \
+	$$GRAPHICS_AGG_PATH/src/agg_image_filters.cpp \
+	$$GRAPHICS_AGG_PATH/src/agg_line_aa_basics.cpp \
+	$$GRAPHICS_AGG_PATH/src/agg_line_profile_aa.cpp \
+	$$GRAPHICS_AGG_PATH/src/agg_vcgen_dash.cpp \
+	$$GRAPHICS_AGG_PATH/src/agg_vcgen_markers_term.cpp \
+	$$GRAPHICS_AGG_PATH/src/agg_vcgen_smooth_poly1.cpp
 
-# ------------------- shaper ----------------------
-HEADERS += ./../../fontengine/TextShaper.h
-SOURCES += ./../../fontengine/TextShaper.cpp
+HEADERS += \
+    ./../ArrowHead.h \
+	./../Brush.h \
+	./../Clip.h \
+	./../Color.h \
+	./../Defines.h \
+	./../Graphics.h \
+	./../ImageFilesCache.h \
+	./../MetafileToRenderer.h \
+	./../MetafileToRendererCheck.h \
+	./../MetafileToGraphicsRenderer.h \
+	./../structures.h \
+	./../Graphics.h \
+	./../GraphicsRenderer.h \
+	\
+	./Graphics.h \
+	./Image.h \
 
-include($$PWD/textshaper.pri)
-
-enable_support_shaper {
-    include($$CORE_ROOT_DIR/Common/3dParty/harfbuzz/harfbuzz.pri)
-}
-# -------------------------------------------------
-
-core_ios {
-
-    OBJECTIVE_SOURCES += \
-        ./../../fontengine/ApplicationFonts_ios.mm \
-
-    LIBS += -framework Foundation
-}
+SOURCES += \
+    ./../ArrowHead.cpp \
+	./../Brush.cpp \
+	./../Clip.cpp \
+	./../Graphics.cpp \
+	./../GraphicsRenderer.cpp \
+	./../MetafileToRenderer.cpp \
+	./../MetafileToGraphicsRenderer.cpp \
+	\
+	./pro_Image.cpp \
+	./pro_Graphics.cpp
diff --git a/DesktopEditor/graphics/pro/js/qt/raster/raster.pro b/DesktopEditor/graphics/pro/js/qt/raster/raster.pro
index f76fad13e6..3bd20f8fe3 100644
--- a/DesktopEditor/graphics/pro/js/qt/raster/raster.pro
+++ b/DesktopEditor/graphics/pro/js/qt/raster/raster.pro
@@ -14,308 +14,44 @@ include($$CORE_ROOT_DIR/Common/base.pri)
 
 DEFINES += GRAPHICS_NO_USE_DYNAMIC_LIBRARY
 DEFINES += KERNEL_NO_USE_DYNAMIC_LIBRARY
-
 DEFINES -= UNICODE _UNICODE
 
-DEFINES += BUILD_ZLIB_AS_SOURCES
-
-core_linux {
-    DEFINES += HAVE_UNISTD_H HAVE_FCNTL_H
-	QMAKE_CXXFLAGS += -Wno-narrowing
-}
-
-core_mac {
-    DEFINES += HAVE_UNISTD_H HAVE_FCNTL_H
-}
-
-core_windows {
-    DEFINES += JAS_WIN_MSVC_BUILD NOMINMAX
-
-    SOURCES += $$CORE_ROOT_DIR/OfficeUtils/src/zlib-1.2.11/contrib/minizip/iowin32.c
-
-    #LIBS += -lAdvapi32
-	#LIBS += -lShell32
-	LIBS += -lUser32
-}
-
 #DEFINES += BUILDING_WASM_MODULE
 
+#CONFIG += disable_fonts_engine
+#CONFIG += disable_graphics_renderer
+#CONFIG += disable_metafile_svg
+#CONFIG += disable_metafile_wmf_emf
+#CONFIG += disable_metafile_svm
+#CONFIG += disable_raster
+
+disable_fonts_engine:CONFIG += disable_graphics_renderer
+
+!disable_raster {
+    include(./raster_module.pri)
+}
+
+!disable_fonts_engine {
+    include(./fonts_module.pri)
+}
+
 LIB_GRAPHICS_PRI_PATH = $$PWD/../../../../..
 
 INCLUDEPATH += \
-    $$CORE_ROOT_DIR/OfficeUtils/src/zlib-1.2.11 \
-	$$CORE_ROOT_DIR/OfficeUtils/src \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/jasper/include \
 	$$LIB_GRAPHICS_PRI_PATH/agg-2.4/include
 
 include($$CORE_ROOT_DIR/DesktopEditor/xml/build/qt/libxml2.pri)
 
 SOURCES += \
-    $$CORE_ROOT_DIR/DesktopEditor/common/File.cpp \
+    $$CORE_ROOT_DIR/DesktopEditor/common/Directory.cpp \
 	$$CORE_ROOT_DIR/DesktopEditor/common/Base64.cpp \
 	$$CORE_ROOT_DIR/DesktopEditor/common/StringBuilder.cpp \
-	$$CORE_ROOT_DIR/DesktopEditor/common/StringExt.cpp
+	$$CORE_ROOT_DIR/DesktopEditor/common/StringExt.cpp \
+	$$CORE_ROOT_DIR/DesktopEditor/common/Path.cpp
 
 SOURCES += \
-    $$CORE_ROOT_DIR/OfficeUtils/src/zlib_addon.c \
-	\
-	$$CORE_ROOT_DIR/OfficeUtils/src/zlib-1.2.11/contrib/minizip/ioapi.c \
-	$$CORE_ROOT_DIR/OfficeUtils/src/zlib-1.2.11/contrib/minizip/miniunz.c \
-	$$CORE_ROOT_DIR/OfficeUtils/src/zlib-1.2.11/contrib/minizip/minizip.c \
-	$$CORE_ROOT_DIR/OfficeUtils/src/zlib-1.2.11/contrib/minizip/mztools.c \
-	$$CORE_ROOT_DIR/OfficeUtils/src/zlib-1.2.11/contrib/minizip/unzip.c \
-	$$CORE_ROOT_DIR/OfficeUtils/src/zlib-1.2.11/contrib/minizip/zip.c \
-	$$CORE_ROOT_DIR/OfficeUtils/src/zlib-1.2.11/contrib/minizip/ioapibuf.c \
-	\
-	$$CORE_ROOT_DIR/OfficeUtils/src/zlib-1.2.11/adler32.c \
-	$$CORE_ROOT_DIR/OfficeUtils/src/zlib-1.2.11/crc32.c \
-	$$CORE_ROOT_DIR/OfficeUtils/src/zlib-1.2.11/deflate.c \
-	$$CORE_ROOT_DIR/OfficeUtils/src/zlib-1.2.11/infback.c \
-	$$CORE_ROOT_DIR/OfficeUtils/src/zlib-1.2.11/inffast.c \
-	$$CORE_ROOT_DIR/OfficeUtils/src/zlib-1.2.11/inflate.c \
-	$$CORE_ROOT_DIR/OfficeUtils/src/zlib-1.2.11/inftrees.c \
-	$$CORE_ROOT_DIR/OfficeUtils/src/zlib-1.2.11/trees.c \
-	$$CORE_ROOT_DIR/OfficeUtils/src/zlib-1.2.11/zutil.c \
-	$$CORE_ROOT_DIR/OfficeUtils/src/zlib-1.2.11/compress.c
-
-SOURCES += \
-    $$LIB_GRAPHICS_PRI_PATH/raster/BgraFrame.cpp \
-	$$LIB_GRAPHICS_PRI_PATH/raster/ImageFileFormatChecker.cpp \
-	$$LIB_GRAPHICS_PRI_PATH/graphics/Image.cpp
-
-SOURCES += \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/ximaenc.cpp \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/ximaexif.cpp \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/ximage.cpp \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/ximainfo.cpp \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/ximajpg.cpp \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/ximalpha.cpp \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/ximapal.cpp \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/ximasel.cpp \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/xmemfile.cpp \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/ximapng.cpp \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/ximabmp.cpp \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/ximatran.cpp \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/ximatif.cpp \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/tif_xfile.cpp \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/ximajas.cpp \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/ximagif.cpp \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/ximaico.cpp \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/ximatga.cpp \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/ximapcx.cpp \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/ximawbmp.cpp \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/ximamng.cpp \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/ximapsd.cpp \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/ximaska.cpp \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/ximaraw.cpp \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/ximath.cpp \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/ximaint.cpp \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/CxImage/ximalyr.cpp
-
-SOURCES += \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jerror.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jdmarker.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jdapimin.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jdmaster.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jdapistd.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jcomapi.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jutils.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jdinput.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jdmainct.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jmemmgr.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jquant1.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jquant2.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jdmerge.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jdcolor.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jdsample.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jdpostct.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jddctmgr.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jdarith.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jdhuff.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jdcoefct.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jmemnobs.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jidctint.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jidctfst.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jidctflt.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jaricom.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jcapimin.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jcparam.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jcapistd.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jcinit.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jcmaster.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jccolor.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jcmarker.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jcsample.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jcprepct.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jcdctmgr.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jcarith.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jchuff.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jccoefct.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jcmainct.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jfdctint.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jfdctfst.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/jpeg/jfdctflt.c
-
-SOURCES += \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/png/pngread.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/png/pngmem.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/png/pngerror.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/png/png.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/png/pngrio.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/png/pngtrans.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/png/pngget.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/png/pngrutil.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/png/pngrtran.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/png/pngset.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/png/pngwrite.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/png/pngwio.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/png/pngwutil.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/png/pngwtran.c
-
-SOURCES += \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_close.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_dir.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_aux.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_getimage.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_strip.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_open.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_tile.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_error.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_read.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_flush.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_dirinfo.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_compress.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_warning.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_swab.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_color.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_dirread.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_write.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_codec.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_luv.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_dirwrite.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_dumpmode.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_fax3.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_ojpeg.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_jpeg.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_next.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_thunder.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_packbits.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_lzw.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_zip.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_fax3sm.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/tiff/tif_predict.c
-
-SOURCES += \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/base/jas_init.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/jasper/base/jas_stream.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/jasper/base/jas_malloc.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/jasper/base/jas_image.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/jasper/base/jas_cm.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/jasper/base/jas_seq.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/jasper/base/jas_string.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/jasper/base/jas_icc.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/jasper/base/jas_debug.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/jasper/base/jas_iccdata.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/jasper/base/jas_tvp.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/jasper/base/jas_version.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/jasper/mif/mif_cod.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/jasper/pnm/pnm_dec.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/jasper/pnm/pnm_enc.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/jasper/pnm/pnm_cod.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/jasper/bmp/bmp_dec.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/jasper/bmp/bmp_enc.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/jasper/bmp/bmp_cod.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/jasper/ras/ras_dec.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/jasper/ras/ras_enc.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/jasper/jp2/jp2_dec.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/jasper/jp2/jp2_enc.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/jasper/jp2/jp2_cod.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/jasper/jpc/jpc_cs.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/jasper/jpc/jpc_enc.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/jasper/jpc/jpc_dec.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/jasper/jpc/jpc_t1cod.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/jasper/jpc/jpc_math.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/jasper/jpc/jpc_util.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/jasper/jpc/jpc_tsfb.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/jasper/jpc/jpc_mct.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/jasper/jpc/jpc_t1enc.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/jasper/jpc/jpc_t1dec.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/jasper/jpc/jpc_bs.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/jasper/jpc/jpc_t2cod.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/jasper/jpc/jpc_t2enc.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/jasper/jpc/jpc_t2dec.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/jasper/jpc/jpc_tagtree.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/jasper/jpc/jpc_mqenc.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/jasper/jpc/jpc_mqdec.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/jasper/jpc/jpc_mqcod.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/jasper/jpc/jpc_qmfb.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/jasper/jpg/jpg_val.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/jasper/jpg/jpg_dummy.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/jasper/pgx/pgx_dec.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/jasper/pgx/pgx_enc.c
-
-SOURCES += \
-    $$LIB_GRAPHICS_PRI_PATH/raster/Jp2/J2kFile.cpp \
-	$$LIB_GRAPHICS_PRI_PATH/raster/Jp2/Reader.cpp
-
-SOURCES += \
-    $$LIB_GRAPHICS_PRI_PATH/raster/JBig2/source/Encoder/jbig2arith.cpp \
-	$$LIB_GRAPHICS_PRI_PATH/raster/JBig2/source/Encoder/jbig2enc.cpp \
-	$$LIB_GRAPHICS_PRI_PATH/raster/JBig2/source/Encoder/jbig2sym.cpp \
-	$$LIB_GRAPHICS_PRI_PATH/raster/JBig2/source/JBig2File.cpp
-
-SOURCES += \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/mng/libmng_hlapi.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/mng/libmng_callback_xs.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/mng/libmng_prop_xs.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/mng/libmng_object_prc.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/mng/libmng_zlib.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/mng/libmng_jpeg.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/mng/libmng_pixels.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/mng/libmng_read.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/mng/libmng_error.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/mng/libmng_display.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/mng/libmng_write.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/mng/libmng_chunk_io.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/mng/libmng_cms.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/mng/libmng_filter.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/mng/libmng_chunk_prc.c \
-	$$LIB_GRAPHICS_PRI_PATH/cximage/mng/libmng_chunk_xs.c
-
-SOURCES += \
-    $$CORE_ROOT_DIR/DesktopEditor/graphics/pro/libpsd_pri.c \
-	$$CORE_ROOT_DIR/DesktopEditor/graphics/pro/libpsd_pri2.c \
-	$$CORE_ROOT_DIR/DesktopEditor/graphics/pro/libpsd_pri3.c
-
-SOURCES += \
-    $$LIB_GRAPHICS_PRI_PATH/cximage/raw/libdcr.c
-
-SOURCES += \
-    $$LIB_GRAPHICS_PRI_PATH/raster/JBig2/source/LeptonLib/boxbasic.cpp \
-	$$LIB_GRAPHICS_PRI_PATH/raster/JBig2/source/LeptonLib/ccbord.cpp \
-	$$LIB_GRAPHICS_PRI_PATH/raster/JBig2/source/LeptonLib/dwacomb.2.cpp \
-	$$LIB_GRAPHICS_PRI_PATH/raster/JBig2/source/LeptonLib/dwacomblow.2.cpp \
-	$$LIB_GRAPHICS_PRI_PATH/raster/JBig2/source/LeptonLib/fhmtgen.1.cpp \
-	$$LIB_GRAPHICS_PRI_PATH/raster/JBig2/source/LeptonLib/fliphmtgen.cpp \
-	$$LIB_GRAPHICS_PRI_PATH/raster/JBig2/source/LeptonLib/fmorphauto.cpp \
-	$$LIB_GRAPHICS_PRI_PATH/raster/JBig2/source/LeptonLib/fmorphgen.1.cpp \
-	$$LIB_GRAPHICS_PRI_PATH/raster/JBig2/source/LeptonLib/numabasic.cpp \
-	$$LIB_GRAPHICS_PRI_PATH/raster/JBig2/source/LeptonLib/pix5.cpp \
-	$$LIB_GRAPHICS_PRI_PATH/raster/JBig2/source/LeptonLib/pixabasic.cpp \
-	$$LIB_GRAPHICS_PRI_PATH/raster/JBig2/source/LeptonLib/pixafunc1.cpp \
-	$$LIB_GRAPHICS_PRI_PATH/raster/JBig2/source/LeptonLib/pixcomp.cpp \
-	$$LIB_GRAPHICS_PRI_PATH/raster/JBig2/source/LeptonLib/ptabasic.cpp \
-	$$LIB_GRAPHICS_PRI_PATH/raster/JBig2/source/LeptonLib/ptra.cpp \
-	$$LIB_GRAPHICS_PRI_PATH/raster/JBig2/source/LeptonLib/ropiplow.cpp \
-	$$LIB_GRAPHICS_PRI_PATH/raster/JBig2/source/LeptonLib/roplow.cpp \
-	$$LIB_GRAPHICS_PRI_PATH/raster/JBig2/source/LeptonLib/rotateam.cpp \
-	$$LIB_GRAPHICS_PRI_PATH/raster/JBig2/source/LeptonLib/rotateshear.cpp \
-	$$LIB_GRAPHICS_PRI_PATH/raster/JBig2/source/LeptonLib/sarray.cpp \
-	$$LIB_GRAPHICS_PRI_PATH/raster/JBig2/source/LeptonLib/sel1.cpp \
-	$$LIB_GRAPHICS_PRI_PATH/raster/JBig2/source/LeptonLib/sel2.cpp \
-	$$LIB_GRAPHICS_PRI_PATH/raster/JBig2/source/LeptonLib/skew.cpp
-
-SOURCES += $$CORE_ROOT_DIR/DesktopEditor/graphics/pro/lepton_lib_all.cpp
+    $$LIB_GRAPHICS_PRI_PATH/graphics/Matrix.cpp \
+	$$LIB_GRAPHICS_PRI_PATH/graphics/GraphicsPath.cpp
 
 HEADERS += \
     $$LIB_GRAPHICS_PRI_PATH/raster/Metafile/CXmlOutput.h \
@@ -377,10 +113,49 @@ SOURCES += \
 	$$LIB_GRAPHICS_PRI_PATH/raster/Metafile/StarView/SvmClip.cpp \
 	$$LIB_GRAPHICS_PRI_PATH/raster/Metafile/StarView/SvmFile.cpp \
 	$$LIB_GRAPHICS_PRI_PATH/raster/Metafile/StarView/SvmObjects.cpp \
-	$$LIB_GRAPHICS_PRI_PATH/raster/Metafile/StarView/SvmPlayer.cpp
+	$$LIB_GRAPHICS_PRI_PATH/raster/Metafile/StarView/SvmPlayer.cpp \
+	\
+	$$LIB_GRAPHICS_PRI_PATH/raster/Metafile/svg/SVGFramework.cpp \
+	$$LIB_GRAPHICS_PRI_PATH/raster/Metafile/svg/SVGTransformer.cpp
 
 SOURCES += \
-    ../../../pro_base.cpp
+    $$CORE_ROOT_DIR/UnicodeConverter/UnicodeConverter_internal_empty.cpp
+
+SOURCES += \
+    $$LIB_GRAPHICS_PRI_PATH/agg-2.4/src/agg_arc.cpp \
+	$$LIB_GRAPHICS_PRI_PATH/agg-2.4/src/agg_bezier_arc.cpp \
+	$$LIB_GRAPHICS_PRI_PATH/agg-2.4/src/agg_arrowhead.cpp \
+	$$LIB_GRAPHICS_PRI_PATH/agg-2.4/src/ctrl/agg_cbox_ctrl.cpp \
+	$$LIB_GRAPHICS_PRI_PATH/agg-2.4/src/agg_curves.cpp \
+	$$LIB_GRAPHICS_PRI_PATH/agg-2.4/src/agg_gsv_text.cpp \
+	$$LIB_GRAPHICS_PRI_PATH/agg-2.4/src/agg_image_filters.cpp \
+	$$LIB_GRAPHICS_PRI_PATH/agg-2.4/src/agg_line_aa_basics.cpp \
+	$$LIB_GRAPHICS_PRI_PATH/agg-2.4/src/agg_line_profile_aa.cpp \
+	$$LIB_GRAPHICS_PRI_PATH/agg-2.4/src/agg_rounded_rect.cpp \
+	$$LIB_GRAPHICS_PRI_PATH/agg-2.4/src/agg_sqrt_tables.cpp \
+	$$LIB_GRAPHICS_PRI_PATH/agg-2.4/src/agg_trans_affine.cpp \
+	$$LIB_GRAPHICS_PRI_PATH/agg-2.4/src/agg_bspline.cpp \
+	$$LIB_GRAPHICS_PRI_PATH/agg-2.4/src/agg_vcgen_bspline.cpp \
+	$$LIB_GRAPHICS_PRI_PATH/agg-2.4/src/agg_vcgen_contour.cpp \
+	$$LIB_GRAPHICS_PRI_PATH/agg-2.4/src/agg_vcgen_dash.cpp \
+	$$LIB_GRAPHICS_PRI_PATH/agg-2.4/src/agg_vcgen_markers_term.cpp \
+	$$LIB_GRAPHICS_PRI_PATH/agg-2.4/src/agg_vcgen_smooth_poly1.cpp \
+	$$LIB_GRAPHICS_PRI_PATH/agg-2.4/src/agg_vcgen_stroke.cpp
+
+SOURCES += \
+    $$CORE_ROOT_DIR/OfficeUtils/src/OfficeUtils.cpp \
+	$$CORE_ROOT_DIR/OfficeUtils/src/ZipBuffer.cpp \
+	$$CORE_ROOT_DIR/OfficeUtils/src/ZipUtilsCP.cpp
+
+SOURCES += \
+    ../../../pro_base.cpp \
+	../../../pro_Fonts_empty.cpp \
+	../../../pro_Graphics_empty.cpp
 
 SOURCES += ./raster.cpp
 HEADERS += ./raster.h
+
+core_windows {
+    LIBS += -lRpcrt4
+	LIBS += -lShell32
+}
diff --git a/DesktopEditor/graphics/pro/metafile.pri b/DesktopEditor/graphics/pro/metafile.pri
new file mode 100644
index 0000000000..ab01ed105c
--- /dev/null
+++ b/DesktopEditor/graphics/pro/metafile.pri
@@ -0,0 +1,89 @@
+METAFILE_PATH = $$PWD/../../raster/Metafile
+
+CONFIG += metafile_enable_wmf_emf
+
+HEADERS += \
+    $$METAFILE_PATH/CXmlOutput.h \
+	$$METAFILE_PATH/Common/CPathConverter.h \
+	$$METAFILE_PATH/Common/IOutputDevice.h \
+	$$METAFILE_PATH/Common/MetaFile.h \
+	$$METAFILE_PATH/Common/MetaFileClip.h \
+	$$METAFILE_PATH/Common/MetaFileObjects.h \
+	$$METAFILE_PATH/Common/MetaFileRenderer.h \
+	$$METAFILE_PATH/Common/MetaFileTypes.h \
+	$$METAFILE_PATH/Common/MetaFileUtils.h \
+	\
+	$$METAFILE_PATH/Emf/EmfInterpretator/CEmfInterpretator.h \
+	$$METAFILE_PATH/Emf/EmfInterpretator/CEmfInterpretatorArray.h \
+	$$METAFILE_PATH/Emf/EmfInterpretator/CEmfInterpretatorBase.h \
+	$$METAFILE_PATH/Emf/EmfInterpretator/CEmfInterpretatorRender.h \
+	$$METAFILE_PATH/Emf/EmfInterpretator/CEmfInterpretatorSvg.h \
+	$$METAFILE_PATH/Emf/EmfInterpretator/CEmfInterpretatorXml.h \
+	$$METAFILE_PATH/Emf/EmfParser/CEmfParser.h \
+	$$METAFILE_PATH/Emf/EmfParser/CEmfParserBase.h \
+	$$METAFILE_PATH/Emf/EmfParser/CEmfPlusParser.h \
+	$$METAFILE_PATH/Emf/EmfParser/CEmfxParser.h \
+	\
+	$$METAFILE_PATH/Wmf/WmfInterpretator/CWmfInterpretator.h \
+	$$METAFILE_PATH/Wmf/WmfInterpretator/CWmfInterpretatorBase.h \
+	$$METAFILE_PATH/Wmf/WmfInterpretator/CWmfInterpretatorSvg.h \
+	$$METAFILE_PATH/Wmf/WmfInterpretator/CWmfInterpretatorRender.h \
+	$$METAFILE_PATH/Wmf/WmfParser/CWmfParser.h \
+	$$METAFILE_PATH/Wmf/WmfParser/CWmfParserBase.h \
+	\
+	$$METAFILE_PATH/MetaFile.h
+
+SOURCES += \
+    $$METAFILE_PATH/CXmlOutput.cpp \
+	$$METAFILE_PATH/Common/CPathConverter.cpp \
+	$$METAFILE_PATH/Common/MetaFileTypes.cpp \
+	$$METAFILE_PATH/Common/MetaFileUtils.cpp \
+	\
+	$$METAFILE_PATH/Emf/EmfInterpretator/CEmfInterpretator.cpp \
+	$$METAFILE_PATH/Emf/EmfInterpretator/CEmfInterpretatorArray.cpp \
+	$$METAFILE_PATH/Emf/EmfInterpretator/CEmfInterpretatorRender.cpp \
+	$$METAFILE_PATH/Emf/EmfInterpretator/CEmfInterpretatorSvg.cpp \
+	$$METAFILE_PATH/Emf/EmfInterpretator/CEmfInterpretatorXml.cpp \
+	$$METAFILE_PATH/Emf/EmfParser/CEmfParser.cpp \
+	$$METAFILE_PATH/Emf/EmfParser/CEmfParserBase.cpp \
+	$$METAFILE_PATH/Emf/EmfParser/CEmfPlusParser.cpp \
+	$$METAFILE_PATH/Emf/EmfParser/CEmfxParser.cpp \
+	\
+	$$METAFILE_PATH/Emf/EmfClip.cpp \
+	$$METAFILE_PATH/Emf/EmfObjects.cpp \
+	$$METAFILE_PATH/Emf/EmfPath.cpp \
+	$$METAFILE_PATH/Emf/EmfPlayer.cpp \
+	$$METAFILE_PATH/Emf/EmfFile.cpp \
+	$$METAFILE_PATH/Wmf/WmfClip.cpp \
+	$$METAFILE_PATH/Wmf/WmfObjects.cpp \
+	$$METAFILE_PATH/Wmf/WmfPlayer.cpp \
+	\
+	$$METAFILE_PATH/Wmf/WmfInterpretator/CWmfInterpretatorSvg.cpp \
+	$$METAFILE_PATH/Wmf/WmfInterpretator/CWmfInterpretatorRender.cpp \
+	$$METAFILE_PATH/Wmf/WmfInterpretator/CWmfInterpretator.cpp \
+	$$METAFILE_PATH/Wmf/WmfParser/CWmfParser.cpp \
+	$$METAFILE_PATH/Wmf/WmfParser/CWmfParserBase.cpp \
+	\
+	$$METAFILE_PATH/MetaFile.cpp
+
+!metafile_disable_svg {
+    DEFINES += METAFILE_SUPPORT_SVG
+
+    HEADERS += \
+	    $$METAFILE_PATH/svg/SVGFramework.h \
+		$$METAFILE_PATH/svg/SVGTransformer.h
+
+    SOURCES += 	\
+	    $$METAFILE_PATH/svg/SVGFramework.cpp \
+		$$METAFILE_PATH/svg/SVGTransformer.cpp
+}
+
+!metafile_disable_svm {
+    DEFINES += METAFILE_SUPPORT_SVM
+
+    SOURCES += \
+	    $$METAFILE_PATH/StarView/SvmClip.cpp \
+		$$METAFILE_PATH/StarView/SvmFile.cpp \
+		$$METAFILE_PATH/StarView/SvmObjects.cpp \
+		$$METAFILE_PATH/StarView/SvmPlayer.cpp
+}
diff --git a/DesktopEditor/graphics/pro/pro_Fonts_empty.cpp b/DesktopEditor/graphics/pro/pro_Fonts_empty.cpp
new file mode 100644
index 0000000000..80843fcf0e
--- /dev/null
+++ b/DesktopEditor/graphics/pro/pro_Fonts_empty.cpp
@@ -0,0 +1,86 @@
+/*
+ * (c) Copyright Ascensio System SIA 2010-2019
+ *
+ * This program is a free software product. You can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License (AGPL)
+ * version 3 as published by the Free Software Foundation. In accordance with
+ * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+ * that Ascensio System SIA expressly excludes the warranty of non-infringement
+ * of any third-party rights.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
+ * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
+ *
+ * The  interactive user interfaces in modified source and object code versions
+ * of the Program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product
+ * logo when distributing the program. Pursuant to Section 7(e) we decline to
+ * grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as
+ * well as technical writing content are licensed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International. See the License
+ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+ */
+
+#include "Fonts.h"
+
+namespace NSFonts
+{
+	namespace NSFontPath
+	{
+		IFontPath* Create() { return NULL; }
+	}
+}
+
+namespace NSFonts
+{
+	namespace NSStream
+	{
+		IFontStream* Create() { return NULL; }
+	}
+
+	namespace NSApplicationFontStream
+	{
+		IApplicationFontStreams* Create() { return NULL; }
+	}
+}
+
+namespace NSFonts
+{
+	namespace NSFontFile
+	{
+		IFontFile* Create() { return NULL; }
+	}
+}
+
+namespace NSFonts
+{
+	namespace NSFontCache
+	{
+		IFontsCache* Create() { return NULL; }
+	}
+}
+
+namespace NSFonts
+{
+	namespace NSFontManager
+	{
+		IFontManager* Create() { return NULL; }
+	}
+}
+
+namespace NSFonts
+{
+	namespace NSApplication
+	{
+		IApplicationFonts* Create() { return NULL; }
+	}
+}
diff --git a/DesktopEditor/graphics/pro/pro_Graphics_empty.cpp b/DesktopEditor/graphics/pro/pro_Graphics_empty.cpp
new file mode 100644
index 0000000000..5476fb74e8
--- /dev/null
+++ b/DesktopEditor/graphics/pro/pro_Graphics_empty.cpp
@@ -0,0 +1,38 @@
+/*
+ * (c) Copyright Ascensio System SIA 2010-2019
+ *
+ * This program is a free software product. You can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License (AGPL)
+ * version 3 as published by the Free Software Foundation. In accordance with
+ * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+ * that Ascensio System SIA expressly excludes the warranty of non-infringement
+ * of any third-party rights.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
+ * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
+ *
+ * The  interactive user interfaces in modified source and object code versions
+ * of the Program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product
+ * logo when distributing the program. Pursuant to Section 7(e) we decline to
+ * grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as
+ * well as technical writing content are licensed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International. See the License
+ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+ */
+
+#include "Graphics.h"
+
+namespace NSGraphics
+{
+	IGraphicsRenderer* Create() { return NULL; }
+}
diff --git a/DesktopEditor/graphics/pro/pro_Image.cpp b/DesktopEditor/graphics/pro/pro_Image.cpp
index b1c9aab87c..1e5b2b2528 100644
--- a/DesktopEditor/graphics/pro/pro_Image.cpp
+++ b/DesktopEditor/graphics/pro/pro_Image.cpp
@@ -39,8 +39,8 @@ namespace NSImages
         ICacheImage* Create(NSFonts::IApplicationFonts* pFonts, const std::wstring& sFile)
         {
             if (sFile.empty())
-                return new CCacheImage((CApplicationFonts*)pFonts);
-            return new CCacheImage((CApplicationFonts*)pFonts, sFile);
+				return new CCacheImage(pFonts);
+			return new CCacheImage(pFonts, sFile);
         }
     }
 
@@ -48,7 +48,7 @@ namespace NSImages
     {
         IImageFilesCache* Create(NSFonts::IApplicationFonts* pFonts)
         {
-            return new CImageFilesCache((CApplicationFonts*)pFonts);
+			return new CImageFilesCache(pFonts);
         }
     }
 }
diff --git a/DesktopEditor/graphics/pro/pro_base.cpp b/DesktopEditor/graphics/pro/pro_base.cpp
index 1f41fb1f43..4dbe25cbf2 100644
--- a/DesktopEditor/graphics/pro/pro_base.cpp
+++ b/DesktopEditor/graphics/pro/pro_base.cpp
@@ -34,47 +34,47 @@
 
 namespace NSBase
 {
-    CBaseRefCounter::CBaseRefCounter()
-    {
-        m_lRef = 1;
-    }
+	CBaseRefCounter::CBaseRefCounter()
+	{
+		m_lRef = 1;
+	}
 
-    CBaseRefCounter::~CBaseRefCounter()
-    {
-    }
+	CBaseRefCounter::~CBaseRefCounter()
+	{
+	}
 
 #ifdef __APPLE__
-    int CBaseRefCounter::AddRef()
-    {
-        OSAtomicIncrement32(&m_lRef);
-        return m_lRef;
-    }
-    int CBaseRefCounter::Release()
-    {
-        int32_t ret = OSAtomicDecrement32(&m_lRef);
-        if (0 == m_lRef)
-            delete this;
+	int CBaseRefCounter::AddRef()
+	{
+		OSAtomicIncrement32(&m_lRef);
+		return m_lRef;
+	}
+	int CBaseRefCounter::Release()
+	{
+		int32_t ret = OSAtomicDecrement32(&m_lRef);
+		if (0 == m_lRef)
+			delete this;
 
-        return ret;
-    }
+		return ret;
+	}
 #else
-    int CBaseRefCounter::AddRef()
-    {
-        ++m_lRef;
-        return m_lRef;
-    }
+	int CBaseRefCounter::AddRef()
+	{
+		++m_lRef;
+		return m_lRef;
+	}
 
-    int CBaseRefCounter::Release()
-    {
-        int ret = --m_lRef;
-        if (0 == m_lRef)
-            delete this;
-        return ret;
-    }
+	int CBaseRefCounter::Release()
+	{
+		int ret = --m_lRef;
+		if (0 == m_lRef)
+			delete this;
+		return ret;
+	}
 #endif
 
-    void Release(CBaseRefCounter* base)
-    {
-        delete base;
-    }
+	void Release(CBaseRefCounter* base)
+	{
+		delete base;
+	}
 }
diff --git a/DesktopEditor/graphics/pro/raster.pri b/DesktopEditor/graphics/pro/raster.pri
index f549acbec6..59e7f10cfe 100644
--- a/DesktopEditor/graphics/pro/raster.pri
+++ b/DesktopEditor/graphics/pro/raster.pri
@@ -1,8 +1,9 @@
 LIB_GRAPHICS_PRI_PATH=$$PWD/../..
 
-DEFINES += GRAPHICS_NO_USE_DYNAMIC_LIBRARY
+DEFINES -= UNICODE
+DEFINES -= _UNICODE
+
 DEFINES += \
-    _QT \
     EXCLUDE_JPG_SUPPORT \
     MNG_SUPPORT_DISPLAY \
     MNG_SUPPORT_READ \
@@ -12,66 +13,34 @@ DEFINES += \
     MNG_ERROR_TELLTALE
 
 core_linux {
-    DEFINES += \
-    HAVE_UNISTD_H
-    QMAKE_CXXFLAGS += -Wno-narrowing
+    DEFINES += HAVE_UNISTD_H HAVE_FCNTL_H
+	QMAKE_CXXFLAGS += -Wno-narrowing
 }
 
 core_mac {
-    DEFINES += \
-    HAVE_UNISTD_H
+    DEFINES += HAVE_UNISTD_H HAVE_FCNTL_H
 }
 
 core_windows {
-    DEFINES += \
-    JAS_WIN_MSVC_BUILD \
-    NOMINMAX
-
-    #DEFINES -= UNICODE
-    #DEFINES -= _UNICODE
-
-    DEFINES += CXIMAGE_ATTACK_NO_UNICODE
-
-    LIBS += -lAdvapi32
-    LIBS += -lShell32
-    LIBS += -lUser32
+    DEFINES += JAS_WIN_MSVC_BUILD NOMINMAX
+	LIBS += -lUser32
 }
 
 INCLUDEPATH += \
-    $$LIB_GRAPHICS_PRI_PATH/agg-2.4/include \
     $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/include \
     $$LIB_GRAPHICS_PRI_PATH/cximage/jpeg \
     $$LIB_GRAPHICS_PRI_PATH/cximage/png \
     $$LIB_GRAPHICS_PRI_PATH/cximage/zlib
 
 HEADERS += \
-    $$PWD/../../raster/BgraFrame.h
+    $$PWD/../../graphics/Image.h \
+	$$PWD/../../raster/BgraFrame.h \
+	$$PWD/../../raster/ImageFileFormatChecker.h
 
 SOURCES += \
+    $$PWD/../../graphics/Image.cpp \
     $$PWD/../../raster/BgraFrame.cpp \
-    $$PWD/../../raster/ImageFileFormatChecker.cpp \
-    $$PWD/../../graphics/Image.cpp
-
-SOURCES += \
-    $$LIB_GRAPHICS_PRI_PATH/agg-2.4/src/agg_arc.cpp \
-    $$LIB_GRAPHICS_PRI_PATH/agg-2.4/src/agg_bezier_arc.cpp \
-    $$LIB_GRAPHICS_PRI_PATH/agg-2.4/src/agg_arrowhead.cpp \
-    $$LIB_GRAPHICS_PRI_PATH/agg-2.4/src/ctrl/agg_cbox_ctrl.cpp \
-    $$LIB_GRAPHICS_PRI_PATH/agg-2.4/src/agg_curves.cpp \
-    $$LIB_GRAPHICS_PRI_PATH/agg-2.4/src/agg_gsv_text.cpp \
-    $$LIB_GRAPHICS_PRI_PATH/agg-2.4/src/agg_image_filters.cpp \
-    $$LIB_GRAPHICS_PRI_PATH/agg-2.4/src/agg_line_aa_basics.cpp \
-    $$LIB_GRAPHICS_PRI_PATH/agg-2.4/src/agg_line_profile_aa.cpp \
-    $$LIB_GRAPHICS_PRI_PATH/agg-2.4/src/agg_rounded_rect.cpp \
-    $$LIB_GRAPHICS_PRI_PATH/agg-2.4/src/agg_sqrt_tables.cpp \
-    $$LIB_GRAPHICS_PRI_PATH/agg-2.4/src/agg_trans_affine.cpp \
-    $$LIB_GRAPHICS_PRI_PATH/agg-2.4/src/agg_bspline.cpp \
-    $$LIB_GRAPHICS_PRI_PATH/agg-2.4/src/agg_vcgen_bspline.cpp \
-    $$LIB_GRAPHICS_PRI_PATH/agg-2.4/src/agg_vcgen_contour.cpp \
-    $$LIB_GRAPHICS_PRI_PATH/agg-2.4/src/agg_vcgen_dash.cpp \
-    $$LIB_GRAPHICS_PRI_PATH/agg-2.4/src/agg_vcgen_markers_term.cpp \
-    $$LIB_GRAPHICS_PRI_PATH/agg-2.4/src/agg_vcgen_smooth_poly1.cpp \
-    $$LIB_GRAPHICS_PRI_PATH/agg-2.4/src/agg_vcgen_stroke.cpp
+	$$PWD/../../raster/ImageFileFormatChecker.cpp
 
 SOURCES += \
     $$LIB_GRAPHICS_PRI_PATH/cximage/jasper/base/jas_cm.c \
@@ -202,24 +171,6 @@ SOURCES += $$PWD/libpsd_pri.c
 SOURCES += $$PWD/libpsd_pri2.c
 SOURCES += $$PWD/libpsd_pri3.c
 
-OFFICEUTILS_PATH = $$PWD/../../../OfficeUtils
-INCLUDEPATH += \
-    $$OFFICEUTILS_PATH/src/zlib-1.2.11 \
-    $$OFFICEUTILS_PATH/src
-
-SOURCES += \
-    $$OFFICEUTILS_PATH/src/zlib-1.2.11/crc32.c \
-    $$OFFICEUTILS_PATH/src/zlib-1.2.11/adler32.c \
-    $$OFFICEUTILS_PATH/src/zlib-1.2.11/deflate.c \
-    $$OFFICEUTILS_PATH/src/zlib-1.2.11/inffast.c \
-    $$OFFICEUTILS_PATH/src/zlib-1.2.11/inflate.c \
-    $$OFFICEUTILS_PATH/src/zlib-1.2.11/inftrees.c \
-    $$OFFICEUTILS_PATH/src/zlib-1.2.11/trees.c \
-    $$OFFICEUTILS_PATH/src/zlib-1.2.11/zutil.c \
-    $$OFFICEUTILS_PATH/src/zlib-1.2.11/uncompr.c \
-    $$OFFICEUTILS_PATH/src/zlib-1.2.11/compress.c \
-    $$OFFICEUTILS_PATH/src/zlib_addon.c
-
 SOURCES += \
     $$LIB_GRAPHICS_PRI_PATH/cximage/mng/libmng_callback_xs.c \
     $$LIB_GRAPHICS_PRI_PATH/cximage/mng/libmng_chunk_descr.c \
@@ -367,3 +318,25 @@ SOURCES += \
     $$LIB_GRAPHICS_PRI_PATH/raster/Jp2/J2kFile.cpp \
     $$LIB_GRAPHICS_PRI_PATH/raster/Jp2/Reader.cpp \
     $$LIB_GRAPHICS_PRI_PATH/raster/JBig2/source/JBig2File.cpp
+
+!config_zlip_image {
+    OFFICEUTILS_PATH = $$PWD/../../../OfficeUtils
+	INCLUDEPATH += \
+	    $$OFFICEUTILS_PATH/src/zlib-1.2.11 \
+		$$OFFICEUTILS_PATH/src
+
+    SOURCES += \
+	    $$OFFICEUTILS_PATH/src/zlib-1.2.11/crc32.c \
+		$$OFFICEUTILS_PATH/src/zlib-1.2.11/adler32.c \
+		$$OFFICEUTILS_PATH/src/zlib-1.2.11/deflate.c \
+		$$OFFICEUTILS_PATH/src/zlib-1.2.11/inffast.c \
+		$$OFFICEUTILS_PATH/src/zlib-1.2.11/inflate.c \
+		$$OFFICEUTILS_PATH/src/zlib-1.2.11/inftrees.c \
+		$$OFFICEUTILS_PATH/src/zlib-1.2.11/trees.c \
+		$$OFFICEUTILS_PATH/src/zlib-1.2.11/zutil.c \
+		$$OFFICEUTILS_PATH/src/zlib-1.2.11/uncompr.c \
+		$$OFFICEUTILS_PATH/src/zlib-1.2.11/compress.c \
+		$$OFFICEUTILS_PATH/src/zlib_addon.c
+
+    CONFIG += config_zlip_image
+}
diff --git a/DesktopEditor/raster/Metafile/MetaFile.cpp b/DesktopEditor/raster/Metafile/MetaFile.cpp
index bff579fb4e..1cf8727c7c 100644
--- a/DesktopEditor/raster/Metafile/MetaFile.cpp
+++ b/DesktopEditor/raster/Metafile/MetaFile.cpp
@@ -55,7 +55,10 @@ namespace MetaFile
 
 		m_oWmfFile.SetFontManager(m_pFontManager);
 		m_oEmfFile.SetFontManager(m_pFontManager);
+
+	#ifdef METAFILE_SUPPORT_SVM
 		m_oSvmFile.SetFontManager(m_pFontManager);
+	#endif
 		m_lType  = 0;
 	}
 
@@ -180,13 +183,17 @@ namespace MetaFile
 		}
 		else if (c_lMetaSvm == m_lType)
 		{
+		#ifdef METAFILE_SUPPORT_SVM
 			CMetaFileRenderer oSvmOut(&m_oSvmFile, pRenderer, dX, dY, dWidth, dHeight);
 			m_oSvmFile.SetOutputDevice((IOutputDevice*)&oSvmOut);
 			m_oSvmFile.PlayMetaFile();
+		#endif
 		}
 		else if (c_lMetaSvg == m_lType)
 		{
+		#ifdef METAFILE_SUPPORT_SVG
 			m_oSvgFile.Draw(pRenderer, dX, dY, dWidth, dHeight);
+		#endif
 		}
 
 		pRenderer->EndCommand(c_nImageType);
@@ -207,8 +214,14 @@ namespace MetaFile
 
 		m_oWmfFile.SetFontManager(m_pFontManager);
 		m_oEmfFile.SetFontManager(m_pFontManager);
+
+	#ifdef METAFILE_SUPPORT_SVM
 		m_oSvmFile.SetFontManager(m_pFontManager);
+	#endif
+
+	#ifdef METAFILE_SUPPORT_SVG
 		m_oSvgFile.SetFontManager(m_pFontManager);
+	#endif
 
 		if (m_oEmfFile.OpenFromXmlFile(wsFilePath) == true)
 		{
@@ -254,8 +267,14 @@ namespace MetaFile
 
 		m_oWmfFile.SetFontManager(m_pFontManager);
 		m_oEmfFile.SetFontManager(m_pFontManager);
+
+	#ifdef METAFILE_SUPPORT_SVM
 		m_oSvmFile.SetFontManager(m_pFontManager);
+	#endif
+
+	#ifdef METAFILE_SUPPORT_SVG
 		m_oSvgFile.SetFontManager(m_pFontManager);
+	#endif
 
 		//------------------------------------------------------
 
@@ -284,6 +303,7 @@ namespace MetaFile
 			m_oEmfFile.Close();
 		}
 		// Это не Emf
+	#ifdef METAFILE_SUPPORT_SVM
 		if (m_oSvmFile.OpenFromFile(wsFilePath) == true)
 		{
 			m_oSvmFile.Scan();
@@ -296,12 +316,15 @@ namespace MetaFile
 
 			m_oSvmFile.Close();
 		}
+	#endif
 		// Это не svm
+	#ifdef METAFILE_SUPPORT_SVG
 		if (m_oSvgFile.OpenFromFile(wsFilePath) == true)
 		{
 			m_lType = c_lMetaSvg;
 			return true;
 		}
+	#endif
 
 		return false;
 	}
@@ -327,13 +350,17 @@ namespace MetaFile
 		}
 		else if (c_lMetaSvm == m_lType)
 		{
+		#ifdef METAFILE_SUPPORT_SVM
 			CMetaFileRenderer oSvmOut(&m_oSvmFile, pRenderer, dX, dY, dWidth, dHeight);
 			m_oSvmFile.SetOutputDevice((IOutputDevice*)&oSvmOut);
 			m_oSvmFile.PlayMetaFile();
+		#endif
 		}
 		else if (c_lMetaSvg == m_lType)
 		{
+		#ifdef METAFILE_SUPPORT_SVM
 			m_oSvgFile.Draw(pRenderer, dX, dY, dWidth, dHeight);
+		#endif
 		}
 
 		pRenderer->EndCommand(c_nImageType);
@@ -344,8 +371,14 @@ namespace MetaFile
 	{
 		m_oWmfFile.Close();
 		m_oEmfFile.Close();
+
+	#ifdef METAFILE_SUPPORT_SVM
 		m_oSvmFile.Close();
+	#endif
+
+	#ifdef METAFILE_SUPPORT_SVG
 		m_oSvgFile.Close();
+	#endif
 
 		m_lType  = 0;
 	}
@@ -373,6 +406,7 @@ namespace MetaFile
 			*pdW = pRect->lRight - pRect->lLeft;
 			*pdH = pRect->lBottom - pRect->lTop;
 		}
+	#ifdef METAFILE_SUPPORT_SVM
 		else if (c_lMetaSvm == m_lType)
 		{
 			TRect* pRect = m_oSvmFile.GetBounds();
@@ -387,6 +421,8 @@ namespace MetaFile
 				*pdH /= 10;
 			}
 		}
+	#endif
+	#ifdef METAFILE_SUPPORT_SVG
 		else if (c_lMetaSvg == m_lType)
 		{
 			*pdX = 0;
@@ -394,6 +430,7 @@ namespace MetaFile
 			*pdW = m_oSvgFile.get_Width();
 			*pdH = m_oSvgFile.get_Height();
 		}
+	#endif
 		else
 		{
 			*pdX = 0;
diff --git a/DesktopEditor/raster/Metafile/MetaFile.h b/DesktopEditor/raster/Metafile/MetaFile.h
index 2c65bfb706..abe77a1930 100644
--- a/DesktopEditor/raster/Metafile/MetaFile.h
+++ b/DesktopEditor/raster/Metafile/MetaFile.h
@@ -38,8 +38,14 @@
 
 #include "Wmf/WmfFile.h"
 #include "Emf/EmfFile.h"
+
+#ifdef METAFILE_SUPPORT_SVM
 #include "StarView/SvmFile.h"
+#endif
+
+#ifdef METAFILE_SUPPORT_SVG
 #include "svg/SVGTransformer.h"
+#endif
 
 namespace MetaFile
 {
@@ -75,8 +81,14 @@ namespace MetaFile
 
 		CWmfFile           m_oWmfFile;
 		CEmfFile           m_oEmfFile;
+
+	#ifdef METAFILE_SUPPORT_SVM
 		CSvmFile           m_oSvmFile;
+	#endif
+
+	#ifdef METAFILE_SUPPORT_SVG
 		CSVGTransformer    m_oSvgFile;
+	#endif
 
 		int                m_lType;
 	};