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

Merge pull request 'Fix pdf properties exists' (#244) from fix/pdf-properties into hotfix/v8.3.2

Browse Source 
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/244
This commit is contained in:
Oleg Korshul
2025-03-04 17:24:26 +00:00
parent 3d7638c3cc ba9d3bcda5
commit 06f8099497
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
PdfFile/PdfEditor.cpp
View File

@ -963,10 +963,7 @@ bool CPdfEditor::EditPage(int nPageIndex, bool bSet, bool bActualPos)
{
Object oRes;
char* chKey2 = oTemp.dictGetKey(nIndex);
if (strcmp("Font", chKey2) == 0 || strcmp("ExtGState", chKey2) == 0 || strcmp("XObject", chKey2) == 0 || strcmp("Shading", chKey2) == 0 || strcmp("Pattern", chKey2) == 0)
oTemp.dictGetVal(nIndex, &oRes);
else
oTemp.dictGetValNF(nIndex, &oRes);
oTemp.dictGetVal(nIndex, &oRes);
DictToCDictObject(&oRes, pDict, false, chKey2);
oRes.free();
}

8
PdfFile/test/test.cpp
View File

@ -372,7 +372,7 @@ TEST_F(CPdfFileTest, EditPdf)
TEST_F(CPdfFileTest, EditPdfFromBase64)
{
//GTEST_SKIP();
GTEST_SKIP();
NSFonts::NSApplicationFontStream::SetGlobalMemoryStorage(NSFonts::NSApplicationFontStream::CreateDefaultGlobalMemoryStorage());
@ -417,14 +417,14 @@ TEST_F(CPdfFileTest, EditPdfFromBase64)
TEST_F(CPdfFileTest, EditPdfFromBin)
{
GTEST_SKIP();
// GTEST_SKIP();
LoadFromFile();
ASSERT_TRUE(pdfFile->EditPdf(wsDstFile));
// чтение бинарника
NSFile::CFileBinary oFile;
ASSERT_TRUE(oFile.OpenFile(NSFile::GetProcessDirectory() + L"/changes0.json"));
ASSERT_TRUE(oFile.OpenFile(NSFile::GetProcessDirectory() + L"/changes.bin"));
DWORD dwFileSize = oFile.GetFileSize();
BYTE* pFileContent = new BYTE[dwFileSize];
@ -440,7 +440,7 @@ TEST_F(CPdfFileTest, EditPdfFromBin)
CConvertFromBinParams* pParams = new CConvertFromBinParams();
pParams->m_sMediaDirectory = NSFile::GetProcessDirectory();
pdfFile->AddToPdfFromBinary(pFileContent, dwReaded, pParams);
pdfFile->AddToPdfFromBinary(pFileContent + 4, dwReaded - 4, pParams);
RELEASEOBJECT(pParams);
RELEASEARRAYOBJECTS(pFileContent);