pango r2575 - in branches/pango-1-18: . modules/basic

[tml svn gnome org]

Author: tml
Date: Mon Feb 25 01:31:52 2008
New Revision: 2575
URL: http://svn.gnome.org/viewvc/pango?rev=2575&view=rev

Log:
2008-02-25  Tor Lillqvist  <tml novell com>

	Bug 515484 -- Uniscribe interface handles surrogate
	pairs incorrectly

	* modules/basic/basic-win32.c (itemize_shape_and_place): Pass
	correctly offset wchar string to set_up_pango_log_clusters() so
	that when it passes the string on to unichar_index(), that
	function notices the surrogate pairs correctly.



Modified:
   branches/pango-1-18/ChangeLog
   branches/pango-1-18/modules/basic/basic-win32.c

Modified: branches/pango-1-18/modules/basic/basic-win32.c
==============================================================================
--- branches/pango-1-18/modules/basic/basic-win32.c	(original)
+++ branches/pango-1-18/modules/basic/basic-win32.c	Mon Feb 25 01:31:52 2008
@@ -367,7 +367,7 @@
 
 static int
 unichar_index (wchar_t *wtext,
-				int      ix)
+	       int      ix)
 {
   int i, index;
 
@@ -606,7 +606,7 @@
       ng = glyphs->num_glyphs;
       pango_glyph_string_set_size (glyphs, ng + nglyphs);
 
-      set_up_pango_log_clusters (wtext,
+      set_up_pango_log_clusters (wtext + items[item].iCharPos,
 				 items[item].a.fRTL, itemlen, log_clusters,
 				 nglyphs, glyphs->log_clusters + ng,
 				 char_offset);