Orion Poplawski abd8754
diff -up VTK/Rendering/FreeType/vtkFreeTypeTools.cxx.type VTK-6.1.0/Rendering/FreeType/vtkFreeTypeTools.cxx
Orion Poplawski abd8754
--- VTK/Rendering/FreeType/vtkFreeTypeTools.cxx.type	2014-01-22 08:55:41.000000000 -0700
Orion Poplawski abd8754
+++ VTK/Rendering/FreeType/vtkFreeTypeTools.cxx	2015-01-08 15:00:40.492667074 -0700
Orion Poplawski abd8754
@@ -1186,7 +1186,7 @@ bool vtkFreeTypeTools::CalculateBounding
Orion Poplawski abd8754
     if (bitmap)
Orion Poplawski abd8754
       {
Orion Poplawski abd8754
       metaData.ascent = std::max(bitmapGlyph->top - 1, metaData.ascent);
Orion Poplawski abd8754
-      metaData.descent = std::min(-(bitmap->rows - (bitmapGlyph->top - 1)),
Orion Poplawski abd8754
+      metaData.descent = std::min(-(static_cast<int>(bitmap->rows) - (bitmapGlyph->top - 1)),
Orion Poplawski abd8754
                                   metaData.descent);
Orion Poplawski abd8754
       }
Orion Poplawski abd8754
     ++heightString;
Orion Poplawski abd8754
@@ -1951,8 +1951,8 @@ void vtkFreeTypeTools::GetLineMetrics(T
Orion Poplawski abd8754
     if (bitmap)
Orion Poplawski abd8754
       {
Orion Poplawski abd8754
       bbox[0] = std::min(bbox[0], pen[0] + bitmapGlyph->left);
Orion Poplawski abd8754
-      bbox[1] = std::max(bbox[1], pen[0] + bitmapGlyph->left + bitmap->width);
Orion Poplawski abd8754
-      bbox[2] = std::min(bbox[2], pen[1] + bitmapGlyph->top - 1 - bitmap->rows);
Orion Poplawski abd8754
+      bbox[1] = std::max(bbox[1], pen[0] + bitmapGlyph->left + static_cast<int>(bitmap->width));
Orion Poplawski abd8754
+      bbox[2] = std::min(bbox[2], pen[1] + bitmapGlyph->top - 1 - static_cast<int>(bitmap->rows));
Orion Poplawski abd8754
       bbox[3] = std::max(bbox[3], pen[1] + bitmapGlyph->top - 1);
Orion Poplawski abd8754
       }
Orion Poplawski abd8754
     else