mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-24 05:29:00 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[poissonrecon] Update to latest commit (#20357)

Browse Source
This commit is contained in:
Phoebe 2021-09-28 11:58:41 +08:00 committed by GitHub
parent 878d3514eb
commit 7878eba353
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 70 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ports/poissonrecon/CMakeLists.txt
View File

@ -30,13 +30,9 @@ set(PoissonRecon_HEADERS
"Src/Ply.h" "Src/Ply.h"
"Src/PlyFile.h" "Src/PlyFile.h"
"Src/PNG.h" "Src/PNG.h"
"Src/PointStream.h"
"Src/PointStreamData.h"
"Src/Polynomial.h" "Src/Polynomial.h"
"Src/PPolynomial.h" "Src/PPolynomial.h"
"Src/PreProcessor.h" "Src/PreProcessor.h"
#"Src/Rasterizer.h"
#"Src/RegularGrid.h"
"Src/RegularTree.h" "Src/RegularTree.h"
"Src/SparseMatrix.h" "Src/SparseMatrix.h"
"Src/SparseMatrixInterface.h" "Src/SparseMatrixInterface.h"
@ -61,11 +57,8 @@ set(PoissonRecon_INLINES
"Src/MAT.inl" "Src/MAT.inl"
"Src/PlyFile.inl" "Src/PlyFile.inl"
"Src/PNG.inl" "Src/PNG.inl"
"Src/PointStream.inl"
"Src/Polynomial.inl" "Src/Polynomial.inl"
"Src/PPolynomial.inl" "Src/PPolynomial.inl"
#"Src/Rasterizer.inl"
#"Src/RegularGrid.inl"
"Src/RegularTree.inl" "Src/RegularTree.inl"
"Src/SparseMatrix.inl" "Src/SparseMatrix.inl"
"Src/SparseMatrixInterface.inl" "Src/SparseMatrixInterface.inl"

134
ports/poissonrecon/disable-gcc5-checks.patch
View File

@ -1,87 +1,47 @@
diff --git a/Src/FEMTree.System.inl b/Src/FEMTree.System.inl diff --git a/Src/FEMTree.WeightedSamples.inl b/Src/FEMTree.WeightedSamples.inl
index ae554d4..87f0423 100644 index 7b0d6b4..bb3ad0f 100644
--- a/Src/FEMTree.System.inl --- a/Src/FEMTree.WeightedSamples.inl
+++ b/Src/FEMTree.System.inl +++ b/Src/FEMTree.WeightedSamples.inl
@@ -792,7 +792,7 @@ void FEMTree< Dim , Real >::_solveRegularMG( UIntPack< FEMSigs ... > , typename @@ -362,7 +362,7 @@ Real FEMTree< Dim , Real >::_splatPointData( Allocator< FEMTreeNode > *nodeAlloc
} // pow( width , -dim ): So that each sample is splatted with a unit volume
} V _v = v * weight / Real( pow( width , dim ) ) * dx;
// V _v = v / Length(v) * dx;
-#if defined( __GNUC__ ) && __GNUC__ < 5 -#if defined( __GNUC__ ) && __GNUC__ < 5
+#if defined( __GNUC__ ) && __GNUC__ < 5 && 0 +#if defined( __GNUC__ ) && __GNUC__ < 5 && 0
#warning "you've got me gcc version<5" #ifdef SHOW_WARNINGS
template< unsigned int Dim , class Real > #warning "you've got me gcc version<5"
template< unsigned int ... FEMSigs > #endif // SHOW_WARNINGS
@@ -1679,7 +1679,7 @@ SparseMatrix< Real , matrix_index_type > FEMTree< Dim , Real >::systemMatrix( UI diff --git a/Src/FEMTree.h b/Src/FEMTree.h
typename FEMTreeNode::template ConstNeighbors< OverlapSizes > neighbors; index 8f00045..2faa0f4 100644
neighborKey.getNeighbors( OverlapRadii() , OverlapRadii() , _sNodes.treeNodes[i] , neighbors ); --- a/Src/FEMTree.h
+++ b/Src/FEMTree.h
-#if defined( __GNUC__ ) && __GNUC__ < 5 @@ -231,6 +231,7 @@ template< class Data , typename Pack > struct _SparseOrDenseNodeData{};
+#if defined( __GNUC__ ) && __GNUC__ < 5 && 0 template< class Data , unsigned int ... FEMSigs >
#warning "you've got me gcc version<5" struct _SparseOrDenseNodeData< Data , UIntPack< FEMSigs ... > >
matrix.setRowSize( ii , _getMatrixRowSize( UIntPack< FEMSigs ... >() , neighbors ) ); {
#else // !__GNUC__ || __GNUC__ >=5 + virtual ~_SparseOrDenseNodeData() {}
diff --git a/Src/FEMTree.WeightedSamples.inl b/Src/FEMTree.WeightedSamples.inl static const unsigned int Dim = sizeof ... ( FEMSigs );
index b263dda..282387e 100644 typedef UIntPack< FEMSigs ... > FEMSignatures;
--- a/Src/FEMTree.WeightedSamples.inl typedef Data data_type;
+++ b/Src/FEMTree.WeightedSamples.inl diff --git a/Src/FEMTree.inl b/Src/FEMTree.inl
@@ -225,7 +225,7 @@ Real FEMTree< Dim , Real >::_splatPointData( Allocator< FEMTreeNode > *nodeAlloc index 814f1ae..405e996 100644
--- a/Src/FEMTree.inl
width = 1.0 / ( 1<<_localDepth( temp ) ); +++ b/Src/FEMTree.inl
_v = v * weight / Real( pow( width , dim ) ) * Real( dx ); @@ -425,7 +425,7 @@ SparseNodeData< OutData , UIntPack< DataSigs ... > > FEMTree< Dim , Real >::setI
-#if defined( __GNUC__ ) && __GNUC__ < 5 AddAtomic( weightSum , sample.weight );
+#if defined( __GNUC__ ) && __GNUC__ < 5 && 0 out *= sample.weight;
#warning "you've got me gcc version<5" Allocator< FEMTreeNode > *nodeAllocator = nodeAllocators.size() ? nodeAllocators[ thread ] : NULL;
_splatPointData< CreateNodes , ThreadSafe , V >( nodeAllocator , temp , position , _v , dataInfo , dataKey ); -#if defined( __GNUC__ ) && __GNUC__ < 5
#else // !__GNUC__ || __GNUC__ >=5 +#if defined( __GNUC__ ) && __GNUC__ < 5 && 0
@@ -238,7 +238,7 @@ Real FEMTree< Dim , Real >::_splatPointData( Allocator< FEMTreeNode > *nodeAlloc #ifdef SHOW_WARNINGS
width = 1.0 / ( 1<<_localDepth( temp ) ); #warning "you've got me gcc version<5"
#endif // SHOW_WARNINGS
_v = v * weight / Real( pow( width , dim ) ) * Real( dx ); @@ -436,7 +436,7 @@ SparseNodeData< OutData , UIntPack< DataSigs ... > > FEMTree< Dim , Real >::setI
-#if defined( __GNUC__ ) && __GNUC__ < 5 else
+#if defined( __GNUC__ ) && __GNUC__ < 5 && 0 {
#warning "you've got me gcc version<5" Real width = (Real)( 1.0 / ( 1<<maxDepth ) );
_splatPointData< CreateNodes , ThreadSafe , V >( nodeAllocator , temp , position , _v , dataInfo , dataKey ); -#if defined( __GNUC__ ) && __GNUC__ < 5
#else // !__GNUC__ || __GNUC__ >=5 +#if defined( __GNUC__ ) && __GNUC__ < 5 && 0
diff --git a/Src/FEMTree.h b/Src/FEMTree.h #ifdef SHOW_WARNINGS
index 8aa3b41..0be77a1 100644 #warning "you've got me gcc version<5"
--- a/Src/FEMTree.h #endif // SHOW_WARNINGS
+++ b/Src/FEMTree.h
@@ -219,6 +219,7 @@ template< class Data , typename Pack > struct _SparseOrDenseNodeData{};
template< class Data , unsigned int ... FEMSigs >
struct _SparseOrDenseNodeData< Data , UIntPack< FEMSigs ... > >
{
+ virtual ~_SparseOrDenseNodeData() {}
static const unsigned int Dim = sizeof ... ( FEMSigs );
typedef UIntPack< FEMSigs ... > FEMSignatures;
typedef Data data_type;
@@ -1841,7 +1842,7 @@ protected:
template< unsigned int ... FEMSigs >
int _getProlongedMatrixRowSize( const FEMTreeNode* node , const typename FEMTreeNode::template ConstNeighbors< UIntPack< BSplineOverlapSizes< FEMSignature< FEMSigs >::Degree >::OverlapSize ... > >& pNeighbors ) const;
-#if defined( __GNUC__ ) && __GNUC__ < 5
+#if defined( __GNUC__ ) && __GNUC__ < 5 && 0
#warning "you've got me gcc version<5"
template< unsigned int ... FEMSigs >
int _getMatrixRowSize( UIntPack< FEMSigs ... > , const typename FEMTreeNode::template ConstNeighbors< UIntPack< BSplineOverlapSizes< FEMSignature< FEMSigs >::Degree >::OverlapSize ... > >& neighbors ) const;
diff --git a/Src/FEMTree.inl b/Src/FEMTree.inl
index e4c2310..f88316b 100644
--- a/Src/FEMTree.inl
+++ b/Src/FEMTree.inl
@@ -374,7 +374,7 @@ SparseNodeData< OutData , UIntPack< DataSigs ... > > FEMTree< Dim , Real >::setD
AddAtomic( weightSum , sample.weight );
out *= sample.weight;
Allocator< FEMTreeNode > *nodeAllocator = nodeAllocators.size() ? nodeAllocators[ thread ] : NULL;
-#if defined( __GNUC__ ) && __GNUC__ < 5
+#if defined( __GNUC__ ) && __GNUC__ < 5 && 0
#warning "you've got me gcc version<5"
if( density ) AddAtomic( _pointWeightSum , _splatPointData< true , true , DensityDegree , OutData >( nodeAllocator , *density , p , out , dataField , densityKey , oneKey ? *( (DataKey*)&densityKey ) : dataKey , 0 , maxDepth , Dim , depthBias ) * sample.weight );
#else // !__GNUC__ || __GNUC__ >=5
@@ -383,7 +383,7 @@
else
{
Real width = (Real)( 1.0 / ( 1<<maxDepth ) );
-#if defined( __GNUC__ ) && __GNUC__ < 5
+#if defined( __GNUC__ ) && __GNUC__ < 5 && 0
#warning "you've got me gcc version<5"
_splatPointData< true , true , OutData >( nodeAllocator , _leaf< true >( nodeAllocator , p , maxDepth ) , p , out / (Real)pow( width , Dim ) , dataField , oneKey ? *( (DataKey*)&densityKey ) : dataKey );
#else // !__GNUC__ || __GNUC__ >=5

17
ports/poissonrecon/portfile.cmake
View File

@ -1,19 +1,18 @@
vcpkg_from_github( vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO mkazhdan/PoissonRecon REPO mkazhdan/PoissonRecon
REF 03f73754e994eb388de63285d3a2772493168e8a REF 455ea0dbe651f31bf6985ff2891becff1dd79c72
SHA512 be1d6842952d2b27860b5a82d9cc536da213fd2e44d946c512e04881af66a4c7c039930347fe9db5b168cc356e55167c9bdbdb39eab9cea68882dc01a9482867 SHA512 93ef904b0a73b7650e2f1ed143444861661db74b4991182ffd0ff49c008fec9d664fb93e24825fce748576d8d6abbd1de8bfc8f8b1f7c48f57207712bf80ce9e
HEAD_REF master HEAD_REF master
PATCHES PATCHES
use-external-libs.patch use-external-libs.patch
disable-gcc5-checks.patch disable-gcc5-checks.patch
) )
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
vcpkg_configure_cmake( vcpkg_cmake_configure(
SOURCE_PATH ${SOURCE_PATH} SOURCE_PATH "${SOURCE_PATH}"
PREFER_NINJA
OPTIONS OPTIONS
-DBUILD_TOOLS=OFF -DBUILD_TOOLS=OFF
) )
@ -25,9 +24,9 @@ find_dependency(JPEG)
include("${CMAKE_CURRENT_LIST_DIR}/PoissonReconTargets.cmake") include("${CMAKE_CURRENT_LIST_DIR}/PoissonReconTargets.cmake")
]=]) ]=])
vcpkg_install_cmake() vcpkg_cmake_install()
vcpkg_fixup_cmake_targets() vcpkg_cmake_config_fixup()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

10
ports/poissonrecon/vcpkg.json
View File

@ -1,11 +1,19 @@
{ {
"name": "poissonrecon", "name": "poissonrecon",
"version-string": "2019-09-15", "version-date": "2021-09-26",
"description": "Adaptive Multigrid Solvers", "description": "Adaptive Multigrid Solvers",
"homepage": "https://github.com/mkazhdan/PoissonRecon", "homepage": "https://github.com/mkazhdan/PoissonRecon",
"dependencies": [ "dependencies": [
"libjpeg-turbo", "libjpeg-turbo",
"libpng", "libpng",
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
},
"zlib" "zlib"
] ]
} }

2
versions/baseline.json
View File

@ -5181,7 +5181,7 @@
"port-version": 0 "port-version": 0
}, },
"poissonrecon": { "poissonrecon": {
"baseline": "2019-09-15", "baseline": "2021-09-26",
"port-version": 0 "port-version": 0
}, },
"poly2tri": { "poly2tri": {

5
versions/p-/poissonrecon.json
View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "348d630875a1490f69ad33854ef06a52792a2f88",
"version-date": "2021-09-26",
"port-version": 0
},
{ {
"git-tree": "cd642f0dd6c4e1c92eebd490c70eb2e14a0e8e3d", "git-tree": "cd642f0dd6c4e1c92eebd490c70eb2e14a0e8e3d",
"version-string": "2019-09-15", "version-string": "2019-09-15",