forked from microsoft/vcpkg
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[poissonrecon] Update to latest commit (microsoft#20357)
- Loading branch information
Showing
6 changed files
with
70 additions
and
105 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,87 +1,47 @@ | ||
| diff --git a/Src/FEMTree.System.inl b/Src/FEMTree.System.inl | ||
| index ae554d4..87f0423 100644 | ||
| --- a/Src/FEMTree.System.inl | ||
| +++ b/Src/FEMTree.System.inl | ||
| @@ -792,7 +792,7 @@ void FEMTree< Dim , Real >::_solveRegularMG( UIntPack< FEMSigs ... > , typename | ||
| } | ||
| } | ||
|
|
||
| -#if defined( __GNUC__ ) && __GNUC__ < 5 | ||
| +#if defined( __GNUC__ ) && __GNUC__ < 5 && 0 | ||
| #warning "you've got me gcc version<5" | ||
| template< unsigned int Dim , class Real > | ||
| template< unsigned int ... FEMSigs > | ||
| @@ -1679,7 +1679,7 @@ SparseMatrix< Real , matrix_index_type > FEMTree< Dim , Real >::systemMatrix( UI | ||
| typename FEMTreeNode::template ConstNeighbors< OverlapSizes > neighbors; | ||
| neighborKey.getNeighbors( OverlapRadii() , OverlapRadii() , _sNodes.treeNodes[i] , neighbors ); | ||
|
|
||
| -#if defined( __GNUC__ ) && __GNUC__ < 5 | ||
| +#if defined( __GNUC__ ) && __GNUC__ < 5 && 0 | ||
| #warning "you've got me gcc version<5" | ||
| matrix.setRowSize( ii , _getMatrixRowSize( UIntPack< FEMSigs ... >() , neighbors ) ); | ||
| #else // !__GNUC__ || __GNUC__ >=5 | ||
| diff --git a/Src/FEMTree.WeightedSamples.inl b/Src/FEMTree.WeightedSamples.inl | ||
| index b263dda..282387e 100644 | ||
| --- a/Src/FEMTree.WeightedSamples.inl | ||
| +++ b/Src/FEMTree.WeightedSamples.inl | ||
| @@ -225,7 +225,7 @@ Real FEMTree< Dim , Real >::_splatPointData( Allocator< FEMTreeNode > *nodeAlloc | ||
|
|
||
| width = 1.0 / ( 1<<_localDepth( temp ) ); | ||
| _v = v * weight / Real( pow( width , dim ) ) * Real( dx ); | ||
| -#if defined( __GNUC__ ) && __GNUC__ < 5 | ||
| +#if defined( __GNUC__ ) && __GNUC__ < 5 && 0 | ||
| #warning "you've got me gcc version<5" | ||
| _splatPointData< CreateNodes , ThreadSafe , V >( nodeAllocator , temp , position , _v , dataInfo , dataKey ); | ||
| #else // !__GNUC__ || __GNUC__ >=5 | ||
| @@ -238,7 +238,7 @@ Real FEMTree< Dim , Real >::_splatPointData( Allocator< FEMTreeNode > *nodeAlloc | ||
| width = 1.0 / ( 1<<_localDepth( temp ) ); | ||
|
|
||
| _v = v * weight / Real( pow( width , dim ) ) * Real( dx ); | ||
| -#if defined( __GNUC__ ) && __GNUC__ < 5 | ||
| +#if defined( __GNUC__ ) && __GNUC__ < 5 && 0 | ||
| #warning "you've got me gcc version<5" | ||
| _splatPointData< CreateNodes , ThreadSafe , V >( nodeAllocator , temp , position , _v , dataInfo , dataKey ); | ||
| #else // !__GNUC__ || __GNUC__ >=5 | ||
| diff --git a/Src/FEMTree.h b/Src/FEMTree.h | ||
| index 8aa3b41..0be77a1 100644 | ||
| --- a/Src/FEMTree.h | ||
| +++ 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 | ||
| diff --git a/Src/FEMTree.WeightedSamples.inl b/Src/FEMTree.WeightedSamples.inl | ||
| index 7b0d6b4..bb3ad0f 100644 | ||
| --- a/Src/FEMTree.WeightedSamples.inl | ||
| +++ b/Src/FEMTree.WeightedSamples.inl | ||
| @@ -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 && 0 | ||
| #ifdef SHOW_WARNINGS | ||
| #warning "you've got me gcc version<5" | ||
| #endif // SHOW_WARNINGS | ||
| diff --git a/Src/FEMTree.h b/Src/FEMTree.h | ||
| index 8f00045..2faa0f4 100644 | ||
| --- a/Src/FEMTree.h | ||
| +++ b/Src/FEMTree.h | ||
| @@ -231,6 +231,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; | ||
| diff --git a/Src/FEMTree.inl b/Src/FEMTree.inl | ||
| index 814f1ae..405e996 100644 | ||
| --- a/Src/FEMTree.inl | ||
| +++ b/Src/FEMTree.inl | ||
| @@ -425,7 +425,7 @@ SparseNodeData< OutData , UIntPack< DataSigs ... > > FEMTree< Dim , Real >::setI | ||
| 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 | ||
| #ifdef SHOW_WARNINGS | ||
| #warning "you've got me gcc version<5" | ||
| #endif // SHOW_WARNINGS | ||
| @@ -436,7 +436,7 @@ SparseNodeData< OutData , UIntPack< DataSigs ... > > FEMTree< Dim , Real >::setI | ||
| else | ||
| { | ||
| Real width = (Real)( 1.0 / ( 1<<maxDepth ) ); | ||
| -#if defined( __GNUC__ ) && __GNUC__ < 5 | ||
| +#if defined( __GNUC__ ) && __GNUC__ < 5 && 0 | ||
| #ifdef SHOW_WARNINGS | ||
| #warning "you've got me gcc version<5" | ||
| #endif // SHOW_WARNINGS |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,19 @@ | ||
| { | ||
| "name": "poissonrecon", | ||
| "version-string": "2019-09-15", | ||
| "version-date": "2021-09-26", | ||
| "description": "Adaptive Multigrid Solvers", | ||
| "homepage": "https://github.com/mkazhdan/PoissonRecon", | ||
| "dependencies": [ | ||
| "libjpeg-turbo", | ||
| "libpng", | ||
| { | ||
| "name": "vcpkg-cmake", | ||
| "host": true | ||
| }, | ||
| { | ||
| "name": "vcpkg-cmake-config", | ||
| "host": true | ||
| }, | ||
| "zlib" | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters