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

DjVu GString return

Browse Source
This commit is contained in:
Kulikova Svetlana
2021-12-20 20:48:44 +03:00
parent 9e7d7a366d
commit 92e2385650
32 changed files with 31 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DesktopEditor/graphics/pro/js/drawingfile.json
View File

@ -163,7 +163,7 @@
{
"name": "d",
"folder": "../../../../DjVuFile/libdjvu/",
"files": ["../DjVu.cpp", "../DjVuFileImplementation.cpp", "Arrays.cpp", "BSByteStream.cpp", "BSEncodeByteStream.cpp", "ByteStream.cpp", "DataPool.cpp", "debug.cpp", "DjVmDir.cpp", "DjVmDir0.cpp", "DjVmDoc.cpp", "DjVmNav.cpp", "DjVuAnno.cpp", "DjVuDocEditor.cpp", "DjVuDocument.cpp", "DjVuDumpHelper.cpp", "DjVuErrorList.cpp", "DjVuFile.cpp", "DjVuFileCache.cpp", "DjVuGlobal.cpp", "DjVuGlobalMemory.cpp", "DjVuImage.cpp", "DjVuInfo.cpp", "DjVuMessageLite.cpp", "DjVuNavDir.cpp", "DjVuPalette.cpp", "DjVuPort.cpp", "DjVuText.cpp", "DjVuToPS.cpp", "GBitmap.cpp", "GContainer.cpp", "GException.cpp", "GIFFManager.cpp", "GMapAreas.cpp", "GPixmap.cpp", "GRect.cpp", "GScaler.cpp", "GSmartPointer.cpp", "DjVuGString.cpp", "GThreads.cpp", "GUnicode.cpp", "IFFByteStream.cpp", "IW44EncodeCodec.cpp", "IW44Image.cpp", "JB2EncodeCodec.cpp", "JB2Image.cpp", "JPEGDecoder.cpp", "MMRDecoder.cpp", "MMX.cpp", "UnicodeByteStream.cpp", "XMLParser.cpp", "XMLTags.cpp", "ZPCodec.cpp"]
"files": ["../DjVu.cpp", "../DjVuFileImplementation.cpp", "Arrays.cpp", "BSByteStream.cpp", "BSEncodeByteStream.cpp", "ByteStream.cpp", "DataPool.cpp", "debug.cpp", "DjVmDir.cpp", "DjVmDir0.cpp", "DjVmDoc.cpp", "DjVmNav.cpp", "DjVuAnno.cpp", "DjVuDocEditor.cpp", "DjVuDocument.cpp", "DjVuDumpHelper.cpp", "DjVuErrorList.cpp", "DjVuFile.cpp", "DjVuFileCache.cpp", "DjVuGlobal.cpp", "DjVuGlobalMemory.cpp", "DjVuImage.cpp", "DjVuInfo.cpp", "DjVuMessageLite.cpp", "DjVuNavDir.cpp", "DjVuPalette.cpp", "DjVuPort.cpp", "DjVuText.cpp", "DjVuToPS.cpp", "GBitmap.cpp", "GContainer.cpp", "GException.cpp", "GIFFManager.cpp", "GMapAreas.cpp", "GPixmap.cpp", "GRect.cpp", "GScaler.cpp", "GSmartPointer.cpp", "GString.cpp", "GThreads.cpp", "GUnicode.cpp", "IFFByteStream.cpp", "IW44EncodeCodec.cpp", "IW44Image.cpp", "JB2EncodeCodec.cpp", "JB2Image.cpp", "JPEGDecoder.cpp", "MMRDecoder.cpp", "MMX.cpp", "UnicodeByteStream.cpp", "XMLParser.cpp", "XMLTags.cpp", "ZPCodec.cpp"]
},
{
"name": "dj",

4
DesktopEditor/graphics/pro/js/qt/nativegraphics.pro
View File

@ -515,7 +515,7 @@ HEADERS += \
$$DJVU_ROOT_DIR/libdjvu/GRect.h \
$$DJVU_ROOT_DIR/libdjvu/GScaler.h \
$$DJVU_ROOT_DIR/libdjvu/GSmartPointer.h \
$$DJVU_ROOT_DIR/libdjvu/DjVuGString.h \
$$DJVU_ROOT_DIR/libdjvu/GString.h \
$$DJVU_ROOT_DIR/libdjvu/GThreads.h \
$$DJVU_ROOT_DIR/libdjvu/GURL.h \
$$DJVU_ROOT_DIR/libdjvu/IFFByteStream.h \
@ -571,7 +571,7 @@ SOURCES += \
$$DJVU_ROOT_DIR/libdjvu/GRect.cpp \
$$DJVU_ROOT_DIR/libdjvu/GScaler.cpp \
$$DJVU_ROOT_DIR/libdjvu/GSmartPointer.cpp \
$$DJVU_ROOT_DIR/libdjvu/DjVuGString.cpp \
$$DJVU_ROOT_DIR/libdjvu/GString.cpp \
$$DJVU_ROOT_DIR/libdjvu/GThreads.cpp \
$$DJVU_ROOT_DIR/libdjvu/GUnicode.cpp \
#$$DJVU_ROOT_DIR/libdjvu/GURL.cpp \

4
DjVuFile/DjVuFile.pro
View File

@ -83,7 +83,7 @@ SOURCES += DjVu.cpp \
libdjvu/GRect.cpp \
libdjvu/GScaler.cpp \
libdjvu/GSmartPointer.cpp \
libdjvu/DjVuGString.cpp \
libdjvu/GString.cpp \
libdjvu/GThreads.cpp \
libdjvu/GUnicode.cpp \
libdjvu/GURL.cpp \
@ -139,7 +139,7 @@ HEADERS += DjVu.h \
libdjvu/GRect.h \
libdjvu/GScaler.h \
libdjvu/GSmartPointer.h \
libdjvu/DjVuGString.h \
libdjvu/GString.h \
libdjvu/GThreads.h \
libdjvu/GURL.h \
libdjvu/IFFByteStream.h \

2
DjVuFile/libdjvu/BSEncodeByteStream.cpp
View File

@ -68,7 +68,7 @@
#include "BSByteStream.h"
#include "DjVuGString.h"
#include "GString.h"
#undef BSORT_TIMER
#ifdef BSORT_TIMER
#include "GOS.h"

2
DjVuFile/libdjvu/DataPool.cpp
View File

@ -65,7 +65,7 @@
#include "DataPool.h"
#include "IFFByteStream.h"
#include "DjVuGString.h"
#include "GString.h"
#include "GOS.h"
#include "GURL.h"
#include "debug.h"

2
DjVuFile/libdjvu/DataPool.h
View File

@ -67,7 +67,7 @@
#include "GThreads.h"
#include "DjVuGString.h"
#include "GString.h"
#include "GURL.h"
#ifdef HAVE_NAMESPACES

2
DjVuFile/libdjvu/DjVmDir.h
View File

@ -118,7 +118,7 @@
#include "DjVuGString.h"
#include "GString.h"
#include "GThreads.h"
#ifdef HAVE_NAMESPACES

2
DjVuFile/libdjvu/DjVmDir0.h
View File

@ -66,7 +66,7 @@
#endif
#include "DjVuGString.h"
#include "GString.h"
#ifdef HAVE_NAMESPACES
namespace DJVU {

2
DjVuFile/libdjvu/DjVmNav.h
View File

@ -66,7 +66,7 @@
#endif
#include "DjVuGlobal.h"
#include "DjVuGString.h"
#include "GString.h"
#include "GThreads.h"
#ifdef HAVE_NAMESPACES

2
DjVuFile/libdjvu/DjVuAnno.h
View File

@ -91,7 +91,7 @@
//@{
#include "DjVuGString.h"
#include "GString.h"
#ifdef HAVE_NAMESPACES
namespace DJVU {

2
DjVuFile/libdjvu/DjVuDocument.cpp
View File

@ -78,7 +78,7 @@
#include "debug.h"
#if defined(__linux__) || defined(LINUX) || defined(BUILDING_WASM_MODULE)
#if defined(__linux__) || defined(LINUX)
typedef unsigned int UINT;
#endif

2
DjVuFile/libdjvu/DjVuGlobal.h
View File

@ -75,11 +75,9 @@ inline void * operator new(size_t, void * ptr) { return ptr; }
# include <new>
#endif
#ifndef BUILDING_WASM_MODULE
#ifdef WIN32
#include <new.h>
#endif
#endif
//#ifdef WIN32
//# ifdef DLL_EXPORT

2
DjVuFile/libdjvu/DjVuInfo.cpp
View File

@ -66,7 +66,7 @@
#include "DjVuInfo.h"
#include "GException.h"
#include "ByteStream.h"
#include "DjVuGString.h"
#include "GString.h"
#ifdef HAVE_NAMESPACES

2
DjVuFile/libdjvu/DjVuMessageLite.h
View File

@ -71,7 +71,7 @@
// and added support for non I18N messages.
#include "DjVuGString.h"
#include "GString.h"
#ifdef HAVE_NAMESPACES
namespace DJVU {

2
DjVuFile/libdjvu/DjVuNavDir.h
View File

@ -66,7 +66,7 @@
#endif
#include "DjVuGString.h"
#include "GString.h"
#include "GThreads.h"
#include "GURL.h"

2
DjVuFile/libdjvu/GBitmap.cpp
View File

@ -66,7 +66,7 @@
#include "GBitmap.h"
#include "ByteStream.h"
#include "GRect.h"
#include "DjVuGString.h"
#include "GString.h"
#include "GThreads.h"
#include "GException.h"
#include <string.h>

2
DjVuFile/libdjvu/GException.cpp
View File

@ -259,7 +259,7 @@ GExceptionHandler::rethrow(void)
// This is not activated when C++ memory management
// is overidden. The overriding functions handle
// memory exceptions by themselves.
# if defined(_MSC_VER) && !defined(BUILDING_WASM_MODULE)
# if defined(_MSC_VER)
// Microsoft is different!
static int throw_memory_error(size_t) { G_THROW(GException::outofmemory); return 0; }
static int (*old_handler)(size_t) = _set_new_handler(throw_memory_error);

2
DjVuFile/libdjvu/GIFFManager.h
View File

@ -70,7 +70,7 @@
#include "GContainer.h"
#include "Arrays.h"
#include "GSmartPointer.h"
#include "DjVuGString.h"
#include "GString.h"
#ifdef HAVE_NAMESPACES
namespace DJVU {

2
DjVuFile/libdjvu/GMapAreas.h
View File

@ -68,7 +68,7 @@
#include "GSmartPointer.h"
#include "GContainer.h"
#include "DjVuGString.h"
#include "GString.h"
#include "GRect.h"
#include "GURL.h"

2
DjVuFile/libdjvu/GOS.h
View File

@ -87,7 +87,7 @@
//@{
#include "DjVuGlobal.h"
#include "DjVuGString.h"
#include "GString.h"
#ifdef HAVE_NAMESPACES
namespace DJVU {

2
DjVuFile/libdjvu/GPixmap.cpp
View File

@ -70,7 +70,7 @@
#include "GPixmap.h"
#include "DjVuGString.h"
#include "GString.h"
#include "GException.h"
#include "ByteStream.h"
#include "GRect.h"

2
DjVuFile/libdjvu/DjVuGString.cpp → DjVuFile/libdjvu/GString.cpp
View File

@ -72,7 +72,7 @@
# pragma implementation
#endif
#include "DjVuGString.h"
#include "GString.h"
#include "GThreads.h"
#include "debug.h"

0
DjVuFile/libdjvu/DjVuGString.h → DjVuFile/libdjvu/GString.h
View File

2
DjVuFile/libdjvu/GURL.h
View File

@ -66,7 +66,7 @@
#endif
#include "DjVuGString.h"
#include "GString.h"
#include "Arrays.h"
#include "GThreads.h"

2
DjVuFile/libdjvu/GUnicode.cpp
View File

@ -63,7 +63,7 @@
# pragma implementation
#endif
#include "DjVuGString.h"
#include "GString.h"
#if HAS_ICONV
#include <iconv.h>
#endif

2
DjVuFile/libdjvu/IFFByteStream.h
View File

@ -132,7 +132,7 @@
#include <stdio.h>
#include <string.h>
#include "GException.h"
#include "DjVuGString.h"
#include "GString.h"
#include "ByteStream.h"

2
DjVuFile/libdjvu/JB2Image.h
View File

@ -173,7 +173,7 @@
//@{
#include "DjVuGString.h"
#include "GString.h"
#include "ZPCodec.h"

2
DjVuFile/libdjvu/JPEGDecoder.cpp
View File

@ -99,7 +99,7 @@ extern "C" {
#include "GPixmap.h"
#ifdef LIBJPEGNAME
#include "DjVuDynamic.h"
#include "DjVuGString.h"
#include "GString.h"
#endif // LIBJPEGNAME

2
DjVuFile/libdjvu/UnicodeByteStream.h
View File

@ -88,7 +88,7 @@
//@{
#include "DjVuGlobal.h"
#include "DjVuGString.h"
#include "GString.h"
#include "ByteStream.h"

2
DjVuFile/libdjvu/XMLTags.h
View File

@ -69,7 +69,7 @@
// This is purely Lizardtech stuff.
#include "GContainer.h"
#include "DjVuGString.h"
#include "GString.h"
#ifdef HAVE_NAMESPACES
namespace DJVU {

2
DjVuFile/libdjvu/debug.cpp
View File

@ -69,7 +69,7 @@
#include "GThreads.h"
#include "GContainer.h"
#include "DjVuGString.h"
#include "GString.h"
#include "ByteStream.h"
#include "GURL.h"

1
PdfReader/old/Graphics.cpp
View File

@ -5145,4 +5145,3 @@ namespace PdfReader
m_pResources = NULL;
}
}