Changeset 1927 for trunk/gsdl/lib/gsdlunicode.h

Timestamp:

2001-02-08T13:17:33+13:00 (23 years ago)

Author:

sjboddie

Message:

Fixed a bug in the C++ encoding support - 8 bit encodings like windows-1251
were being treated as 16 bit encodings in some places

File:

• trunk/gsdl/lib/gsdlunicode.h (modified) (5 diffs)

trunk/gsdl/lib/gsdlunicode.h

@@ -153 +153 @@
   };
 
+  void set_multibyte (int new_multibyte) {multibyte = new_multibyte;};
+
   void reset ();
   void convert (text_t &output, status_t &status);
@@ -160 +162 @@
   unsigned char mapbuf[MAXMAPCHARLEN];
   size_t mapbuflen;
+  int multibyte;
 
   // note: multiple instances of mapinconvert class are expensive
@@ -172 +175 @@
     if (mapbuflen == 0) return 0;
     if (mapbuf[0] < 0x80) return 1;
+    if (!multibyte) return 1;
     return 2;
   }
@@ -194 +198 @@
   };
 
+  void set_multibyte (int new_multibyte) {multibyte = new_multibyte;};
+
   void reset ();
   void convert (char *output, size_t maxlen, 
@@ -202 +208 @@
   size_t mapbuflen;
   size_t mapbufhere;
+  int multibyte;
 
   mapconvert converter;