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 errors

Browse Source
This commit is contained in:
Oleg Korshul
2021-10-05 15:13:22 +03:00
parent 54e10c7b55
commit d7c4ceba92
11 changed files with 148 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
DesktopEditor/fontengine/FontManager.cpp
View File

@ -104,9 +104,6 @@ int CFontStream::CreateFromMemory(BYTE* pData, LONG lSize, bool bClear)
return TRUE;
}
#ifndef BUILDING_WASM_MODULE
CGlobalFontsMemoryStorage* CApplicationFontStreams::m_pMemoryStorage = NULL;
#endif
CApplicationFontStreams::CApplicationFontStreams() : NSFonts::IApplicationFontStreams()
{
}
@ -117,12 +114,15 @@ CApplicationFontStreams::~CApplicationFontStreams()
NSFonts::IFontStream* CApplicationFontStreams::GetStream(const std::wstring &strFile)
{
CFontStream* pStream = m_mapStreams[strFile];
CFontStream* pStream = m_mapStreams[strFile];
if (NULL != pStream)
return pStream;
if (m_pMemoryStorage)
pStream = m_pMemoryStorage->Get(strFile);
if (NSFonts::NSApplicationFontStream::GetGlobalMemoryStorage())
{
pStream = (CFontStream*)NSFonts::NSApplicationFontStream::GetGlobalMemoryStorage()->Get(strFile);
}
else
{
pStream = new CFontStream();
@ -141,10 +141,7 @@ void CApplicationFontStreams::CheckStreams(std::map<std::wstring,bool> &mapFiles
if (mapFiles.find(iter->first) != mapFiles.end())
{
if (m_pMemoryStorage)
m_pMemoryStorage->Remove(iter->first);
else
RELEASEINTERFACE(pFile);
RELEASEINTERFACE(pFile);
iter = m_mapStreams.erase(iter);
}
else
@ -154,15 +151,13 @@ void CApplicationFontStreams::CheckStreams(std::map<std::wstring,bool> &mapFiles
void CApplicationFontStreams::Clear()
{
if (NSFonts::NSApplicationFontStream::GetGlobalMemoryStorage())
NSFonts::NSApplicationFontStream::GetGlobalMemoryStorage()->Clear();
for (std::map<std::wstring, CFontStream*>::iterator iter = m_mapStreams.begin(); iter != m_mapStreams.end(); ++iter)
{
if (m_pMemoryStorage)
m_pMemoryStorage->Remove(iter->first);
else
{
CFontStream* pFile = iter->second;
RELEASEINTERFACE(pFile);
}
CFontStream* pFile = iter->second;
RELEASEINTERFACE(pFile);
}
m_mapStreams.clear();
}
@ -701,13 +696,10 @@ INT CFontManager::LoadFontByName(const std::wstring& sName, const double& dSize,
*oFormat.bItalic = TRUE;
NSFonts::CFontInfo* pInfo = m_pApplication->GetList()->GetByParams(oFormat);
if (NULL == pInfo && !((CApplicationFontStreams*)m_pApplication->GetStreams())->m_pMemoryStorage)
if (NULL == pInfo)
return FALSE;
INT bLoad = ((CApplicationFontStreams*)m_pApplication->GetStreams())->m_pMemoryStorage ?
LoadFontFromFile(sName, 0, dSize, dDpiX, dDpiY) :
LoadFontFromFile(pInfo->m_wsFontPath, pInfo->m_lIndex, dSize, dDpiX, dDpiY);
INT bLoad = LoadFontFromFile(pInfo->m_wsFontPath, pInfo->m_lIndex, dSize, dDpiX, dDpiY);
if (bLoad == TRUE)
{

59
DesktopEditor/fontengine/FontManager.h
View File

@ -52,70 +52,13 @@ public:
virtual int CreateFromMemory(BYTE* pData, LONG lSize, bool bClear);
};
class CGlobalFontsMemoryStorage
{
private:
std::map<std::wstring, CFontStream*> m_mapStreams;
void string_replace(std::wstring& text, const std::wstring& replaceFrom, const std::wstring& replaceTo)
{
size_t posn = 0;
while (std::wstring::npos != (posn = text.find(replaceFrom, posn)))
{
text.replace(posn, replaceFrom.length(), replaceTo);
posn += replaceTo.length();
}
}
public:
CGlobalFontsMemoryStorage(){}
~CGlobalFontsMemoryStorage()
{
for (std::map<std::wstring, CFontStream*>::iterator it = m_mapStreams.begin(); it != m_mapStreams.end(); it++)
RELEASEOBJECT(it->second);
m_mapStreams.clear();
}
void Add(const std::wstring& id, BYTE* data, LONG size, bool bClear = false)
{
std::wstring sFile = id;
string_replace(sFile, L"\\", L"/");
std::map<std::wstring, CFontStream*>::iterator it = m_mapStreams.find(sFile);
if (it == m_mapStreams.end())
{
CFontStream* pStream = (CFontStream*)NSFonts::NSStream::Create();
pStream->CreateFromMemory(data, size, bClear);
m_mapStreams.insert({sFile, pStream});
}
}
void Remove(const std::wstring& id)
{
std::wstring sFile = id;
string_replace(sFile, L"\\", L"/");
std::map<std::wstring, CFontStream*>::iterator it = m_mapStreams.find(sFile);
if (it != m_mapStreams.end())
{
RELEASEOBJECT(it->second);
m_mapStreams.erase(it);
}
}
CFontStream* Get(const std::wstring& id)
{
std::wstring sFile = id;
string_replace(sFile, L"\\", L"/");
std::map<std::wstring, CFontStream*>::iterator it = m_mapStreams.find(sFile);
return it != m_mapStreams.end() ? it->second : NULL;
}
};
class CApplicationFontStreams : public NSFonts::IApplicationFontStreams
{
private:
// этот мап нужно периодически опрашивать и удалять неиспользуемые стримы
std::map<std::wstring, CFontStream*> m_mapStreams;
public:
static CGlobalFontsMemoryStorage* m_pMemoryStorage;
public:
CApplicationFontStreams();
virtual ~CApplicationFontStreams();

21
DesktopEditor/graphics/pro/Fonts.h
View File

@ -429,6 +429,20 @@ namespace NSFonts
virtual int CreateFromMemory(BYTE* pData, LONG lSize, bool bClear) = 0;
};
class GRAPHICS_DECL IFontsMemoryStorage : public NSBase::CBaseRefCounter
{
public:
IFontsMemoryStorage();
virtual ~IFontsMemoryStorage();
virtual bool Add(const std::wstring& id, BYTE* data, LONG size, bool bClear = false) = 0;
virtual bool Remove(const std::wstring& id) = 0;
virtual IFontStream* Get(const std::wstring& id) = 0;
virtual std::wstring GenerateId() = 0;
virtual void Clear() = 0;
};
class GRAPHICS_DECL IApplicationFontStreams : public NSBase::CBaseRefCounter
{
public:
@ -449,6 +463,13 @@ namespace NSFonts
namespace NSApplicationFontStream
{
GRAPHICS_DECL IApplicationFontStreams* Create();
// create default
GRAPHICS_DECL IFontsMemoryStorage* CreateDefaultGlobalMemoryStorage();
// without AddRef!!!
GRAPHICS_DECL IFontsMemoryStorage* GetGlobalMemoryStorage();
GRAPHICS_DECL void SetGlobalMemoryStorage(IFontsMemoryStorage* pStorage);
}
}

15
DesktopEditor/graphics/pro/js/wasm/src/drawingfile.cpp
View File

@ -1,7 +1,6 @@
#include <malloc.h>
#include <iostream>
#include "../../../../GraphicsRenderer.h"
#include "../../../../pro/Graphics.h"
#include "../../../../../common/Base64.h"
#include "drawingfile.h"
@ -12,8 +11,6 @@
#define WASM_EXPORT __attribute__((visibility("default")))
#endif
CGlobalFontsMemoryStorage* CApplicationFontStreams::m_pMemoryStorage = NULL;
#ifdef __cplusplus
extern "C" {
#endif
@ -33,20 +30,20 @@ WASM_EXPORT int GetType (BYTE* data, LONG size)
}
WASM_EXPORT CGraphicsFileDrawing* Open(BYTE* data, LONG size)
{
// всегда пересоздаем сторадж
NSFonts::NSApplicationFontStream::SetGlobalMemoryStorage(NSFonts::NSApplicationFontStream::CreateDefaultGlobalMemoryStorage());
CGraphicsFileDrawing* pGraphics = new CGraphicsFileDrawing();
if (pGraphics->Open(data, size, GetType(data, size)))
{
if (!CApplicationFontStreams::m_pMemoryStorage)
CApplicationFontStreams::m_pMemoryStorage = new CGlobalFontsMemoryStorage();
return pGraphics;
}
delete pGraphics;
delete pGraphics;
return NULL;
}
WASM_EXPORT void Close (CGraphicsFileDrawing* pGraphics)
{
delete pGraphics;
RELEASEOBJECT(CApplicationFontStreams::m_pMemoryStorage);
NSFonts::NSApplicationFontStream::SetGlobalMemoryStorage(NULL);
}
WASM_EXPORT int* GetInfo (CGraphicsFileDrawing* pGraphics)
{

86
DesktopEditor/graphics/pro/pro_Fonts.cpp
View File

@ -38,6 +38,8 @@
#include <libkern/OSAtomic.h>
#endif
NSFonts::IFontsMemoryStorage* g_global_fonts_memory_storage = NULL;
namespace NSFonts
{
CLibrary::CLibrary()
@ -122,12 +124,96 @@ namespace NSFonts
IApplicationFontStreams::IApplicationFontStreams() : NSBase::CBaseRefCounter() {}
IApplicationFontStreams::~IApplicationFontStreams() {}
IFontsMemoryStorage::IFontsMemoryStorage() {}
IFontsMemoryStorage::~IFontsMemoryStorage() {}
namespace NSApplicationFontStream
{
IApplicationFontStreams* Create()
{
return new CApplicationFontStreams();
}
// default global memory storage
class CDefaultGlobalFontsMemoryStorage : public IFontsMemoryStorage
{
private:
std::map<std::wstring, IFontStream*> m_mapStreams;
int m_nInternalCounter;
public:
CDefaultGlobalFontsMemoryStorage()
{
m_nInternalCounter = 1;
}
virtual ~CDefaultGlobalFontsMemoryStorage()
{
Clear();
}
virtual bool Add(const std::wstring& id, BYTE* data, LONG size, bool bClear = false)
{
std::map<std::wstring, IFontStream*>::iterator it = m_mapStreams.find(id);
if (it != m_mapStreams.end())
return false;
IFontStream* pStream = NSFonts::NSStream::Create();
pStream->CreateFromMemory(data, size, bClear);
m_mapStreams.insert(std::pair<std::wstring, IFontStream*>(id, pStream));
return true;
}
virtual bool Remove(const std::wstring& id)
{
std::map<std::wstring, IFontStream*>::iterator it = m_mapStreams.find(id);
if (it == m_mapStreams.end())
return false;
it->second->Release();
m_mapStreams.erase(it);
return true;
}
virtual void Clear()
{
for (std::map<std::wstring, IFontStream*>::iterator it = m_mapStreams.begin(); it != m_mapStreams.end(); it++)
it->second->Release();
m_mapStreams.clear();
}
virtual IFontStream* Get(const std::wstring& id)
{
std::map<std::wstring, IFontStream*>::iterator it = m_mapStreams.find(id);
return it != m_mapStreams.end() ? it->second : NULL;
}
virtual std::wstring GenerateId()
{
while (true)
{
std::wstring sKey = L"storage_internal_" + std::to_wstring(m_nInternalCounter++);
if (m_mapStreams.find(sKey) == m_mapStreams.end())
return sKey;
}
return L"";
}
};
GRAPHICS_DECL IFontsMemoryStorage* CreateDefaultGlobalMemoryStorage()
{
return new CDefaultGlobalFontsMemoryStorage();
}
GRAPHICS_DECL IFontsMemoryStorage* GetGlobalMemoryStorage()
{
return g_global_fonts_memory_storage;
}
GRAPHICS_DECL void SetGlobalMemoryStorage(IFontsMemoryStorage* pStorage)
{
if (g_global_fonts_memory_storage && g_global_fonts_memory_storage != pStorage)
g_global_fonts_memory_storage->Release();
g_global_fonts_memory_storage = pStorage;
}
}
IFontFile::IFontFile() : NSBase::CBaseRefCounter() {}

2
DjVuFile/DjVu.cpp
View File

@ -110,7 +110,7 @@ void CDjVuFile::ConvertToPdf(const std::wstring& wsDstPath)
if (m_pImplementation)
m_pImplementation->ConvertToPdf(wsDstPath);
}
#ifdef WASM_MODE
#ifdef BUILDING_WASM_MODULE
BYTE* CDjVuFile::GetStructure()
{
if (m_pImplementation)

2
DjVuFile/DjVuFileImplementation.cpp
View File

@ -336,7 +336,7 @@ void CDjVuFileImplementation::ConvertToPdf(const std::wstring& wsD
oPdf.SaveToFile(wsDstPath);
}
#ifdef WASM_MODE
#ifdef BUILDING_WASM_MODULE
class CData
{
protected:

2
DjVuFile/DjVuFileImplementation.h
View File

@ -79,7 +79,7 @@ public:
BYTE* ConvertToPixels(int nPageIndex, const int& nRasterW = -1, const int& nRasterH = -1, bool bIsFlip = false);
void ConvertToRaster(int nPageIndex, const std::wstring& wsDstPath, int nImageType, const int& nRasterW = -1, const int& nRasterH = -1);
void ConvertToPdf(const std::wstring& wsDstPath);
#ifdef WASM_MODE
#ifdef BUILDING_WASM_MODULE
BYTE* GetStructure();
BYTE* GetPageGlyphs(int nPageIndex, const int& nRasterW, const int& nRasterH);
BYTE* GetPageLinks (int nPageIndex, const int& nRasterW, const int& nRasterH);

2
PdfReader/PdfReader.cpp
View File

@ -43,13 +43,11 @@
#include "../DesktopEditor/graphics/IRenderer.h"
#include "../DesktopEditor/common/Directory.h"
//#include "Src/StringExt.h"
#include "lib/xpdf/PDFDoc.h"
#include "lib/xpdf/GlobalParams.h"
#include "lib/xpdf/ErrorCodes.h"
#include "lib/xpdf/ImageOutputDev.h"
#include "Src/RendererOutputDev.h"
//#include "Src/PageLabels.h"
namespace PdfReader
{

44
PdfReader/Src/RendererOutputDev.cpp
View File

@ -56,11 +56,6 @@
#include "../../PdfWriter/PdfRenderer.h"
#endif
#ifdef BUILDING_WASM_MODULE
#include <time.h>
#include "../../DesktopEditor/graphics/GraphicsRenderer.h"
#endif
// TODO: 1. Реализовать по-нормальному градиентные заливки (Axial и Radial)
// 2. m_pRenderer->SetAdditionalParam(L"TilingHtmlPattern", oWriter.GetXmlString());
// 3. Подбор шрифтов необходимо перенести в GlobalParams->FindFontFile
@ -660,22 +655,12 @@ namespace PdfReader
case fontCIDType2OT: wsExt = L".cid_2ot"; break;
}
#ifdef BUILDING_WASM_MODULE
std::wstring wsTemp = ((GlobalParamsAdaptor *)globalParams)->GetTempFolder() + L"/x";
int nTime = (int)time(NULL);
for (int nIndex = 0; nIndex < 1000; ++nIndex)
#ifdef BUILDING_WASM_MODULE
if (NSFonts::NSApplicationFontStream::GetGlobalMemoryStorage())
{
wsTempFileName = wsTemp + std::to_wstring(nTime + nIndex) + wsExt;
if (!CApplicationFontStreams::m_pMemoryStorage->Get(wsTempFileName))
break;
wsTempFileName = NSFonts::NSApplicationFontStream::GetGlobalMemoryStorage()->GenerateId();
}
if (CApplicationFontStreams::m_pMemoryStorage->Get(wsTempFileName))
{
pEntry->bAvailable = true;
return;
}
#else
#else
FILE* pTempFile = NULL;
if (!NSFile::CFileBinary::OpenTempFile(&wsTempFileName, &pTempFile, L"wb", (wchar_t*)wsExt.c_str(),
(wchar_t*)((GlobalParamsAdaptor *)globalParams)->GetTempFolder().c_str(), NULL))
@ -686,7 +671,8 @@ namespace PdfReader
pEntry->bAvailable = true;
return;
}
#endif
#endif
Object oReferenceObject, oStreamObject;
oReferenceObject.initRef(oEmbRef.num, oEmbRef.gen);
@ -696,18 +682,20 @@ namespace PdfReader
{
// Внедренный шрифт неправильно записан
oStreamObject.free();
#ifndef BUILDING_WASM_MODULE
#ifndef BUILDING_WASM_MODULE
fclose(pTempFile);
if (L"" != wsTempFileName)
NSFile::CFileBinary::Remove(wsTempFileName);
#endif
#endif
pEntry->bAvailable = true;
return;
}
oStreamObject.streamReset();
#ifdef BUILDING_WASM_MODULE
#ifdef BUILDING_WASM_MODULE
LONG nCurrentPos = 0;
LONG nCurrentSize = 0xffff;
BYTE* pTempStream = new BYTE[nCurrentSize];
@ -725,19 +713,17 @@ namespace PdfReader
}
pTempStream[nCurrentPos++] = nChar;
}
BYTE* pResBuffer = new BYTE[nCurrentPos];
memcpy(pResBuffer, pTempStream, nCurrentPos);
NSFonts::NSApplicationFontStream::GetGlobalMemoryStorage()->Add(wsTempFileName, pTempStream, (LONG)nCurrentPos, true);
RELEASEARRAYOBJECTS(pTempStream);
CApplicationFontStreams::m_pMemoryStorage->Add(wsTempFileName, pResBuffer, nCurrentPos, true);
RELEASEARRAYOBJECTS(pResBuffer);
#else
#else
int nChar;
while ((nChar = oStreamObject.streamGetChar()) != EOF)
{
fputc(nChar, pTempFile);
}
fclose(pTempFile);
#endif
#endif
oStreamObject.streamClose();
oStreamObject.free();
wsFileName = wsTempFileName;

8
XpsFile/XpsLib/XpsPage.cpp
View File

@ -33,7 +33,6 @@
#include <stdio.h>
#include "../../DesktopEditor/common/StringExt.h"
#include "../../DesktopEditor/graphics/structures.h"
#include "../../DesktopEditor/fontengine/FontManager.h"
#include "Document.h"
#include "StaticResources.h"
@ -47,9 +46,6 @@
#endif
#define IsFromResource(String) (!String.empty() && '{' == String[0])
#ifndef BUILDING_WASM_MODULE
CGlobalFontsMemoryStorage* CApplicationFontStreams::m_pMemoryStorage = NULL;
#endif
namespace XPS
{
@ -515,8 +511,8 @@ namespace XPS
IFolder::CBuffer* buffer = NULL;
m_wsRootPath->read(wsFontPath, buffer);
m_pFontList->Check(wsFontName, buffer->Buffer, buffer->Size);
if (CApplicationFontStreams::m_pMemoryStorage)
CApplicationFontStreams::m_pMemoryStorage->Add(wsFontPath, buffer->Buffer, buffer->Size);
if (NSFonts::NSApplicationFontStream::GetGlobalMemoryStorage())
NSFonts::NSApplicationFontStream::GetGlobalMemoryStorage()->Add(wsFontPath, buffer->Buffer, buffer->Size);
m_wsRootPath->write(wsFontPath, buffer->Buffer, buffer->Size);
RELEASEOBJECT(buffer);
}