pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-04-07 13:55:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Refactoring

Browse Source
This commit is contained in:
Svetlana Kulikova
2024-08-13 16:32:41 +03:00
parent 2db2b98c8f
commit 1d6b895496
3 changed files with 15 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
DesktopEditor/graphics/AlphaMask.cpp
View File

@ -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)
{

47
PdfFile/SrcReader/RendererOutputDev.cpp
View File

@ -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;

7
PdfFile/test/test.cpp
View File

@ -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();