Changeset 1279 for branches/New_Config_Format-branch/gsdl/lib/display.cpp

Timestamp:

2000-07-13T10:21:53+12:00 (24 years ago)

Author:

sjboddie

Message:

merged changes to trunk into New_Config_Format branch

File:

• branches/New_Config_Format-branch/gsdl/lib/display.cpp (modified) (4 diffs)

branches/New_Config_Format-branch/gsdl/lib/display.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.19.2.1  2000/07/12 22:20:53  sjboddie
+   merged changes to trunk into New_Config_Format branch
+
+   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
+
    Revision 1.19  2000/04/06 19:57:58  cs025
    Correcting a correction - reinstated all lib files due to silly
@@ -684 +696 @@
 // 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;
@@ -692 +704 @@
     // get the next two characters
     unsigned char c1 = 0, c2 = 0;
+    
     if (!fin.eof()) fin.get(c1);
     if (!fin.eof()) fin.get(c2);
@@ -766 +779 @@
   
   // open the file
-  ifstream fin(filenamestr);
+  unistream fin (filenamestr);
+
   if (fin.fail()) return -1; // read failed