Changeset 1927 for trunk/gsdl/lib

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

Location:

trunk/gsdl/lib

Files:

• gsdlunicode.cpp (modified) (4 diffs)
• gsdlunicode.h (modified) (5 diffs)

trunk/gsdl/lib/gsdlunicode.cpp

@@ -384 +384 @@
 
 mapinconvertclass::mapinconvertclass () {
+  multibyte = 0;
   mapbuflen = 0;
 }
@@ -425 +426 @@
       // got a complete character
       if (charlen == 1) {
-    // ascii character
-    output.push_back (mapbuf[0]);
+    if (mapbuf[0] < 0x80) {
+      // ascii character
+      output.push_back (mapbuf[0]);
+    } else {
+      output.push_back (converter.convert((unsigned short)mapbuf[0]));
+    }
 
       } else {
@@ -448 +453 @@
 
 mapoutconvertclass::mapoutconvertclass () {
+  multibyte = 0;
   mapbuflen=0; 
   mapbufhere=0;
@@ -500 +506 @@
     } else {
       outc = converter.convert (*texthere);
-      mapbuf[0] = (unsigned char)(outc >> 8);
-      mapbuf[1] = (unsigned char)(outc & 0xff);
-      mapbuflen = 2;
+      if (multibyte) {
+        mapbuf[0] = (unsigned char)(outc >> 8);
+        mapbuf[1] = (unsigned char)(outc & 0xff);
+        mapbuflen = 2;
+      } else {
+        mapbuf[0] = outc;
+        mapbuflen = 1;
+      }
     }
       }

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;