DjVu GString return

DjVuFile/DjVuFile.pro

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

DjVuFile/libdjvu/BSEncodeByteStream.cpp

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

DjVuFile/libdjvu/DataPool.cpp

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

DjVuFile/libdjvu/DataPool.h

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

DjVuFile/libdjvu/DjVmDir.h

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

DjVuFile/libdjvu/DjVmDir0.h

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

DjVuFile/libdjvu/DjVmNav.h

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

DjVuFile/libdjvu/DjVuAnno.h

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

DjVuFile/libdjvu/DjVuDocument.cpp

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

DjVuFile/libdjvu/DjVuGlobal.h

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

DjVuFile/libdjvu/DjVuInfo.cpp

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

DjVuFile/libdjvu/DjVuMessageLite.h

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

DjVuFile/libdjvu/DjVuNavDir.h

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

DjVuFile/libdjvu/GBitmap.cpp

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

DjVuFile/libdjvu/GException.cpp

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

DjVuFile/libdjvu/GIFFManager.h

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

DjVuFile/libdjvu/GMapAreas.h

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

DjVuFile/libdjvu/GOS.h

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

DjVuFile/libdjvu/GPixmap.cpp

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

DjVuFile/libdjvu/GString.cpp

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

DjVuFile/libdjvu/GURL.h

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

DjVuFile/libdjvu/GUnicode.cpp

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

DjVuFile/libdjvu/IFFByteStream.h

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

DjVuFile/libdjvu/JB2Image.h

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

DjVuFile/libdjvu/JPEGDecoder.cpp

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

DjVuFile/libdjvu/UnicodeByteStream.h

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

DjVuFile/libdjvu/XMLTags.h

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

DjVuFile/libdjvu/debug.cpp

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