Changeset 650 for trunk/src/unicode.cpp

Timestamp:

02/18/08 16:40:34 (3 years ago)

Author:

artem

Message:

added Unicode support based on ICU

Files:

• trunk/src/unicode.cpp (modified) (4 diffs)

trunk/src/unicode.cpp

@@ -77 +77 @@
 #endif
 
-
+/*
     inline std::wstring to_unicode(std::string const& text)
     {
@@ -160 +160 @@
    }
    
-
+*/
    transcoder::transcoder (std::string const& encoding)
+      : ok_(false),
+        conv_(0)
    {
 #ifdef MAPNIK_DEBUG
@@ -167 +169 @@
 #endif
       
-#ifndef WORDS_BIGENDIAN
-      desc_ = iconv_open("UCS-4LE",encoding.c_str());
-#else
-      desc_ = iconv_open("UCS-4BE",encoding.c_str());
-#endif
-   }
-   
-   std::wstring transcoder::transcode(std::string const& input) const
-   {
+//#ifndef WORDS_BIGENDIAN
+         //     desc_ = iconv_open("UCS-4LE",encoding.c_str());
+//#else
+         //     desc_ = iconv_open("UCS-4BE",encoding.c_str());
+//#endif
+      
+      UErrorCode err = U_ZERO_ERROR;
+      conv_ = ucnv_open(encoding.c_str(),&err);
+      if (U_SUCCESS(err)) ok_ = true;
+      // TODO
+   }
+   
+   UnicodeString transcoder::transcode(const char* data) const
+   {
+
+      UErrorCode err = U_ZERO_ERROR;
+      
+      UnicodeString ustr(data,-1,conv_,err); 
+      if (ustr.isBogus())
+      {
+         ustr.remove();
+      }
+      return ustr;
+/*
       if (desc_ == iconv_t(-1)) return to_unicode(input); 
       size_t inleft = input.size();
@@ -197 +214 @@
 #endif
       return output;
+*/
    }
    
    transcoder::~transcoder()
    {
-      if (desc_ != iconv_t(-1)) iconv_close(desc_);
+      // if (desc_ != iconv_t(-1)) iconv_close(desc_);
+      if (conv_)
+         ucnv_close(conv_);
    }   
 }