X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2FI18N%2FWest%2FCP10000.cs;h=011669f3081b416c9522ba34a9107a1f64b69eec;hb=8054793e5bc158015154fb8cdcdd56777a0c8351;hp=8ea0002f842597332395b542c521fa1c94f9303d;hpb=0443306d611d0830e27327e1f0a3ef3457dfa535;p=mono.git

diff --git a/mcs/class/I18N/West/CP10000.cs b/mcs/class/I18N/West/CP10000.cs
index 8ea0002f842..011669f3081 100644
--- a/mcs/class/I18N/West/CP10000.cs
+++ b/mcs/class/I18N/West/CP10000.cs
@@ -24,6 +24,9 @@
 
 // Generated from "ibm-1275.ucm".
 
+// WARNING: Modifying this file directly might be a bad idea.
+// You should edit the code generator tools/ucm2cp.c instead for your changes
+// to appear in all relevant classes.
 namespace I18N.West
 {
 
@@ -86,18 +89,63 @@ public class CP10000 : ByteEncoding
 		'\u00B8', '\u02DD', '\u02DB', '\u02C7', 
 	};
 
+	// Get the number of bytes needed to encode a character buffer.
+	public unsafe override int GetByteCountImpl (char* chars, int count)
+	{
+		if (this.EncoderFallback != null)		{
+			//Calculate byte count by actually doing encoding and discarding the data.
+			return GetBytesImpl(chars, count, null, 0);
+		}
+		else
+		
+		{
+			return count;
+		}
+	}
+	
+	// Get the number of bytes needed to encode a character buffer.
+	public override int GetByteCount (String s)
+	{
+		if (this.EncoderFallback != null)
+		{
+			//Calculate byte count by actually doing encoding and discarding the data.
+			unsafe
+			{
+				fixed (char *s_ptr = s)
+				{
+					return GetBytesImpl(s_ptr, s.Length, null, 0);
+				}
+			}
+		}
+		else
+		{
+			//byte count equals character count because no EncoderFallback set
+			return s.Length;
+		}
+	}
+	
+	//ToBytes is just an alias for GetBytesImpl, but doesn't return byte count
 	protected unsafe override void ToBytes(char* chars, int charCount,
 	                                byte* bytes, int byteCount)
+	{
+		//Calling ToBytes with null destination buffer doesn't make any sense
+		if (bytes == null)
+			throw new ArgumentNullException("bytes");
+		GetBytesImpl(chars, charCount, bytes, byteCount);
+	}
+	
+	public unsafe override int GetBytesImpl (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)
+		while (charCount > 0)
 		{
-			ch = (int)(chars[charIndex++]);
+			ch = (int)(chars[charIndex]);
+			charIndex++;
+			charCount--;
 			if(ch >= 128) switch(ch)
 			{
 				case 0x00A2:
@@ -235,20 +283,24 @@ public class CP10000 : ByteEncoding
 				default:
 				{
 					if(ch >= 0xFF01 && ch <= 0xFF5E)
+					{
 						ch -= 0xFEE0;
+					}
 					else
-#if NET_2_0
-					HandleFallback (ref buffer, chars, ref charIndex, ref charCount, bytes, ref byteIndex, ref byteCount);
-#else
-						ch = 0x3F;
-#endif
+					{
+						HandleFallback (ref buffer, chars, ref charIndex, ref charCount, bytes, ref byteIndex, ref byteCount);
+						continue;
+					}
 				}
 				break;
 			}
-			bytes[byteIndex++] = (byte)ch;
-			--charCount;
-			--byteCount;
+			//Write encoded byte to buffer, if buffer is defined and fallback was not used
+			if (bytes != null)
+				bytes[byteIndex] = (byte)ch;
+			byteIndex++;
+			byteCount--;
 		}
+		return byteIndex;
 	}
 
 	/*
@@ -396,9 +448,13 @@ public class CP10000 : ByteEncoding
 				default:
 				{
 					if(ch >= 0xFF01 && ch <= 0xFF5E)
+					{
 						ch -= 0xFEE0;
+					}
 					else
+					{
 						ch = 0x3F;
+					}
 				}
 				break;
 			}