fix PdfReader and PdfWriter, fix BUILDING_WASM_MODULE

This commit is contained in:
Kulikova Svetlana
2022-11-03 17:47:16 +03:00
parent e27a20f9ae
commit d70d4d50f0
20 changed files with 868 additions and 960 deletions

View File

@ -109,7 +109,6 @@ void CDjVuFile::ConvertToPdf(const std::wstring& wsDstPath)
if (m_pImplementation)
m_pImplementation->ConvertToPdf(wsDstPath);
}
#ifdef BUILDING_WASM_MODULE
BYTE* CDjVuFile::GetStructure()
{
if (m_pImplementation)
@ -122,4 +121,3 @@ BYTE* CDjVuFile::GetLinks (int nPageIndex)
return m_pImplementation->GetPageLinks(nPageIndex);
return NULL;
}
#endif

View File

@ -74,8 +74,6 @@ public:
void ConvertToPdf(const std::wstring& path);
#ifdef BUILDING_WASM_MODULE
virtual BYTE* GetStructure();
virtual BYTE* GetLinks (int nPageIndex);
#endif
};

View File

@ -47,9 +47,10 @@
#include <vector>
#include "../DesktopEditor/graphics/pro/js/wasm/src/serialize.h"
#ifdef BUILDING_WASM_MODULE
#define DISABLE_TEMP_DIRECTORY
#include "../DesktopEditor/graphics/pro/js/wasm/src/serialize.h"
#endif
namespace NSDjvu
@ -277,7 +278,6 @@ std::wstring CDjVuFileImplementation::GetInfo()
return sRes;
}
#ifdef BUILDING_WASM_MODULE
void getBookmars(const GP<DjVmNav>& nav, int& pos, int count, NSWasm::CData& out, int level)
{
while (count > 0 && pos < nav->getBookMarkCount())
@ -422,7 +422,6 @@ BYTE* CDjVuFileImplementation::GetPageLinks(int nPageIndex)
catch (...) {}
return NULL;
}
#endif
void CDjVuFileImplementation::CreateFrame(IRenderer* pRenderer, GP<DjVuImage>& pPage, int nPage, XmlUtils::CXmlNode& text)
{

View File

@ -51,10 +51,6 @@
#include "../DesktopEditor/graphics/IRenderer.h"
#include "../DesktopEditor/graphics/pro/Fonts.h"
#ifdef BUILDING_WASM_MODULE
#include "../DesktopEditor/graphics/pro/js/wasm/src/serialize.h"
#endif
class CDjVuFileImplementation
{
private:
@ -79,11 +75,9 @@ public:
void ConvertToPdf(const std::wstring& wsDstPath);
std::wstring GetInfo();
#ifdef BUILDING_WASM_MODULE
BYTE* GetStructure();
BYTE* GetPageGlyphs(int nPageIndex);
BYTE* GetPageLinks (int nPageIndex);
#endif
private: