pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-02-10 18:05:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug 65304

Browse Source
This commit is contained in:
Svetlana Kulikova
2024-08-13 10:54:23 +03:00
parent f45fb3c6be
commit 2db2b98c8f
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
PdfFile/SrcReader/RendererOutputDev.cpp
View File

@ -2925,9 +2925,10 @@ namespace PdfReader
Aggplus::CImage oImage;
StreamKind nSK = pStream->getKind();
int nComponentsCount = pColorMap->getNumPixelComps();
// Чтение jpeg через cximage происходит быстрее чем через xpdf на ~40%
if (true || pMaskColors || (nSK != strDCT) || !ReadImage(&oImage, pRef, pStream))
if (nComponentsCount != 3 || pMaskColors || (nSK != strDCT) || !ReadImage(&oImage, pRef, pStream))
{
int nBufferSize = 4 * nWidth * nHeight;
if (nBufferSize < 1)
@ -2937,8 +2938,6 @@ namespace PdfReader
if (!pBufferPtr)
return;
int nComponentsCount = pColorMap->getNumPixelComps();
// Пишем данные в pBufferPtr
ImageStream* pImageStream = new ImageStream(pStream, nWidth, nComponentsCount, pColorMap->getBits());
pImageStream->reset();
@ -3175,8 +3174,9 @@ namespace PdfReader
return;
Aggplus::CImage oImage;
int nComponentsCount = pColorMap->getNumPixelComps();
if (true || pStream->getKind() != strDCT || !ReadImage(&oImage, pRef, pStream))
if (nComponentsCount != 3 || pStream->getKind() != strDCT || !ReadImage(&oImage, pRef, pStream))
{
BYTE* pBufferPtr = new(std::nothrow) BYTE[nBufferSize];
if (!pBufferPtr)