diff --git a/DesktopEditor/cximage/CxImage/tif_xfile.cpp b/DesktopEditor/cximage/CxImage/tif_xfile.cpp
index 6cadaeb0aa..ca622db311 100644
--- a/DesktopEditor/cximage/CxImage/tif_xfile.cpp
+++ b/DesktopEditor/cximage/CxImage/tif_xfile.cpp
@@ -155,7 +155,7 @@ _TIFFmemcmp(const tdata_t p1, const tdata_t p2, tsize_t c)
 	return (memcmp(p1, p2, (size_t) c));
 }
 
-#ifndef _IOS
+#if !defined(_IOS) && !defined(DISABLE_IMAGE_EXCEPTIONS)
 static void
 Win32WarningHandler(const char* module, const char* fmt, va_list ap)
 {
diff --git a/DesktopEditor/graphics/MetafileToRendererCheck.h b/DesktopEditor/graphics/MetafileToRendererCheck.h
index bad632c37c..0571ef9618 100644
--- a/DesktopEditor/graphics/MetafileToRendererCheck.h
+++ b/DesktopEditor/graphics/MetafileToRendererCheck.h
@@ -39,7 +39,7 @@
 
 namespace NSOnlineOfficeBinToPdf
 {
-    class CMetafilePageInfo
+	class CMetafilePageInfo
 	{
 	public:
 		double width;
@@ -57,11 +57,11 @@ namespace NSOnlineOfficeBinToPdf
 		}
 	};
 
-	class CMetafilePagesInfo
+	class GRAPHICS_DECL CMetafilePagesInfo
 	{
 	public:
 		int PagesCount;
-        std::vector<CMetafilePageInfo> arSizes;
+		std::vector<CMetafilePageInfo> arSizes;
 
 	public:
 		CMetafilePagesInfo()
@@ -73,11 +73,11 @@ namespace NSOnlineOfficeBinToPdf
 		inline void AddPage()
 		{
 			++PagesCount;
-            arSizes.push_back(CMetafilePageInfo());
+			arSizes.push_back(CMetafilePageInfo());
 		}
 
-        void CheckBuffer(BYTE* pBuffer, LONG lBufferLen);
-    };
+		void CheckBuffer(BYTE* pBuffer, LONG lBufferLen);
+	};
 }
 
 #endif // _BUILD_METAFILE_TO_IRENDERER_H_
diff --git a/DesktopEditor/graphics/pro/raster.pri b/DesktopEditor/graphics/pro/raster.pri
index fa4e78896e..394eb88688 100644
--- a/DesktopEditor/graphics/pro/raster.pri
+++ b/DesktopEditor/graphics/pro/raster.pri
@@ -2,6 +2,7 @@ LIB_GRAPHICS_PRI_PATH=$$PWD/../..
 
 DEFINES -= UNICODE
 DEFINES -= _UNICODE
+DEFINES += DISABLE_IMAGE_EXCEPTIONS
 
 DEFINES += \
     _QT \