+++ /dev/null
-From: Daniel Drake <dsd@gentoo.org>
-
-Index: OpenMesh/Core/IO/OMFormat.hh
-===================================================================
---- OpenMesh.orig/Core/IO/OMFormat.hh
-+++ OpenMesh/Core/IO/OMFormat.hh
-@@ -462,23 +462,6 @@ namespace OMFormat {
- typedef GenProg::False t_unsigned;
-
-
-- /// Store an integer with a wanted number of bits
-- template< typename T >
-- inline
-- size_t
-- store( std::ostream& _os,
-- const T& _val,
-- OMFormat::Chunk::Integer_Size _b,
-- bool _swap)
-- {
-- assert( OMFormat::is_integer( _val ) );
--
-- if ( OMFormat::is_signed( _val ) )
-- return store( _os, _val, _b, _swap, t_signed() );
-- return store( _os, _val, _b, _swap, t_unsigned() );
-- }
--
--
- // helper to store a an integer
- template< typename T >
- size_t
-@@ -497,24 +480,22 @@ namespace OMFormat {
- bool _swap,
- t_unsigned);
-
--
-- /// Restore an integer with a wanted number of bits
-+ /// Store an integer with a wanted number of bits
- template< typename T >
- inline
- size_t
-- restore( std::istream& _is,
-- T& _val,
-- OMFormat::Chunk::Integer_Size _b,
-- bool _swap)
-+ store( std::ostream& _os,
-+ const T& _val,
-+ OMFormat::Chunk::Integer_Size _b,
-+ bool _swap)
- {
- assert( OMFormat::is_integer( _val ) );
--
-+
- if ( OMFormat::is_signed( _val ) )
-- return restore( _is, _val, _b, _swap, t_signed() );
-- return restore( _is, _val, _b, _swap, t_unsigned() );
-+ return store( _os, _val, _b, _swap, t_signed() );
-+ return store( _os, _val, _b, _swap, t_unsigned() );
- }
-
--
- // helper to store a an integer
- template< typename T > inline
- size_t restore( std::istream& _is,
-@@ -530,18 +511,26 @@ namespace OMFormat {
- OMFormat::Chunk::Integer_Size _b,
- bool _swap,
- t_unsigned);
-- //
-- // ---------------------------------------- storing vectors
-
-- /// storing a vector type
-- template <typename VecT> inline
-- size_t vector_store( std::ostream& _os, const VecT& _vec, bool _swap )
-- {
-- return store( _os, _vec,
-- GenProg::Int2Type< vector_traits<VecT>::size_ >(),
-- _swap );
-+ /// Restore an integer with a wanted number of bits
-+ template< typename T >
-+ inline
-+ size_t
-+ restore( std::istream& _is,
-+ T& _val,
-+ OMFormat::Chunk::Integer_Size _b,
-+ bool _swap)
-+ {
-+ assert( OMFormat::is_integer( _val ) );
-+
-+ if ( OMFormat::is_signed( _val ) )
-+ return restore( _is, _val, _b, _swap, t_signed() );
-+ return restore( _is, _val, _b, _swap, t_unsigned() );
- }
-
-+ //
-+ // ---------------------------------------- storing vectors
-+
- template <typename VecT> inline
- size_t store( std::ostream& _os, const VecT& _vec, GenProg::Int2Type<1>,
- bool _swap )
-@@ -579,19 +568,17 @@ namespace OMFormat {
- return bytes;
- }
-
-- // ---------------------------------------- restoring vectors
--
-- /// Restoring a vector type
-- template <typename VecT>
-- inline
-- size_t
-- vector_restore( std::istream& _is, VecT& _vec, bool _swap )
-+ /// storing a vector type
-+ template <typename VecT> inline
-+ size_t vector_store( std::ostream& _os, const VecT& _vec, bool _swap )
- {
-- return restore( _is, _vec,
-- GenProg::Int2Type< vector_traits<VecT>::size_ >(),
-- _swap );
-+ return store( _os, _vec,
-+ GenProg::Int2Type< vector_traits<VecT>::size_ >(),
-+ _swap );
- }
-
-+ // ---------------------------------------- restoring vectors
-+
-
- template <typename VecT>
- inline
-@@ -644,6 +631,17 @@ namespace OMFormat {
- return bytes;
- }
-
-+ /// Restoring a vector type
-+ template <typename VecT>
-+ inline
-+ size_t
-+ vector_restore( std::istream& _is, VecT& _vec, bool _swap )
-+ {
-+ return restore( _is, _vec,
-+ GenProg::Int2Type< vector_traits<VecT>::size_ >(),
-+ _swap );
-+ }
-+
- // ---------------------------------------- storing property names
-
- template <>
+++ /dev/null
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-inherit eutils cmake-utils
-
-MY_PN="OpenMesh"
-MY_PV="${PV/_rc/-RC}"
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-
-DESCRIPTION="A generic and efficient data structure for representing and manipulating polygonal meshes"
-HOMEPAGE="http://www.openmesh.org/"
-SRC_URI="http://openmesh.org/fileadmin/${PN}-files/${MY_PV/-RC/RC}/${MY_PN}-${MY_PV}.tar.bz2"
-
-LICENSE="LGPL-3-with-linking-exception"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="qt4 static-libs"
-
-RDEPEND="qt4? ( dev-qt/qtgui:4
- dev-qt/qtopengl:4
- media-libs/freeglut )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
- # Fix libdir and remove rpath.
- sed -i \
- -e "s|\(set (ACG_PROJECT_LIBDIR \"\).*|\1$(get_libdir)/\")|" \
- -e "s|\(set (ACG_PROJECT_PLUGINDIR \"\)lib\(.*\)|\1$(get_libdir)\2|" \
- -e "s|\(BUILD_WITH_INSTALL_RPATH \)1|\1 0|" \
- -e "s|\(SKIP_BUILD_RPATH\) 0|\1 1|" \
- -e '/^ *INSTALL_RPATH/d' \
- cmake/ACGCommon.cmake || die
-
- if ! use static-libs; then
- sed -i "s|\(SHARED\)ANDSTATIC|\1|" \
- src/${MY_PN}/{Core,Tools}/CMakeLists.txt || die
- sed -i '/OpenMeshCoreStatic/d' \
- src/${MY_PN}/Tools/CMakeLists.txt || die
- fi
-}
-
-src_configure() {
- mycmakeargs="$(cmake-utils_use_build "qt4" "APPS")"
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
- dodoc LICENSE/* README CHANGELOG || die
-}
projects / gentoo.git / commitdiff