Merge pull request #485 from mtausig/master

[mono.git] / mcs / class / I18N / Rare / CP870.cs

diff --git a/mcs/class/I18N/Rare/CP870.cs b/mcs/class/I18N/Rare/CP870.cs
index 2bd8a401db48105d52ec84979fd3f225457f73f1..290435390be37e3a13cf8d74d1223d815a6f83fa 100644 (file)
--- a/mcs/class/I18N/Rare/CP870.cs
+++ b/mcs/class/I18N/Rare/CP870.cs
@@ -28,8 +28,10 @@ namespace I18N.Rare
 {
 
 using System;
+using System.Text;
 using I18N.Common;
 
+[Serializable]
 public class CP870 : ByteEncoding
 {
        public CP870()
@@ -84,10 +86,15 @@ public class CP870 : ByteEncoding
                '\u00DC', '\u0164', '\u00DA', '\u009F', 
        };
 
-       protected override void ToBytes(char[] chars, int charIndex, int charCount,
-                                       byte[] bytes, int byteIndex)
+       protected unsafe override void ToBytes(char* chars, int charCount,
+                                       byte* bytes, int byteCount)
        {
                int ch;
+               int charIndex = 0;
+               int byteIndex = 0;
+#if NET_2_0
+               EncoderFallbackBuffer buffer = null;
+#endif
                while(charCount > 0)
                {
                        ch = (int)(chars[charIndex++]);
@@ -477,13 +484,21 @@ public class CP870 : ByteEncoding
                                case 0xFF5C: ch = 0x6A; break;
                                case 0xFF5D: ch = 0xD0; break;
                                case 0xFF5E: ch = 0xA1; break;
-                               default: ch = 0x3F; break;
+                               default:
+#if NET_2_0
+                                       HandleFallback (ref buffer, chars, ref charIndex, ref charCount, bytes, ref byteIndex, ref byteCount);
+#else
+                                               ch = 0x3F;
+#endif
+                                       break;
                        }
                        bytes[byteIndex++] = (byte)ch;
                        --charCount;
+                       --byteCount;
                }
        }
 
+       /*
        protected override void ToBytes(String s, int charIndex, int charCount,
                                        byte[] bytes, int byteIndex)
        {
@@ -883,9 +898,11 @@ public class CP870 : ByteEncoding
                        --charCount;
                }
        }
+       */
 
 }; // class CP870
 
+[Serializable]
 public class ENCibm870 : CP870
 {
        public ENCibm870() : base() {}