diff options
| author | gahr <gahr@FreeBSD.org> | 2015-01-03 02:43:29 +0800 |
|---|---|---|
| committer | gahr <gahr@FreeBSD.org> | 2015-01-03 02:43:29 +0800 |
| commit | 78907b6e20427d90823fc91ba78230400ca7ed67 (patch) | |
| tree | f8a5a68073a95c55ae391305b66e873f56133c26 /math | |
| parent | 105693d0139b0803b3cd9ab36b754a253ba9b37c (diff) | |
| download | freebsd-ports-gnome-78907b6e20427d90823fc91ba78230400ca7ed67.tar.gz freebsd-ports-gnome-78907b6e20427d90823fc91ba78230400ca7ed67.tar.zst freebsd-ports-gnome-78907b6e20427d90823fc91ba78230400ca7ed67.zip | |
- Unbreak
Diffstat (limited to 'math')
| -rw-r--r-- | math/vtk6/Makefile | 2 | ||||
| -rw-r--r-- | math/vtk6/files/patch-Rendering-FreeType_vtkFreeTypeTools.cxx | 28 |
2 files changed, 28 insertions, 2 deletions
diff --git a/math/vtk6/Makefile b/math/vtk6/Makefile index af1ad5f9e6ec..dce565dc5c83 100644 --- a/math/vtk6/Makefile +++ b/math/vtk6/Makefile @@ -14,8 +14,6 @@ COMMENT= The Visualization Toolkit LICENSE= BSD3CLAUSE -BROKEN= Fails to build - LIB_DEPENDS= libtiff.so:${PORTSDIR}/graphics/tiff \ libpng.so:${PORTSDIR}/graphics/png \ libjpeg.so:${PORTSDIR}/graphics/jpeg \ diff --git a/math/vtk6/files/patch-Rendering-FreeType_vtkFreeTypeTools.cxx b/math/vtk6/files/patch-Rendering-FreeType_vtkFreeTypeTools.cxx new file mode 100644 index 000000000000..a6177c9a6f8e --- /dev/null +++ b/math/vtk6/files/patch-Rendering-FreeType_vtkFreeTypeTools.cxx @@ -0,0 +1,28 @@ +--- Rendering/FreeType/vtkFreeTypeTools.cxx.orig 2015-01-02 17:05:19.000000000 +0000 ++++ Rendering/FreeType/vtkFreeTypeTools.cxx 2015-01-02 17:05:26.000000000 +0000 +@@ -1185,8 +1185,8 @@ + bitmapGlyph); + if (bitmap) + { +- metaData.ascent = std::max(bitmapGlyph->top - 1, metaData.ascent); +- metaData.descent = std::min(-(bitmap->rows - (bitmapGlyph->top - 1)), ++ metaData.ascent = std::max<int>(bitmapGlyph->top - 1, metaData.ascent); ++ metaData.descent = std::min<int>(-(bitmap->rows - (bitmapGlyph->top - 1)), + metaData.descent); + } + ++heightString; +@@ -1950,10 +1950,10 @@ + fontSize, gindex, bitmapGlyph); + if (bitmap) + { +- bbox[0] = std::min(bbox[0], pen[0] + bitmapGlyph->left); +- bbox[1] = std::max(bbox[1], pen[0] + bitmapGlyph->left + bitmap->width); +- bbox[2] = std::min(bbox[2], pen[1] + bitmapGlyph->top - 1 - bitmap->rows); +- bbox[3] = std::max(bbox[3], pen[1] + bitmapGlyph->top - 1); ++ bbox[0] = std::min<int>(bbox[0], pen[0] + bitmapGlyph->left); ++ bbox[1] = std::max<int>(bbox[1], pen[0] + bitmapGlyph->left + bitmap->width); ++ bbox[2] = std::min<int>(bbox[2], pen[1] + bitmapGlyph->top - 1 - bitmap->rows); ++ bbox[3] = std::max<int>(bbox[3], pen[1] + bitmapGlyph->top - 1); + } + else + { |