Changeset 24965 for main/trunk/greenstone2/common-src/src/lib/display.cpp

Timestamp:

2012-01-24T14:43:52+13:00 (12 years ago)

Author:

mdewsnip

Message:

Fixed bug where the end of the macro definition would be missed if a backslash was the second-to-last character of the macro. [Michael Dewsnip, DL Consulting Ltd.]

File:

• main/trunk/greenstone2/common-src/src/lib/display.cpp (modified) (1 diff)

main/trunk/greenstone2/common-src/src/lib/display.cpp

@@ -834 +834 @@
         c = my_uni_get(fin, line, isunicode, bigendian);
       }
-      macrovalue.push_back(c);
-      c = my_uni_get(fin, line, isunicode, bigendian);
+      // DL CONSULTING FIX: Fix bug where the end of the macro definition would be missed if a backslash
+      //   was the second-to-last character of the macro. [Michael Dewsnip, DL Consulting Ltd.]
+      else
+      {
+        macrovalue.push_back(c);
+        c = my_uni_get(fin, line, isunicode, bigendian);
+      }
     }