Author: leo
Date: Thu Nov 10 07:41:57 2005
New Revision: 9882

Modified:
   trunk/encodings/utf16.c
Log:
fixed utf16.to_encoding when src was already ucs2

Modified: trunk/encodings/utf16.c
==============================================================================
--- trunk/encodings/utf16.c     (original)
+++ trunk/encodings/utf16.c     Thu Nov 10 07:41:57 2005
@@ -44,7 +44,8 @@ to_encoding(Interp *interpreter, STRING 
 #endif
     int src_len;
 
-    if (src->encoding == Parrot_utf16_encoding_ptr)
+    if (src->encoding == Parrot_utf16_encoding_ptr ||
+        src->encoding == Parrot_ucs2_encoding_ptr)
         return;
     /*
      * TODO adapt string creation functions
@@ -101,7 +102,8 @@ copy_to_encoding(Interp *interpreter, ST
 #endif
     int src_len;
 
-    if (src->encoding == Parrot_utf16_encoding_ptr)
+    if (src->encoding == Parrot_utf16_encoding_ptr ||
+        src->encoding == Parrot_ucs2_encoding_ptr)
         return string_copy(interpreter, src);
 
     /*

Reply via email to