Changeset 370

Timestamp:

Sep 28, 2008, 6:59:31 PM (17 years ago)

Author:

pr

Message:

Support CP 1208 (UTF-8). Bug 1127.

File:

• trunk/src/cppbase/bs_string_conv.cpp (modified) (9 diffs)

trunk/src/cppbase/bs_string_conv.cpp

@@ -9 +9 @@
 
 /*
- *      This file Copyright (C) 2002 Ulrich M”ller.
+ *      This file Copyright (C) 2002-2008 Ulrich M”ller.
  *      This program is free software; you can redistribute it and/or modify
  *      it under the terms of the GNU General Public License as published by
@@ -48 +48 @@
 #pragma hdrstop
 
+#define CP_UTF8         1208
+
 DEFINE_CLASS(BSUniCodec, BSRoot);
 
@@ -86 +88 @@
  *      constructor. Creates the internal conversion
  *      object by calling encCreateCodec.
+ *
+ *@@changed WarpIN V1.0.18 (2008-09-24) [pr]: added codepage 1208 support @@fixes 1127
  */
 
@@ -92 +96 @@
       _usCodepage(usCodepage)
 {
-    ENCID id = FindEncodingID(usCodepage, &_fDouble);
-
+    ENCID id;
+
+    // WarpIN V1.0.18
+    if (usCodepage == CP_UTF8)
+    {
+        _pCodec = NULL;
+        return;
+    }
+
+    id = FindEncodingID(usCodepage, &_fDouble);
     if (_fDouble)
     {
@@ -118 +130 @@
  *      destructor. Frees the internal conversion object
  *      by calling encFreeCodec.
+ *
+ *@@changed WarpIN V1.0.18 (2008-09-24) [pr]: added codepage 1208 support @@fixes 1127
  */
 
 BSUniCodec::~BSUniCodec()
 {
-    encFreeCodec((PCONVERSION*)&_pCodec);
+    if (_pCodec)
+    {
+        encFreeCodec((PCONVERSION*)&_pCodec);
+        _pCodec = NULL;
+    }
 }
 
@@ -151 +169 @@
  *      to UTF-8. Used by BSString::assignUtf8 and
  *      others.
+ *
+ *@@changed WarpIN V1.0.18 (2008-09-24) [pr]: added codepage 1208 support @@fixes 1127
  */
 
@@ -158 +178 @@
 {
     PCONVERSION pTable = (PCONVERSION)_pCodec;
+
+    // WarpIN V1.0.18
+    if (QueryCodepage() == CP_UTF8)
+    {
+        ustr.assignUtf8(pcszCP);
+        return;
+    }
 
     XSTRING xstrNew;
@@ -226 +253 @@
  *      Characters that are not supported with the
  *      given codepage are replaced by '?'.
+ *
+ *@@changed WarpIN V1.0.18 (2008-09-24) [pr]: added codepage 1208 support @@fixes 1127
  */
 
@@ -232 +261 @@
                               unsigned long ulLength)
 {
+    // WarpIN V1.0.18
+    if (QueryCodepage() == CP_UTF8)
+    {
+        str.assign(pcszUni);
+        return;
+    }
+
     PCONVERSION pTable = (PCONVERSION)_pCodec;