diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2015-12-06 21:40:46 +0000 |
|---|---|---|
| committer | jabiertxof <jabier.arraiza@marker.es> | 2015-12-06 21:40:46 +0000 |
| commit | d82fe66f0d4845f1da3a0896efaa323f5c3e0cda (patch) | |
| tree | b00d3da4c502d45135068578253182ea8f6029ea /src | |
| parent | Fixes UX pointed in suv review (diff) | |
| parent | Remove leftover assert. (diff) | |
| download | inkscape-d82fe66f0d4845f1da3a0896efaa323f5c3e0cda.tar.gz inkscape-d82fe66f0d4845f1da3a0896efaa323f5c3e0cda.zip | |
update to trunk
(bzr r14500.1.10)
Diffstat (limited to 'src')
| -rw-r--r-- | src/libnrtype/Layout-TNG-Compute.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/libnrtype/Layout-TNG-Compute.cpp b/src/libnrtype/Layout-TNG-Compute.cpp index 6b2a6f622..1e8fb0fb1 100644 --- a/src/libnrtype/Layout-TNG-Compute.cpp +++ b/src/libnrtype/Layout-TNG-Compute.cpp @@ -1764,7 +1764,6 @@ bool Layout::Calculator::calculate() } while (span_pos.iter_span != para.unbroken_spans.end()); TRACE(("para %lu end\n\n", _flow._paragraphs.size() - 1)); - assert (_scanline_maker != NULL ); if (_scanline_maker != NULL) { bool is_empty_para = _flow._characters.empty() || _flow._characters.back().line(&_flow).in_paragraph != _flow._paragraphs.size() - 1; if ((is_empty_para && para_end_input_index + 1 >= _flow._input_stream.size()) |