Changeset 1217

Timestamp:

2000-06-19T10:56:55+12:00 (24 years ago)

Author:

sjboddie

Message:

fixed a bug that I'd introduced earlier when attempting to get things
compiling on VC++ 6.0 - the gsdl-2.22 release (and possibly 2.21) was
affected and wouldn't have displayed chinese and Arabic characters
correctly

Location:

trunk/gsdl/lib

Files:

• display.cpp (modified) (5 diffs)
• display.h (modified) (2 diffs)

trunk/gsdl/lib/display.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.21  2000/06/18 22:56:55  sjboddie
+   fixed a bug that I'd introduced earlier when attempting to get things
+   compiling on VC++ 6.0 - the gsdl-2.22 release (and possibly 2.21) was
+   affected and wouldn't have displayed chinese and Arabic characters
+   correctly
+
    Revision 1.20  2000/05/12 03:09:23  sjboddie
    minor modifications to get web library compiling under VC++ 6.0
@@ -687 +693 @@
 // bigendian should be set to 1
 // 0 will be returned when the end of the file has been found
-unsigned short my_uni_get (istream &fin, int &line, 
+unsigned short my_uni_get (unistream &fin, int &line, 
                int &isunicode, int &bigendian) {
   unsigned short c = 0;
@@ -694 +700 @@
     // unicode text
     // get the next two characters
-    char c1 = 0, c2 = 0;
+    unsigned char c1 = 0, c2 = 0;
+    
     if (!fin.eof()) fin.get(c1);
     if (!fin.eof()) fin.get(c2);
@@ -712 +719 @@
     // utf-8 text
     // how many characters we get depends on what we find
-    char c1 = 0, c2 = 0, c3 = 0;
+    unsigned char c1 = 0, c2 = 0, c3 = 0;
     while (!fin.eof()) {
       fin.get(c1);
@@ -769 +776 @@
   
   // open the file
-  ifstream fin(filenamestr);
+  unistream fin (filenamestr);
+
   if (fin.fail()) return -1; // read failed
 

trunk/gsdl/lib/display.h

@@ -64 +64 @@
 #  include <iostream.h>
 #  include <fstream.h>
+
+#define unistream ifstream
+
 #else
 #  include <iostream>
 #  include <fstream>
+
+typedef std::basic_ifstream<unsigned char> unistream;
+
 #endif
 
@@ -82 +88 @@
 // cyclic macros (a includes b and b includes a)
 #define MAXRECURSIONDEPTH 30
-
 
 // class prototypes