diff --git a/DesktopEditor/graphics/AlphaMask.cpp b/DesktopEditor/graphics/AlphaMask.cpp
index 6c3acb342b..952375c0d5 100644
--- a/DesktopEditor/graphics/AlphaMask.cpp
+++ b/DesktopEditor/graphics/AlphaMask.cpp
@@ -67,17 +67,14 @@ namespace Aggplus
 
 
 
-	CSoftMask::CSoftMask() : m_pImageData(NULL), m_pAlphaBufferData(NULL), m_unWidth(0), m_unHeight(0) {}
-	CSoftMask::CSoftMask(BYTE* pBuffer, UINT unWidth, UINT unHeight, EMaskDataType enDataType, bool bExternalBuffer, bool bFlip)
+	CSoftMask::CSoftMask() : m_unWidth(0), m_unHeight(0), m_pImageData(NULL), m_pAlphaBufferData(NULL) {}
+	CSoftMask::CSoftMask(BYTE* pBuffer, UINT unWidth, UINT unHeight, EMaskDataType enDataType, bool bExternalBuffer, bool bFlip) : m_pImageData(NULL), m_pAlphaBufferData(NULL)
 	{
-		m_pImageData = NULL;
-		m_pAlphaBufferData = NULL;
-
 		LoadFromBuffer(pBuffer, unWidth, unHeight, enDataType, bExternalBuffer, bFlip);
 	}
 	CSoftMask::~CSoftMask()
 	{
-		BYTE *pBuffer = m_oRenderingBuffer.buf();
+		BYTE* pBuffer = m_oRenderingBuffer.buf();
 		if (NULL != pBuffer)
 		{
 			if (!m_bExternalBuffer)
@@ -100,14 +97,8 @@ namespace Aggplus
 		case EMaskDataType::Alpha4Buffer: return 4;
 		}
 	}
-	unsigned int CSoftMask::GetWidth() const
-	{
-		return m_unWidth;
-	}
-	unsigned int CSoftMask::GetHeight() const
-	{
-		return m_unHeight;
-	}
+	unsigned int CSoftMask::GetWidth() const { return m_unWidth; }
+	unsigned int CSoftMask::GetHeight() const { return m_unHeight; }
 
 	void CSoftMask::SetType(EMaskDataType enDataType)
 	{
diff --git a/PdfFile/SrcReader/RendererOutputDev.cpp b/PdfFile/SrcReader/RendererOutputDev.cpp
index ba3a6e882d..6829992428 100644
--- a/PdfFile/SrcReader/RendererOutputDev.cpp
+++ b/PdfFile/SrcReader/RendererOutputDev.cpp
@@ -54,7 +54,7 @@
 #include "../../DesktopEditor/graphics/BaseThread.h"
 #include "../../DesktopEditor/graphics/commands/DocInfo.h"
 #include "../../DesktopEditor/graphics/AlphaMask.h"
-//#include "../../OfficeUtils/src/OfficeUtils.h"
+#include "../../OfficeUtils/src/OfficeUtils.h"
 #include "../Resources/BaseFonts.h"
 #include <new>
 
@@ -2864,46 +2864,13 @@ namespace PdfReader
 			return false;
 
 		BYTE* pBuffer = new BYTE[nLength];
-		/*
-		if (pStream->getKind() == strFlate)
+		Stream* pS = pStream->getUndecodedStream();
+		pS->reset();
+		nLength = pS->getBlock((char*)pBuffer, nLength);
+		if (!nLength)
 		{
-			Stream* pS = pStream->getBaseStream();
-			nLength = pS->getBlock((char*)pBuffer, nLength);
-			if (!nLength)
-			{
-				RELEASEARRAYOBJECTS(pBuffer);
-				return false;
-			}
-
-			COfficeUtils oOU;
-			if (oOU.IsArchive(pBuffer, nLength))
-			{
-				ULONG pDstBufferLen = nLength * 10;
-				BYTE* pDstBuffer = new BYTE[pDstBufferLen];
-
-				if (oOU.Uncompress(pDstBuffer, &pDstBufferLen, pBuffer, nLength) != S_OK)
-				{
-					RELEASEARRAYOBJECTS(pDstBuffer);
-					RELEASEARRAYOBJECTS(pBuffer);
-					return false;
-				}
-
-				RELEASEARRAYOBJECTS(pBuffer);
-				pBuffer = pDstBuffer;
-				nLength = pDstBufferLen;
-			}
-		}
-		else
-		*/
-		{
-			Stream* pS = pStream->getUndecodedStream();
-			pS->reset();
-			nLength = pS->getBlock((char*)pBuffer, nLength);
-			if (!nLength)
-			{
-				RELEASEARRAYOBJECTS(pBuffer);
-				return false;
-			}
+			RELEASEARRAYOBJECTS(pBuffer);
+			return false;
 		}
 
 		CBgraFrame oFrame;
diff --git a/PdfFile/test/test.cpp b/PdfFile/test/test.cpp
index 8666c1645f..a0eadf61dc 100644
--- a/PdfFile/test/test.cpp
+++ b/PdfFile/test/test.cpp
@@ -36,9 +36,8 @@
 #include "../../DesktopEditor/fontengine/ApplicationFontsWorker.h"
 #include "../../DesktopEditor/xmlsec/src/include/CertificateCommon.h"
 #include "../../DesktopEditor/graphics/MetafileToGraphicsRenderer.h"
-#include "../../DesktopEditor/graphics/pro/Graphics.h"
+#include "../../DesktopEditor/raster/BgraFrame.h"
 #include "../PdfFile.h"
-#include "../../DjVuFile/DjVu.h"
 
 class CPdfFileTest : public testing::Test
 {
@@ -257,7 +256,7 @@ TEST_F(CPdfFileTest, SetMetaData)
 
 TEST_F(CPdfFileTest, ConvertToRaster)
 {
-	GTEST_SKIP();
+	//GTEST_SKIP();
 
 	LoadFromFile();
 
@@ -420,7 +419,7 @@ TEST_F(CPdfFileTest, ChangePasswordToPassword)
 
 TEST_F(CPdfFileTest, ImgDiff)
 {
-	//GTEST_SKIP();
+	GTEST_SKIP();
 
 	LoadFromFile();