summaryrefslogtreecommitdiffstats
path: root/src/libnrtype
diff options
context:
space:
mode:
authorJon A. Cruz <jon@joncruz.org>2008-07-20 07:26:15 +0000
committerjoncruz <joncruz@users.sourceforge.net>2008-07-20 07:26:15 +0000
commitfcd25c00c332334cf431bc1f3a6102182ba86a50 (patch)
tree930589f15decb9d46faf07c4ddb8bc3d4df0fd1b /src/libnrtype
parentAdded set_int_pref stub to svg/test-stubs.cpp, unit tests build again on (diff)
downloadinkscape-fcd25c00c332334cf431bc1f3a6102182ba86a50.tar.gz
inkscape-fcd25c00c332334cf431bc1f3a6102182ba86a50.zip
Warning cleanup
(bzr r6367)
Diffstat (limited to 'src/libnrtype')
-rw-r--r--src/libnrtype/Layout-TNG-OutIter.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libnrtype/Layout-TNG-OutIter.cpp b/src/libnrtype/Layout-TNG-OutIter.cpp
index 7a45425c0..2471da3dd 100644
--- a/src/libnrtype/Layout-TNG-OutIter.cpp
+++ b/src/libnrtype/Layout-TNG-OutIter.cpp
@@ -703,7 +703,7 @@ bool Layout::iterator::nextLineCursor(int n)
if (line_index == _parent_layout->_lines.size() - 1)
return false; // nowhere to go
else
- n = MIN (n, _parent_layout->_lines.size() - 1 - line_index);
+ n = MIN (n, static_cast<int>(_parent_layout->_lines.size() - 1 - line_index));
if (_parent_layout->_lines[line_index + n].in_shape != _parent_layout->_lines[line_index].in_shape) {
// switching between shapes: adjust the stored x to compensate
_x_coordinate += _parent_layout->_chunks[_parent_layout->_spans[_parent_layout->_lineToSpan(line_index + n)].in_chunk].left_x
@@ -726,7 +726,7 @@ bool Layout::iterator::prevLineCursor(int n)
if (line_index == 0)
return false; // nowhere to go
else
- n = MIN (n, line_index);
+ n = MIN (n, static_cast<int>(line_index));
if (_parent_layout->_lines[line_index - n].in_shape != _parent_layout->_lines[line_index].in_shape) {
// switching between shapes: adjust the stored x to compensate
_x_coordinate += _parent_layout->_chunks[_parent_layout->_spans[_parent_layout->_lineToSpan(line_index - n)].in_chunk].left_x