From: <sil...@li...> - 2005-02-28 16:08:40
|
Update of /cvsroot/silgraphite/silgraphite/contrib/pangomod In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19799 Modified Files: pangographite.cpp Log Message: don't use NULL in call to GetUniscribeClusters Index: pangographite.cpp =================================================================== RCS file: /cvsroot/silgraphite/silgraphite/contrib/pangomod/pangographite.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- pangographite.cpp 24 Dec 2004 23:47:08 -0000 1.10 +++ pangographite.cpp 28 Feb 2005 16:08:30 -0000 1.11 @@ -126,6 +126,7 @@ int * prg1stCharInClust; int first_char_in_cluster, last_cluster_start = 0; int cluster_width = 0; + int cch, cf; //int * tmp; // find the length (in utf8 chars) of textsource @@ -144,8 +145,8 @@ pgrseg->GetUniscribeClusters(0, pgrfx, - prg1stOfCluster, n_chars, NULL, - pfClusterStart, n_glyphs, NULL); + prg1stOfCluster, n_chars, &cch, + pfClusterStart, n_glyphs, &cf); // BUG? single character strings prg1stOfCluster[0] = -1 // This isn't right though because it isn't guaranteed to be 0 @@ -243,11 +244,12 @@ glyphs->log_clusters[i] = g_utf8_offset_to_pointer(text, first_char_in_cluster) - text; #ifdef WDGDEBUG - g_message("glyph %d has lh%d lw%d lx%d ly%d xoff%d yoff%d wid%d", i, + g_message("glyph %d has lh%d lw%d lx%d ly%d xoff%d yoff%d wid%d logcl%d", i, logical_rect.height, logical_rect.width, logical_rect.x, logical_rect.y, glyphs->glyphs[i].geometry.x_offset, glyphs->glyphs[i].geometry.y_offset, - glyphs->glyphs[i].geometry.width); + glyphs->glyphs[i].geometry.width, + glyphs->log_clusters[i]); #endif |