From 0f85e2c60c4406eaddc7a96d8ddcc05d36d458f2 Mon Sep 17 00:00:00 2001 From: Martin Owens Date: Wed, 18 Sep 2013 14:46:36 -0400 Subject: Remove setItemBounds and _item_bbox because aren't sensible, replace with bbox. Fixed bugs: - https://launchpad.net/bugs/243729 (bzr r12528) --- src/libnrtype/Layout-TNG-Output.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'src/libnrtype') diff --git a/src/libnrtype/Layout-TNG-Output.cpp b/src/libnrtype/Layout-TNG-Output.cpp index f7f910c2f..9967ba149 100644 --- a/src/libnrtype/Layout-TNG-Output.cpp +++ b/src/libnrtype/Layout-TNG-Output.cpp @@ -181,7 +181,6 @@ void Layout::show(DrawingGroup *in_arena, Geom::OptRect const &paintbox) const glyph_index++; } nr_text->setStyle(text_source->style); - nr_text->setItemBounds(paintbox); in_arena->prependChild(nr_text); } } -- cgit v1.2.3 From ddd3d527a7845b8e9d51db00847d1242ce3571cc Mon Sep 17 00:00:00 2001 From: Martin Owens Date: Wed, 18 Sep 2013 14:59:42 -0400 Subject: Merge in David Mathog (mathog) patch for bug #1224486 Fixed bugs: - https://launchpad.net/bugs/1224486 (bzr r12529) --- src/libnrtype/Layout-TNG-Compute.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/libnrtype') diff --git a/src/libnrtype/Layout-TNG-Compute.cpp b/src/libnrtype/Layout-TNG-Compute.cpp index 1b2704a7e..7ea089c93 100644 --- a/src/libnrtype/Layout-TNG-Compute.cpp +++ b/src/libnrtype/Layout-TNG-Compute.cpp @@ -706,7 +706,7 @@ static void dumpUnbrokenSpans(ParagraphInfo *para){ if (newcluster){ // find where the text ends for this log_cluster end_byte = it_span->start.iter_span->text_bytes; // Upper limit - for(unsigned next_glyph_index = glyph_index+1; next_glyph_index < it_span->end_glyph_index; next_glyph_index++){ + for(int next_glyph_index = glyph_index+1; next_glyph_index < unbroken_span.glyph_string->num_glyphs; next_glyph_index++){ if(unbroken_span.glyph_string->glyphs[next_glyph_index].attr.is_cluster_start){ end_byte = unbroken_span.glyph_string->log_clusters[next_glyph_index]; break; -- cgit v1.2.3 From 23b4c7fcb81ee195acb9bfd470723728f89bfc4a Mon Sep 17 00:00:00 2001 From: Martin Owens Date: Thu, 19 Sep 2013 08:35:32 -0400 Subject: Revert some agressive changes and allow a seperate filter bbox for FER, should be refactored at some point. (bzr r12536) --- src/libnrtype/Layout-TNG-Output.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src/libnrtype') diff --git a/src/libnrtype/Layout-TNG-Output.cpp b/src/libnrtype/Layout-TNG-Output.cpp index 9967ba149..f7f910c2f 100644 --- a/src/libnrtype/Layout-TNG-Output.cpp +++ b/src/libnrtype/Layout-TNG-Output.cpp @@ -181,6 +181,7 @@ void Layout::show(DrawingGroup *in_arena, Geom::OptRect const &paintbox) const glyph_index++; } nr_text->setStyle(text_source->style); + nr_text->setItemBounds(paintbox); in_arena->prependChild(nr_text); } } -- cgit v1.2.3