diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2014-03-01 15:28:39 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2014-03-01 15:28:39 +0000 |
| commit | efabd8330ec1bfda05e46c5315debc43e6dbca34 (patch) | |
| tree | ee0a4d3a0898beca0aa9345c71fb5c5c9a55d9a8 /src/libnrtype | |
| parent | Substitute isBSpline property by a cached function isBSpline(bool) (diff) | |
| parent | update po/POTFILES.in (add new INX file from r13080) (diff) | |
| download | inkscape-efabd8330ec1bfda05e46c5315debc43e6dbca34.tar.gz inkscape-efabd8330ec1bfda05e46c5315debc43e6dbca34.zip | |
update to trunk
(bzr r11950.1.262)
Diffstat (limited to 'src/libnrtype')
| -rw-r--r-- | src/libnrtype/Layout-TNG-OutIter.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libnrtype/Layout-TNG-OutIter.cpp b/src/libnrtype/Layout-TNG-OutIter.cpp index 8d8621d64..6dc42d998 100644 --- a/src/libnrtype/Layout-TNG-OutIter.cpp +++ b/src/libnrtype/Layout-TNG-OutIter.cpp @@ -181,9 +181,10 @@ Layout::iterator Layout::sourceToIterator(void *source_cookie /*, Glib::ustring: if (_input_stream[source_index]->Type() != TEXT_SOURCE) return iterator(this, char_index); - InputStreamTextSource const *text_source = static_cast<InputStreamTextSource const *>(_input_stream[source_index]); return iterator(this, char_index); /* This code was never used, the text_iterator argument was "NULL" in all calling code + InputStreamTextSource const *text_source = static_cast<InputStreamTextSource const *>(_input_stream[source_index]); + if (text_iterator <= text_source->text_begin) return iterator(this, char_index); if (text_iterator >= text_source->text_end) { if (source_index == _input_stream.size() - 1) return end(); |