Merge branch 'develop' of https://github.com/ONLYOFFICE/core into develop

DesktopEditor/raster/BgraFrame.cpp

@@ -61,6 +61,7 @@ bool CBgraFrame::OpenFile(const std::wstring& strFileName, unsigned int nFileTyp
 			return false;
 
 		CxImageToMediaFrame(img);
+		m_bIsGrayScale = img.IsGrayScale();
 		return true;
 	}
 }

DesktopEditor/raster/BgraFrame.h

@@ -45,6 +45,8 @@ private:
 
 	BYTE* m_pData;
 
+	bool m_bIsGrayScale;
+
 public:
 	CBgraFrame()
 	{
@@ -69,6 +71,7 @@ private:
 		m_lHeight	= 0;
 		m_lStride	= 0;
 		m_pData		= NULL;
+		m_bIsGrayScale  = false;
 	}
 
 public:
@@ -109,6 +112,11 @@ public:
 		m_pData = pData;
 	}
 
+	inline bool IsGrayScale()
+	{
+		return m_bIsGrayScale;
+	}
+
 public:
 	bool OpenFile(const std::wstring& strFileName, unsigned int nFileType = 0);	//0 - detect
 	bool SaveFile(const std::wstring& strFileName, unsigned int nFileType);