Author: spouliot
Date: 2006-11-10 09:05:41 -0500 (Fri, 10 Nov 2006)
New Revision: 67666

Modified:
   trunk/libgdiplus/src/ChangeLog
   trunk/libgdiplus/src/general.c
   trunk/libgdiplus/src/graphics.c
Log:
2006-11-10  Sebastien Pouliot  <[EMAIL PROTECTED]>

        * general.c: Fix utf8_to_ucs2 to process all the first 65536 chars
        (not just the first 4096). Patch by [EMAIL PROTECTED]
        * graphics.c: When measuring a string and if data is provided, 
        initialize data->has_hotkeys to FALSE.



Modified: trunk/libgdiplus/src/ChangeLog
===================================================================
--- trunk/libgdiplus/src/ChangeLog      2006-11-10 10:28:24 UTC (rev 67665)
+++ trunk/libgdiplus/src/ChangeLog      2006-11-10 14:05:41 UTC (rev 67666)
@@ -1,3 +1,10 @@
+2006-11-10  Sebastien Pouliot  <[EMAIL PROTECTED]>
+
+       * general.c: Fix utf8_to_ucs2 to process all the first 65536 chars
+       (not just the first 4096). Patch by [EMAIL PROTECTED]
+       * graphics.c: When measuring a string and if data is provided, 
+       initialize data->has_hotkeys to FALSE.
+
 2006-10-20  Sebastien Pouliot  <[EMAIL PROTECTED]>
 
        * general.c: Don't delete the font cache hash table unless it was 

Modified: trunk/libgdiplus/src/general.c
===================================================================
--- trunk/libgdiplus/src/general.c      2006-11-10 10:28:24 UTC (rev 67665)
+++ trunk/libgdiplus/src/general.c      2006-11-10 14:05:41 UTC (rev 67666)
@@ -494,7 +494,7 @@
 
        ptr = (gunichar2 *)ucs2;
        for (i = 0; (i < count) && (i < ucs2_len); i++) {
-               if (ucs4[i] < 0x1000 && !(ucs4[i] >= 0xd800 && ucs4[i] < 
0xe000)) {
+               if (ucs4[i] < 0x10000 && !(ucs4[i] >= 0xd800 && ucs4[i] < 
0xe000)) {
                        *ptr = (gunichar2)ucs4[i];
                        ptr++;
                }       /* we're simply ignoring any chars that don't fit into 
ucs2 */

Modified: trunk/libgdiplus/src/graphics.c
===================================================================
--- trunk/libgdiplus/src/graphics.c     2006-11-10 10:28:24 UTC (rev 67665)
+++ trunk/libgdiplus/src/graphics.c     2006-11-10 14:05:41 UTC (rev 67666)
@@ -2154,6 +2154,8 @@
 
        /* Prepare our various buffers and variables */
        StringLen = *length;
+       if (data)
+               data->has_hotkeys = FALSE;
 
        /*
          Set aliasing mode

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to