commit 8b57600a1cc9ed5e3917512f3f50ab35f9f8a009
Author: Richard Heck <[email protected]>
Date: Mon Oct 27 10:41:44 2014 -0400
Fix warnings.
diff --git a/src/Row.cpp b/src/Row.cpp
index d1f589c..7052aa0 100644
--- a/src/Row.cpp
+++ b/src/Row.cpp
@@ -383,7 +383,7 @@ void Row::shortenIfNeeded(pos_type const keep, int const w)
// We have found a suitable separator. This is the
// common case.
end_ = last_sep->endpos;
- dim_.wid = last_width;
+ dim_.wid = int(last_width);
elements_.erase(last_sep, end);
return;
}
@@ -405,7 +405,7 @@ void Row::shortenIfNeeded(pos_type const keep, int const w)
// There is no separator, but several elements (probably
// insets) have been added. We can cut at this place.
end_ = cit->pos;
- dim_.wid = wid;
+ dim_.wid = int(wid);
elements_.erase(cit, end);
return;
}
diff --git a/src/TextMetrics.cpp b/src/TextMetrics.cpp
index 6c3126b..ce31435 100644
--- a/src/TextMetrics.cpp
+++ b/src/TextMetrics.cpp
@@ -804,7 +804,7 @@ void TextMetrics::breakRow(Row & row, int const
right_margin, pit_type const pit
row.clear();
// This make get changed in computeRowMetrics depending on RTL
row.x = leftMargin(max_width_, pit, pos);
- row.dimension().wid = row.x;
+ row.dimension().wid = int(row.x);
row.right_margin = right_margin;
if (pos >= end || row.width() > width) {