[[ Bug 20482 ]] Ensure fix compiles

livecodeali · livecodeali · commit da7045daa319 · 2018-03-06T08:11:49.000Z
diff --git a/libgraphics/src/harfbuzztext.cpp b/libgraphics/src/harfbuzztext.cpp
@@ -314,7 +314,7 @@ static uindex_t shape_text_and_add_to_glyph_array(const unichar_t* p_text, uinde
         
         // Run of glyphs in successfully shaped clusters
         while (t_cur_glyph < glyph_count &&
-               cluster_is_supported(glyph_info, t_cur_glyph, glyph_count, &t_cluster_end))
+               cluster_is_supported(glyph_info, t_cur_glyph, glyph_count, t_cluster_end))
         {
             t_cur_glyph = t_cluster_end;
         }
@@ -330,22 +330,22 @@ static uindex_t shape_text_and_add_to_glyph_array(const unichar_t* p_text, uinde
         // If the first cluster is unsupported and we're already using the fallback
         // font for that cluster, assume there is no support and use a replacement.
         if (t_cur_glyph == 0 &&
-            !cluster_is_supported(glyph_info, t_cur_glyph, glyph_count, &t_cluster_end)
+            !cluster_is_supported(glyph_info, t_cur_glyph, glyph_count, t_cluster_end)
             && p_use_fallback)
         {
             // Enforce a replacement glyph for the whole cluster by passing a 0
             // codepoint and only adding a single glyph to the run
             glyph_info[t_cur_glyph].codepoint = 0;
             MCGlyphRunMake(glyph_info, glyph_pos, x_location, t_start, t_start + 1, (SkTypeface *)p_font . fid, p_font . size, t_run);
             x_runs . Push(t_run);
-            t_cur_glyph = t_cluster_end
+            t_cur_glyph = t_cluster_end;
             t_start = t_cur_glyph;
             t_run_count++;
         }
         
         // Deal with run of unsupported clusters for this font.
         while (t_cur_glyph < glyph_count &&
-               !cluster_is_supported(glyph_info, t_cur_glyph, glyph_count, &t_cluster_end))
+               !cluster_is_supported(glyph_info, t_cur_glyph, glyph_count, t_cluster_end))
         {
             t_cur_glyph = t_cluster_end;
         }

Original file line number	Diff line number	Diff line change
`@@ -314,7 +314,7 @@ static uindex_t shape_text_and_add_to_glyph_array(const unichar_t* p_text, uinde`
`314`	`314`
`315`	`315`	`// Run of glyphs in successfully shaped clusters`
`316`	`316`	`while (t_cur_glyph < glyph_count &&`
`317`		`- cluster_is_supported(glyph_info, t_cur_glyph, glyph_count, &t_cluster_end))`
	`317`	`+ cluster_is_supported(glyph_info, t_cur_glyph, glyph_count, t_cluster_end))`
`318`	`318`	`{`
`319`	`319`	`t_cur_glyph = t_cluster_end;`
`320`	`320`	`}`
`@@ -330,22 +330,22 @@ static uindex_t shape_text_and_add_to_glyph_array(const unichar_t* p_text, uinde`
`330`	`330`	`// If the first cluster is unsupported and we're already using the fallback`
`331`	`331`	`// font for that cluster, assume there is no support and use a replacement.`
`332`	`332`	`if (t_cur_glyph == 0 &&`
`333`		`- !cluster_is_supported(glyph_info, t_cur_glyph, glyph_count, &t_cluster_end)`
	`333`	`+ !cluster_is_supported(glyph_info, t_cur_glyph, glyph_count, t_cluster_end)`
`334`	`334`	`&& p_use_fallback)`
`335`	`335`	`{`
`336`	`336`	`// Enforce a replacement glyph for the whole cluster by passing a 0`
`337`	`337`	`// codepoint and only adding a single glyph to the run`
`338`	`338`	`glyph_info[t_cur_glyph].codepoint = 0;`
`339`	`339`	`MCGlyphRunMake(glyph_info, glyph_pos, x_location, t_start, t_start + 1, (SkTypeface *)p_font . fid, p_font . size, t_run);`
`340`	`340`	`x_runs . Push(t_run);`
`341`		`- t_cur_glyph = t_cluster_end`
	`341`	`+ t_cur_glyph = t_cluster_end;`
`342`	`342`	`t_start = t_cur_glyph;`
`343`	`343`	`t_run_count++;`
`344`	`344`	`}`
`345`	`345`
`346`	`346`	`// Deal with run of unsupported clusters for this font.`
`347`	`347`	`while (t_cur_glyph < glyph_count &&`
`348`		`- !cluster_is_supported(glyph_info, t_cur_glyph, glyph_count, &t_cluster_end))`
	`348`	`+ !cluster_is_supported(glyph_info, t_cur_glyph, glyph_count, t_cluster_end))`
`349`	`349`	`{`
`350`	`350`	`t_cur_glyph = t_cluster_end;`
`351`	`351`	`}`