[Libreoffice-commits] libcdr.git: src/lib

[Fridrich Å trba]

 src/lib/CDRParser.cpp  |    5 +++++
 src/lib/libcdr_utils.h |    1 +
 2 files changed, 6 insertions(+)

New commits:
commit 4169445c86bf28406a50129e8b0d650eb70ae2e7
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Wed Mar 20 16:15:34 2013 +0100

    Partially fix GOST Type A font issues

diff --git a/src/lib/CDRParser.cpp b/src/lib/CDRParser.cpp
index 1604919..60c3ccb 100644
--- a/src/lib/CDRParser.cpp
+++ b/src/lib/CDRParser.cpp
@@ -110,6 +110,11 @@ static void processNameForEncoding(WPXString &name, unsigned short &encoding)
     encoding = 0xb2;
   else if (length > 5 && (found=fontName.rfind(" Thai", length - 5)) != std::string::npos)
     encoding = 0xde;
+  else if (length >= 4 && (found=fontName.find("GOST", 0, 4)) != std::string::npos)
+  {
+    encoding = 0xcc;
+	found = std::string::npos;
+  }
 
   if (found != std::string::npos)
   {
diff --git a/src/lib/libcdr_utils.h b/src/lib/libcdr_utils.h
index 5958b75..271b8bf 100644
--- a/src/lib/libcdr_utils.h
+++ b/src/lib/libcdr_utils.h
@@ -53,6 +53,7 @@ typedef short int16_t;
 typedef unsigned uint32_t;
 typedef int int32_t;
 typedef unsigned __int64 uint64_t;
+typedef __int64 int64_t;
 
 #else