Исправлен баг с сохранением альфа-канала у картинок, которые приходят с...

Исправлен баг с сохранением альфа-канала у картинок, которые приходят с отрицательным stride (баг 30341).

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@64914 954022d7-b5bf-4e40-9824-e11837661b57

PdfWriter/PdfRenderer.cpp

@@ -1408,7 +1408,7 @@ PdfWriter::CImageDict* CPdfRenderer::LoadImage(Aggplus::CImage* pImage, const BY
 
 	CImageDict* pPdfImage = m_pDocument->CreateImage();
 	if (bAlpha || nAlpha < 255)
-		pPdfImage->LoadSMask(pData, nImageW, nImageH, nAlpha);
+		pPdfImage->LoadSMask(pData, nImageW, nImageH, nAlpha, (pImage->GetStride() >= 0) ? false : true);
 
 	if (bJpeg)
 		pPdfImage->LoadJpeg(pBuffer, nBufferSize, nImageW, nImageH);

PdfWriter/Src/Image.cpp

@@ -156,7 +156,7 @@ namespace PdfWriter
 		Add("BitsPerComponent", 8);
 		SetFilter(STREAM_FILTER_FLATE_DECODE);
 	}
-	void CImageDict::LoadSMask(const BYTE* pBgra, unsigned int unWidth, unsigned int unHeight, unsigned char unAlpha)
+	void CImageDict::LoadSMask(const BYTE* pBgra, unsigned int unWidth, unsigned int unHeight, unsigned char unAlpha, bool bVerFlip)
 	{
 		CMemoryStream* pStream = new CMemoryStream(unWidth * unHeight);
 		if (!pStream)
@@ -165,17 +165,51 @@ namespace PdfWriter
 		if (255 != unAlpha)
 		{
 			double dKoef = unAlpha / 255.0;
-			for (unsigned int unIndex = 0, unSize = 4 * unWidth * unHeight; unIndex < unSize; unIndex += 4)
+
+			if (!bVerFlip)
 			{
-				BYTE nChar = *(pBgra + unIndex + 3) * dKoef;
-				pStream->Write(&nChar, 1);
+				for (unsigned int unIndex = 0, unSize = 4 * unWidth * unHeight; unIndex < unSize; unIndex += 4)
+				{
+					BYTE nChar = *(pBgra + unIndex + 3) * dKoef;
+					pStream->Write(&nChar, 1);
+				}
+			}
+			else
+			{
+				int nWidth  = (int)unWidth;
+				int nHeight = (int)unHeight;
+				for (int nY = nHeight - 1; nY >= 0; nY--)
+				{
+					for (int nX = 0; nX < nWidth; nX++)
+					{
+						int unIndex = 4 * (nX + nY * nWidth);
+						BYTE nChar = *(pBgra + unIndex + 3) * dKoef;
+						pStream->Write(&nChar, 1);
+					}
+				}
 			}
 		}
 		else
 		{
-			for (unsigned int unIndex = 0, unSize = 4 * unWidth * unHeight; unIndex < unSize; unIndex += 4)
+			if (!bVerFlip)
 			{
-				pStream->Write(pBgra + unIndex + 3, 1);
+				for (unsigned int unIndex = 0, unSize = 4 * unWidth * unHeight; unIndex < unSize; unIndex += 4)
+				{
+					pStream->Write(pBgra + unIndex + 3, 1);
+				}
+			}
+			else
+			{
+				int nWidth  = (int)unWidth;
+				int nHeight = (int)unHeight;
+				for (int nY = nHeight - 1; nY >= 0; nY--)
+				{
+					for (int nX = 0; nX < nWidth; nX++)
+					{
+						int unIndex = 4 * (nX + nY * nWidth);
+						pStream->Write(pBgra + unIndex + 3, 1);
+					}
+				}
 			}
 		}
 

PdfWriter/Src/Image.h

@@ -34,7 +34,7 @@ namespace PdfWriter
 		void LoadCCITT4(const wchar_t* wsTempFile, unsigned int unWidth, unsigned int unHeight);
 		void LoadRaw(const BYTE* pBgra, unsigned int unWidth, unsigned int unHeight);
 		void LoadRaw(const BYTE* pBuffer, unsigned int unSize, unsigned int unWidth, unsigned int unHeight);
-		void LoadSMask(const BYTE* pBgra, unsigned int unWidth, unsigned int unHeight, unsigned char lAlpha = 255);
+		void LoadSMask(const BYTE* pBgra, unsigned int unWidth, unsigned int unHeight, unsigned char lAlpha = 255, bool bVerFlip = false);
 		void LoadSMask(const BYTE* pBuffer, unsigned int unSize, unsigned int unWidth, unsigned int unHeight);
 		void LoadBW(const BYTE* pImage, unsigned int unWidth, unsigned int unHeight, unsigned int unStride);
 		void LoadBW(Pix* pPix, unsigned int unWidth, unsigned int unHeight);