From 6b309e851de24a78696c6ea639d6613473ab4493 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sep 19 2015 22:15:43 +0000 Subject: Update to 4.4.0 - Drop type, netcdf, and topological-sort-cmake patches applied upstream - Use system eigen3, python-pygments, python-six (bug #1251289) --- diff --git a/.gitignore b/.gitignore index aa5b076..f1f486d 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ ParaView-3.8.1.tar.gz /ParaView-v4.2.0-RC1-source.tar.gz /ParaView-v4.2.0-source.tar.gz /ParaView-v4.3.1-source.tar.gz +/ParaView-v4.4.0-source.tar.gz diff --git a/paraview-eigen.patch b/paraview-eigen.patch new file mode 100644 index 0000000..35a3a03 --- /dev/null +++ b/paraview-eigen.patch @@ -0,0 +1,16 @@ +diff -up ParaView-v4.4.0-source/Plugins/SciberQuestToolKit/SciberQuest/EigenConfig.cmake.eigen ParaView-v4.4.0-source/Plugins/SciberQuestToolKit/SciberQuest/EigenConfig.cmake +--- ParaView-v4.4.0-source/Plugins/SciberQuestToolKit/SciberQuest/EigenConfig.cmake.eigen 2015-09-11 11:58:50.000000000 -0600 ++++ ParaView-v4.4.0-source/Plugins/SciberQuestToolKit/SciberQuest/EigenConfig.cmake 2015-09-14 21:29:43.961849741 -0600 +@@ -5,12 +5,6 @@ + # + # Copyright 2012 SciberQuest Inc. + # +-set(Eigen_DIR +- ${SciberQuestToolKit_SOURCE_DIR}/eigen-3.0.3/eigen-eigen-3.0.3 +- CACHE FILEPATH +- "Path to Eigen install.") +-mark_as_advanced(Eigen_DIR) +- + if (NOT EXISTS ${Eigen_DIR}) + message(FATAL_ERROR + "SQTK Set Eigen_DIR to the path to your Eigen install." ) diff --git a/paraview-headers.patch b/paraview-headers.patch index f7f8b96..1ec4ff9 100644 --- a/paraview-headers.patch +++ b/paraview-headers.patch @@ -1,35 +1,9 @@ -diff -up ParaView-v4.3.1-source/ParaViewCore/ServerImplementation/Core/CMakeLists.txt.headers ParaView-v4.3.1-source/ParaViewCore/ServerImplementation/Core/CMakeLists.txt ---- ParaView-v4.3.1-source/ParaViewCore/ServerImplementation/Core/CMakeLists.txt.headers 2015-01-14 06:07:33.000000000 -0700 -+++ ParaView-v4.3.1-source/ParaViewCore/ServerImplementation/Core/CMakeLists.txt 2015-01-27 21:01:32.091794869 -0700 -@@ -77,7 +77,8 @@ set_source_files_properties( - set (${vtk-module}_HDRS - ${CMAKE_CURRENT_SOURCE_DIR}/vtkSMMessageMinimal.h - ${CMAKE_CURRENT_BINARY_DIR}/vtkPVMessage.pb.h -- ) -+ ${CMAKE_CURRENT_SOURCE_DIR}/vtkSIVectorPropertyTemplate.h -+) - - #------------------------------------------------------------------------------ - # Generate the protbuf message file. -diff -up ParaView-v4.3.1-source/ParaViewCore/VTKExtensions/Default/CMakeLists.txt.headers ParaView-v4.3.1-source/ParaViewCore/VTKExtensions/Default/CMakeLists.txt ---- ParaView-v4.3.1-source/ParaViewCore/VTKExtensions/Default/CMakeLists.txt.headers 2015-01-27 21:01:32.091794869 -0700 -+++ ParaView-v4.3.1-source/ParaViewCore/VTKExtensions/Default/CMakeLists.txt 2015-01-27 21:03:01.775623639 -0700 -@@ -147,6 +147,11 @@ if ("${VTK_RENDERING_BACKEND}" STREQUAL - ) - endif() - -+# Add header-only files so they get installed correctly. -+set (${vtk-module}_HDRS -+ vtkMaterialInterfaceIdListItem.h -+) -+ - set_source_files_properties( - vtkAMRDualGridHelper - vtkMaterialInterfaceCommBuffer -diff -up ParaView-v4.3.1-source/VTK/IO/Exodus/CMakeLists.txt.headers ParaView-v4.3.1-source/VTK/IO/Exodus/CMakeLists.txt ---- ParaView-v4.3.1-source/VTK/IO/Exodus/CMakeLists.txt.headers 2015-01-14 06:08:04.000000000 -0700 -+++ ParaView-v4.3.1-source/VTK/IO/Exodus/CMakeLists.txt 2015-01-27 21:01:32.091794869 -0700 -@@ -23,6 +23,7 @@ set_source_files_properties( +diff -up ParaView-v4.4.0-source/ParaViewCore/ServerImplementation/Core/CMakeLists.txt.headers ParaView-v4.4.0-source/ParaViewCore/ServerImplementation/Core/CMakeLists.txt +diff -up ParaView-v4.4.0-source/ParaViewCore/VTKExtensions/Default/CMakeLists.txt.headers ParaView-v4.4.0-source/ParaViewCore/VTKExtensions/Default/CMakeLists.txt +diff -up ParaView-v4.4.0-source/VTK/IO/Exodus/CMakeLists.txt.headers ParaView-v4.4.0-source/VTK/IO/Exodus/CMakeLists.txt +--- ParaView-v4.4.0-source/VTK/IO/Exodus/CMakeLists.txt.headers 2015-09-11 11:59:24.000000000 -0600 ++++ ParaView-v4.4.0-source/VTK/IO/Exodus/CMakeLists.txt 2015-09-14 21:09:58.470026261 -0600 +@@ -29,6 +29,7 @@ set_source_files_properties( set(vtkIOExodus_HDRS vtkCPExodusIINodalCoordinatesTemplate.h vtkCPExodusIIResultsArrayTemplate.h @@ -37,17 +11,4 @@ diff -up ParaView-v4.3.1-source/VTK/IO/Exodus/CMakeLists.txt.headers ParaView-v4 ) -diff -up ParaView-v4.3.1-source/VTK/IO/Import/CMakeLists.txt.headers ParaView-v4.3.1-source/VTK/IO/Import/CMakeLists.txt ---- ParaView-v4.3.1-source/VTK/IO/Import/CMakeLists.txt.headers 2015-01-14 06:08:04.000000000 -0700 -+++ ParaView-v4.3.1-source/VTK/IO/Import/CMakeLists.txt 2015-01-27 21:01:32.092794890 -0700 -@@ -4,6 +4,10 @@ set(Module_SRCS - vtkVRMLImporter.cxx - ) - -+set (${vtk-module}_HDRS -+ ${CMAKE_CURRENT_SOURCE_DIR}/vtk3DS.h -+) -+ - set_source_files_properties( - vtkImporter - ABSTRACT +diff -up ParaView-v4.4.0-source/VTK/IO/Import/CMakeLists.txt.headers ParaView-v4.4.0-source/VTK/IO/Import/CMakeLists.txt diff --git a/paraview-jsoncpp.patch b/paraview-jsoncpp.patch index 81ea638..c6c4136 100644 --- a/paraview-jsoncpp.patch +++ b/paraview-jsoncpp.patch @@ -1,7 +1,7 @@ -diff -up ParaView-v4.3.1-source/ParaViewCore/ServerManager/Core/vtkSMSettings.cxx.jsoncpp ParaView-v4.3.1-source/ParaViewCore/ServerManager/Core/vtkSMSettings.cxx ---- ParaView-v4.3.1-source/ParaViewCore/ServerManager/Core/vtkSMSettings.cxx.jsoncpp 2015-01-14 06:07:33.000000000 -0700 -+++ ParaView-v4.3.1-source/ParaViewCore/ServerManager/Core/vtkSMSettings.cxx 2015-09-17 16:00:02.167580486 -0600 -@@ -147,7 +147,7 @@ public: +diff -up ParaView-v4.4.0-source/ParaViewCore/ServerManager/Core/vtkSMSettings.cxx.jsoncpp ParaView-v4.4.0-source/ParaViewCore/ServerManager/Core/vtkSMSettings.cxx +--- ParaView-v4.4.0-source/ParaViewCore/ServerManager/Core/vtkSMSettings.cxx.jsoncpp 2015-09-11 11:58:50.000000000 -0600 ++++ ParaView-v4.4.0-source/ParaViewCore/ServerManager/Core/vtkSMSettings.cxx 2015-09-19 13:16:36.369348728 -0600 +@@ -146,7 +146,7 @@ public: } } @@ -10,7 +10,7 @@ diff -up ParaView-v4.3.1-source/ParaViewCore/ServerManager/Core/vtkSMSettings.cx } //---------------------------------------------------------------------------- -@@ -174,7 +174,7 @@ public: +@@ -170,7 +170,7 @@ public: } } @@ -19,7 +19,7 @@ diff -up ParaView-v4.3.1-source/ParaViewCore/ServerManager/Core/vtkSMSettings.cx } //---------------------------------------------------------------------------- -@@ -481,7 +481,7 @@ public: +@@ -473,7 +473,7 @@ public: Json::Path settingPath(root.c_str()); Json::Value & jsonValue = settingPath.make(this->SettingCollections[0].Value); @@ -28,9 +28,63 @@ diff -up ParaView-v4.3.1-source/ParaViewCore/ServerManager/Core/vtkSMSettings.cx if (values.size() > 1) { -diff -up ParaView-v4.3.1-source/ParaViewCore/VTKExtensions/CosmoTools/vtkPMultiResolutionGenericIOReader.cxx.jsoncpp ParaView-v4.3.1-source/ParaViewCore/VTKExtensions/CosmoTools/vtkPMultiResolutionGenericIOReader.cxx ---- ParaView-v4.3.1-source/ParaViewCore/VTKExtensions/CosmoTools/vtkPMultiResolutionGenericIOReader.cxx.jsoncpp 2015-01-14 06:07:33.000000000 -0700 -+++ ParaView-v4.3.1-source/ParaViewCore/VTKExtensions/CosmoTools/vtkPMultiResolutionGenericIOReader.cxx 2015-09-17 15:59:30.059015745 -0600 +@@ -510,7 +510,7 @@ public: + if (jsonValue.isArray()) + { + // Reset to null so that we aren't setting a value on a Json::Value array +- jsonValue = Json::Value::null; ++ jsonValue = Json::Value::nullRef; + this->Modified(); + } + +@@ -525,7 +525,7 @@ public: + if (!jsonValue.isArray() && !jsonValue.isNull()) + { + // Reset to null so that the jsonValue.resize() operation works +- jsonValue = Json::Value::null; ++ jsonValue = Json::Value::nullRef; + this->Modified(); + } + +@@ -554,7 +554,7 @@ public: + if (jsonValue.isArray()) + { + // Reset to null so that we aren't setting a value on a Json::Value array +- jsonValue = Json::Value::null; ++ jsonValue = Json::Value::nullRef; + this->Modified(); + } + +@@ -569,7 +569,7 @@ public: + if (!jsonValue.isArray() && !jsonValue.isNull()) + { + // Reset to null so that the jsonValue.resize() operation works +- jsonValue = Json::Value::null; ++ jsonValue = Json::Value::nullRef; + this->Modified(); + } + +@@ -598,7 +598,7 @@ public: + if (jsonValue.isArray()) + { + // Reset to null so that we aren't setting a value on a Json::Value array +- jsonValue = Json::Value::null; ++ jsonValue = Json::Value::nullRef; + this->Modified(); + } + +@@ -613,7 +613,7 @@ public: + if (!jsonValue.isArray() && !jsonValue.isNull()) + { + // Reset to null so that the jsonValue.resize() operation works +- jsonValue = Json::Value::null; ++ jsonValue = Json::Value::nullRef; + this->Modified(); + } + +diff -up ParaView-v4.4.0-source/ParaViewCore/VTKExtensions/CosmoTools/vtkPMultiResolutionGenericIOReader.cxx.jsoncpp ParaView-v4.4.0-source/ParaViewCore/VTKExtensions/CosmoTools/vtkPMultiResolutionGenericIOReader.cxx +--- ParaView-v4.4.0-source/ParaViewCore/VTKExtensions/CosmoTools/vtkPMultiResolutionGenericIOReader.cxx.jsoncpp 2015-09-11 11:58:50.000000000 -0600 ++++ ParaView-v4.4.0-source/ParaViewCore/VTKExtensions/CosmoTools/vtkPMultiResolutionGenericIOReader.cxx 2015-09-19 13:15:24.403093100 -0600 @@ -85,7 +85,7 @@ public: { JSON_READ_ERROR(); diff --git a/paraview-topological-sort-cmake.patch b/paraview-topological-sort-cmake.patch deleted file mode 100644 index 0c5ce0f..0000000 --- a/paraview-topological-sort-cmake.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -rupN ParaView-v4.1.0/VTK/CMake/vtkModuleTop.cmake ParaView-v4.1.0-new/VTK/CMake/vtkModuleTop.cmake ---- ParaView-v4.1.0/VTK/CMake/vtkModuleTop.cmake 2014-01-11 15:02:05.000000000 +0100 -+++ ParaView-v4.1.0-new/VTK/CMake/vtkModuleTop.cmake 2014-07-04 18:42:14.200209801 +0200 -@@ -330,6 +330,7 @@ if (NOT VTK_INSTALL_NO_DEVELOPMENT) - CMake/pythonmodules.h.in - CMake/UseVTK.cmake - CMake/FindTCL.cmake -+ CMake/TopologicalSort.cmake - CMake/vtkTclTkMacros.cmake - CMake/vtk-forward.c.in - CMake/vtkForwardingExecutable.cmake diff --git a/paraview.spec b/paraview.spec index 6c363aa..40d4c49 100644 --- a/paraview.spec +++ b/paraview.spec @@ -4,13 +4,11 @@ %{!?build_openmpi:%global build_openmpi 1} %{!?build_mpich:%global build_mpich 1} %global pv_maj 4 -%global pv_min 3 -%global pv_patch 1 +%global pv_min 4 +%global pv_patch 0 %global pv_majmin %{pv_maj}.%{pv_min} %global rcver %{nil} -%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} - # We need pugixml >= 1.4 %if 0%{?fedora} >= 22 %global system_pugixml 1 @@ -22,7 +20,7 @@ Name: paraview Version: %{pv_majmin}.%{pv_patch} -Release: 15%{?dist} +Release: 1%{?dist} Summary: Parallel visualization application Group: Applications/Engineering @@ -36,10 +34,9 @@ Patch0: paraview-desktop.patch # Protobuf 2.6.1 support # http://www.paraview.org/Bug/view.php?id=15442 Patch1: paraview-protobuf.patch -# http://www.vtk.org/Bug/view.php?id=15249 -Patch2: vtk-type.patch -# Patch to vtk to use system netcdf library -Patch3: vtk-6.1.0-netcdf.patch +# Unbundle eigen +# https://bugzilla.redhat.com/show_bug.cgi?id=1251289 +Patch2: paraview-eigen.patch # Patch to compile with jsoncpp 0.10 # http://www.paraview.org/Bug/view.php?id=15736 Patch4: paraview-jsoncpp.patch @@ -47,9 +44,6 @@ Patch4: paraview-jsoncpp.patch # https://bugzilla.redhat.com/show_bug.cgi?id=1100911 # http://www.vtk.org/Bug/view.php?id=14700 Patch5: paraview-headers.patch -# Install missing TopologicalSort.cmake -# https://bugzilla.redhat.com/show_bug.cgi?id=1116521 -Patch6: paraview-topological-sort-cmake.patch # Fix ParaViewPlugins.cmake # https://bugzilla.redhat.com/show_bug.cgi?id=1118520 # http://www.paraview.org/Bug/view.php?id=14878 @@ -86,6 +80,7 @@ BuildRequires: openssl-devel BuildRequires: gnuplot BuildRequires: wget BuildRequires: boost-devel +BuildRequires: eigen3-devel BuildRequires: gl2ps-devel >= 1.3.8 BuildRequires: hwloc-devel BuildRequires: jsoncpp-devel @@ -101,6 +96,8 @@ BuildRequires: pugixml-devel >= 1.4 Requires: hdf5 = %{_hdf5_version} Requires: %{name}-data = %{version}-%{release} Requires: %{name}-doc = %{version}-%{release} +Requires: python-pygments +Requires: python-six Obsoletes: paraview-demos < %{version}-%{release} Provides: paraview-demos = %{version}-%{release} Obsoletes: paraview-doc < %{version}-%{release} @@ -144,6 +141,7 @@ Provides: bundled(kwsys-systemtools) -DCMAKE_BUILD_TYPE=RelWithDebInfo \\\ -DCMAKE_CXX_COMPILER:FILEPATH=$CXX \\\ -DCMAKE_C_COMPILER:FILEPATH=$CC \\\ + -DEigen_DIR:FILEPATH=%{_includedir}/eigen3 \\\ -DTCL_LIBRARY:PATH=tcl \\\ -DTK_LIBRARY:PATH=tk \\\ -DPARAVIEW_BUILD_PLUGIN_AdiosReader:BOOL=ON \\\ @@ -171,7 +169,9 @@ Provides: bundled(kwsys-systemtools) -DVTK_USE_SYSTEM_NETCDF=ON \\\ -DVTK_USE_SYSTEM_PROTOBUF:BOOL=ON \\\ %{?vtk_use_system_pugixml} \\\ + -DVTK_USE_SYSTEM_PYGMENTS:BOOL=ON \\\ -DVTK_USE_SYSTEM_QTTESTING=OFF \\\ + -DVTK_USE_SYSTEM_SIX.PY:BOOL=ON \\\ -DVTK_USE_SYSTEM_TWISTED:BOOL=ON \\\ -DVTK_USE_SYSTEM_XDMF2=OFF \\\ -DVTK_USE_SYSTEM_ZOPE:BOOL=ON \\\ @@ -240,6 +240,8 @@ BuildArch: noarch Summary: Parallel visualization application Group: Applications/Engineering Requires: %{name}-data = %{version}-%{release} +Requires: python-pygments +Requires: python-six Obsoletes: %{name}-mpi < %{version}-%{release} Provides: %{name}-mpi = %{version}-%{release} @@ -265,6 +267,8 @@ developing applications that use %{name}-openmpi. Summary: Parallel visualization application Group: Applications/Engineering Requires: %{name}-data = %{version}-%{release} +Requires: python-pygments +Requires: python-six Provides: %{name}-mpich2 = %{version}-%{release} Obsoletes: %{name}-mpich2 < 3.98.1-6 @@ -292,16 +296,14 @@ developing applications that use %{name}-mpich. %setup -q -n ParaView-v%{version}%{rcver}-source %patch0 -p1 -b .desktop %patch1 -p1 -b .protobuf -%patch2 -p0 -b .type -%patch3 -p0 -b .netcdf +%patch2 -p1 -b .eigen %patch4 -p1 -b .jsoncpp %patch5 -p1 -b .headers -%patch6 -p1 -b .topological-sort-cmake %patch7 -p1 -b .plugin-env # Install python properly sed -i -s '/VTK_INSTALL_PYTHON_USING_CMAKE/s/TRUE/FALSE/' CMakeLists.txt #Remove included thirdparty sources just to be sure -for x in vtkprotobuf +for x in pygments vtkprotobuf do rm -r ThirdParty/*/${x} done @@ -312,6 +314,8 @@ for x in autobahn vtkexpat vtkfreetype vtkgl2ps vtkhdf5 vtkjpeg vtklibxml2 vtkmp do rm -r VTK/ThirdParty/*/${x} done +# Eigen +rm -r Plugins/SciberQuestToolKit/eigen-* # Remove unused KWSys items find VTK/Utilities/KWSys/vtksys/ -name \*.[ch]\* | grep -vE '^VTK/Utilities/KWSys/vtksys/([a-z].*|Configure|SharedForward|String\.hxx|Base64|CommandLineArguments|Directory|DynamicLoader|Encoding|FStream|FundamentalType|Glob|MD5|Process|RegularExpression|System|SystemInformation|SystemTools)(C|CXX|UNIX)?\.' | xargs rm # Work around gcc 4.9.0 regression @@ -428,7 +432,7 @@ make install DESTDIR=$RPM_BUILD_ROOT desktop-file-validate %{buildroot}%{_datadir}/applications/paraview.desktop #Cleanup only vtk conflicting binaries -rm $RPM_BUILD_ROOT%{_bindir}/vtk{EncodeString,HashSource,Parse{Java,OGLExt},Wrap{Hierarchy,Java,Python,Tcl}}* +rm $RPM_BUILD_ROOT%{_bindir}/vtk{EncodeString,HashSource,LegacyColorMapXMLToJSON,Parse{Java,OGLExt},Wrap{Hierarchy,Java,Python,Tcl}}* popd # Do not ship static libraries @@ -532,6 +536,11 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %changelog +* Fri Sep 18 2015 Orion Poplawski - 4.4.0-1 +- Update to 4.4.0 +- Drop type, netcdf, and topological-sort-cmake patches applied upstream +- Use system eigen3, python-pygments, python-six (bug #1251289) + * Thu Sep 17 2015 Orion Poplawski - 4.3.1-15 - Rebuild for openmpi 1.10.0 - Add patch for jsoncpp 0.10 support diff --git a/sources b/sources index 5512bd9..71ce4c2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d03d3ab504037edd21306413dff64293 ParaView-v4.3.1-source.tar.gz +fa1569857dd680ebb4d7ff89c2227378 ParaView-v4.4.0-source.tar.gz diff --git a/vtk-6.1.0-netcdf.patch b/vtk-6.1.0-netcdf.patch deleted file mode 100644 index e6f8b64..0000000 --- a/vtk-6.1.0-netcdf.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -up VTK/ThirdParty/netcdf/CMakeLists.txt.netcdf VTK/ThirdParty/netcdf/CMakeLists.txt ---- VTK/ThirdParty/netcdf/CMakeLists.txt.netcdf 2013-12-27 20:29:11.644289659 -0700 -+++ VTK/ThirdParty/netcdf/CMakeLists.txt 2013-12-27 20:33:48.071895769 -0700 -@@ -1,10 +1,18 @@ --vtk_module_third_party(NetCDF -- LIBRARIES vtkNetCDF vtkNetCDF_cxx -- INCLUDE_DIRS -- ${CMAKE_CURRENT_SOURCE_DIR}/vtknetcdf/include -- ${CMAKE_CURRENT_BINARY_DIR}/vtknetcdf -- COMPONENTS C CXX -- ) -+if(NOT VTK_USE_SYSTEM_NETCDF) -+ vtk_module_third_party(NetCDF -+ LIBRARIES vtkNetCDF vtkNetCDF_cxx -+ INCLUDE_DIRS -+ ${CMAKE_CURRENT_SOURCE_DIR}/vtknetcdf/include -+ ${CMAKE_CURRENT_BINARY_DIR}/vtknetcdf -+ COMPONENTS C CXX -+ ) -+else(NOT VTK_USE_SYSTEM_NETCDF) -+ vtk_module_third_party(NetCDF -+ LIBRARIES vtkNetCDF netcdf -+ COMPONENTS C CXX -+ ) -+endif() -+ - - #Configure the top cpp header to switch between system and internal - #netcdf just like vtk_module_third_party does for the c header. diff --git a/vtk-type.patch b/vtk-type.patch deleted file mode 100644 index 3c4140d..0000000 --- a/vtk-type.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -up VTK/Rendering/FreeType/vtkFreeTypeTools.cxx.type VTK-6.1.0/Rendering/FreeType/vtkFreeTypeTools.cxx ---- VTK/Rendering/FreeType/vtkFreeTypeTools.cxx.type 2014-01-22 08:55:41.000000000 -0700 -+++ VTK/Rendering/FreeType/vtkFreeTypeTools.cxx 2015-01-08 15:00:40.492667074 -0700 -@@ -1186,7 +1186,7 @@ bool vtkFreeTypeTools::CalculateBounding - if (bitmap) - { - metaData.ascent = std::max(bitmapGlyph->top - 1, metaData.ascent); -- metaData.descent = std::min(-(bitmap->rows - (bitmapGlyph->top - 1)), -+ metaData.descent = std::min(-(static_cast(bitmap->rows) - (bitmapGlyph->top - 1)), - metaData.descent); - } - ++heightString; -@@ -1951,8 +1951,8 @@ void vtkFreeTypeTools::GetLineMetrics(T - 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[1] = std::max(bbox[1], pen[0] + bitmapGlyph->left + static_cast(bitmap->width)); -+ bbox[2] = std::min(bbox[2], pen[1] + bitmapGlyph->top - 1 - static_cast(bitmap->rows)); - bbox[3] = std::max(bbox[3], pen[1] + bitmapGlyph->top - 1); - } - else