Author: atsushi Date: 2006-01-14 22:49:32 -0500 (Sat, 14 Jan 2006) New Revision: 55594
Modified:
branches/mono-1-1-13/mcs/class/I18N/CJK/CP932.cs
branches/mono-1-1-13/mcs/class/I18N/CJK/ChangeLog
Log:
merged r55499 from trunk.
Modified: branches/mono-1-1-13/mcs/class/I18N/CJK/CP932.cs
===================================================================
--- branches/mono-1-1-13/mcs/class/I18N/CJK/CP932.cs 2006-01-15 03:46:54 UTC
(rev 55593)
+++ branches/mono-1-1-13/mcs/class/I18N/CJK/CP932.cs 2006-01-15 03:49:32 UTC
(rev 55594)
@@ -111,6 +111,9 @@
++length;
}
}
+ else if(ch >= 0xE000 && ch <= 0xE757)
+ // PrivateUse
+ ++length;
else if(ch >= 0xFF01 && ch <= 0xFFEF)
{
// This range contains extra
characters,
@@ -185,60 +188,60 @@
}
switch(ch)
{
- case 0x00A2:
-
bytes[posn++] = (byte)0x81;
-
bytes[posn++] = (byte)0x91;
- break;
+ case 0x00A2:
+ bytes[posn++] =
(byte)0x81;
+ bytes[posn++] =
(byte)0x91;
+ break;
- case 0x00A3:
-
bytes[posn++] = (byte)0x81;
-
bytes[posn++] = (byte)0x92;
- break;
+ case 0x00A3:
+ bytes[posn++] =
(byte)0x81;
+ bytes[posn++] =
(byte)0x92;
+ break;
- case 0x00A7:
-
bytes[posn++] = (byte)0x81;
-
bytes[posn++] = (byte)0x98;
- break;
+ case 0x00A7:
+ bytes[posn++] =
(byte)0x81;
+ bytes[posn++] =
(byte)0x98;
+ break;
- case 0x00A8:
-
bytes[posn++] = (byte)0x81;
-
bytes[posn++] = (byte)0x4E;
- break;
+ case 0x00A8:
+ bytes[posn++] =
(byte)0x81;
+ bytes[posn++] =
(byte)0x4E;
+ break;
- case 0x00AC:
-
bytes[posn++] = (byte)0x81;
-
bytes[posn++] = (byte)0xCA;
- break;
+ case 0x00AC:
+ bytes[posn++] =
(byte)0x81;
+ bytes[posn++] =
(byte)0xCA;
+ break;
- case 0x00B0:
-
bytes[posn++] = (byte)0x81;
-
bytes[posn++] = (byte)0x8B;
- break;
+ case 0x00B0:
+ bytes[posn++] =
(byte)0x81;
+ bytes[posn++] =
(byte)0x8B;
+ break;
- case 0x00B1:
-
bytes[posn++] = (byte)0x81;
-
bytes[posn++] = (byte)0x7D;
- break;
+ case 0x00B1:
+ bytes[posn++] =
(byte)0x81;
+ bytes[posn++] =
(byte)0x7D;
+ break;
- case 0x00B4:
-
bytes[posn++] = (byte)0x81;
-
bytes[posn++] = (byte)0x4C;
- break;
+ case 0x00B4:
+ bytes[posn++] =
(byte)0x81;
+ bytes[posn++] =
(byte)0x4C;
+ break;
- case 0x00B6:
-
bytes[posn++] = (byte)0x81;
-
bytes[posn++] = (byte)0xF7;
- break;
+ case 0x00B6:
+ bytes[posn++] =
(byte)0x81;
+ bytes[posn++] =
(byte)0xF7;
+ break;
- case 0x00D7:
-
bytes[posn++] = (byte)0x81;
-
bytes[posn++] = (byte)0x7E;
- break;
+ case 0x00D7:
+ bytes[posn++] =
(byte)0x81;
+ bytes[posn++] =
(byte)0x7E;
+ break;
- case 0x00F7:
-
bytes[posn++] = (byte)0x81;
-
bytes[posn++] = (byte)0x80;
- break;
+ case 0x00F7:
+ bytes[posn++] =
(byte)0x81;
+ bytes[posn++] =
(byte)0x80;
+ break;
}
}
else if(ch == 0x00A5)
Modified: branches/mono-1-1-13/mcs/class/I18N/CJK/ChangeLog
===================================================================
--- branches/mono-1-1-13/mcs/class/I18N/CJK/ChangeLog 2006-01-15 03:46:54 UTC
(rev 55593)
+++ branches/mono-1-1-13/mcs/class/I18N/CJK/ChangeLog 2006-01-15 03:49:32 UTC
(rev 55594)
@@ -1,3 +1,10 @@
+2006-01-13 Atsushi Enomoto <[EMAIL PROTECTED]>
+
+ * CP932.cs : GetByteCount() returned insufficient count at PrivateUse
+ area. Fixed bug #77724.
+
+ (Additionally, reduced extraneous indentation in switch-cases).
+
2006-01-12 Atsushi Enomoto <[EMAIL PROTECTED]>
* CP51932.cs : oops, another extra debugging code was remaining.
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
