Date: Fri, 2 Jan 2015 18:43:30 +0000 (UTC) From: Pietro Cerutti <gahr@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r376060 - in head/math/vtk6: . files Message-ID: <201501021843.t02IhUJC066998@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gahr Date: Fri Jan 2 18:43:29 2015 New Revision: 376060 URL: https://svnweb.freebsd.org/changeset/ports/376060 QAT: https://qat.redports.org/buildarchive/r376060/ Log: - Unbreak Added: head/math/vtk6/files/patch-Rendering-FreeType_vtkFreeTypeTools.cxx (contents, props changed) Modified: head/math/vtk6/Makefile Modified: head/math/vtk6/Makefile ============================================================================== --- head/math/vtk6/Makefile Fri Jan 2 18:38:36 2015 (r376059) +++ head/math/vtk6/Makefile Fri Jan 2 18:43:29 2015 (r376060) @@ -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 \ Added: head/math/vtk6/files/patch-Rendering-FreeType_vtkFreeTypeTools.cxx ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/vtk6/files/patch-Rendering-FreeType_vtkFreeTypeTools.cxx Fri Jan 2 18:43:29 2015 (r376060) @@ -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 + {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201501021843.t02IhUJC066998>