saberbud/PoissonRecon
1
0
Fork 0
mirror of https://github.com/CloudCompare/PoissonRecon.git synced 2026-08-30 00:50:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Resolved bug that would cause a bad memory access when the octree had empty slices.

Browse Source
This commit is contained in:
mkazhdan
2019-02-06 21:38:31 -05:00
parent 3107d150fb
commit 7a3db196e6
7 changed files with 179 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Src/SSDRecon.cpp
+42 -43
View File
@@ -377,63 +377,62 @@ void ExtractMesh( UIntPack< FEMSigs ... > , std::tuple< SampleData ... > , FEMTr
}
template< typename Real , unsigned int Dim >
bool WriteImage( const Real *values , int res , const char *fileName , bool verbose )
void WriteGrid( ConstPointer( Real ) values , int res , const char *fileName )
{
if( Dim!=2 ) return false;
int resolution = 1;
for( int d=0 ; d<Dim ; d++ ) resolution *= res;
Real avg = 0;
#pragma omp parallel for reduction( + : avg )
for( int i=0 ; i<resolution ; i++ ) avg += values[i];
avg /= (Real)resolution;
char *ext = GetFileExtension( fileName );
Real std = 0;
#pragma omp parallel for reduction( + : std )
for( int i=0 ; i<resolution ; i++ ) std += ( values[i] - avg ) * ( values[i] - avg );
std = (Real)sqrt( std / resolution );
if( verbose ) printf( "Grid to image: [%.2f,%.2f] -> [0,255]\n" , avg - 2*std , avg + 2*std );
unsigned char *pixels = new unsigned char[ resolution*3 ];
#pragma omp parallel for
for( int i=0 ; i<resolution ; i++ )
if( Dim==2 && ImageWriter::ValidExtension( ext ) )
{
Real v = (Real)std::min< Real >( (Real)1. , std::max< Real >( (Real)-1. , ( values[i] - avg ) / (2*std ) ) );
v = (Real)( ( v + 1. ) / 2. * 256. );
unsigned char color = (unsigned char )std::min< Real >( (Real)255. , std::max< Real >( (Real)0. , v ) );
for( int c=0 ; c<3 ; c++ ) pixels[i*3+c ] = color;
Real avg = 0;
#pragma omp parallel for reduction( + : avg )
for( int i=0 ; i<resolution ; i++ ) avg += values[i];
avg /= (Real)resolution;
Real std = 0;
#pragma omp parallel for reduction( + : std )
for( int i=0 ; i<resolution ; i++ ) std += ( values[i] - avg ) * ( values[i] - avg );
std = (Real)sqrt( std / resolution );
if( Verbose.set ) printf( "Grid to image: [%.2f,%.2f] -> [0,255]\n" , avg - 2*std , avg + 2*std );
unsigned char *pixels = new unsigned char[ resolution*3 ];
#pragma omp parallel for
for( int i=0 ; i<resolution ; i++ )
{
Real v = (Real)std::min< Real >( (Real)1. , std::max< Real >( (Real)-1. , ( values[i] - avg ) / (2*std ) ) );
v = (Real)( ( v + 1. ) / 2. * 256. );
unsigned char color = (unsigned char )std::min< Real >( (Real)255. , std::max< Real >( (Real)0. , v ) );
for( int c=0 ; c<3 ; c++ ) pixels[i*3+c ] = color;
}
ImageWriter::Write( fileName , pixels , res , res , 3 );
delete[] pixels;
}
bool success = true;
try{ ImageWriter::Write( fileName , pixels , res , res , 3 ); }
catch( MKExceptions::Exception & ){ success = false; }
delete[] pixels;
return success;
}
template< typename Real , unsigned int Dim >
void WriteGrid( const Real *values , int res , const char *fileName )
{
int resolution = 1;
for( int d=0 ; d<Dim ; d++ ) resolution *= res;
FILE *fp = fopen( fileName , "wb" );
if( !fp ) ERROR_OUT( "Failed to open grid file for writing: %s" , fileName );
else
{
fwrite( &res , sizeof(int) , 1 , fp );
if( typeid(Real)==typeid(float) ) fwrite( values , sizeof(float) , resolution , fp );
FILE *fp = fopen( fileName , "wb" );
if( !fp ) ERROR_OUT( "Failed to open grid file for writing: %s" , fileName );
else
{
float *fValues = new float[resolution];
for( int i=0 ; i<resolution ; i++ ) fValues[i] = float( values[i] );
fwrite( fValues , sizeof(float) , resolution , fp );
delete[] fValues;
fwrite( &res , sizeof(int) , 1 , fp );
if( typeid(Real)==typeid(float) ) fwrite( values , sizeof(float) , resolution , fp );
else
{
float *fValues = new float[resolution];
for( int i=0 ; i<resolution ; i++ ) fValues[i] = float( values[i] );
fwrite( fValues , sizeof(float) , resolution , fp );
delete[] fValues;
}
fclose( fp );
}
fclose( fp );
}
delete[] ext;
}
template< class Real , typename ... SampleData , unsigned int ... FEMSigs >
void Execute( int argc , char* argv[] , UIntPack< FEMSigs ... > )
{
@@ -674,7 +673,7 @@ void Execute( int argc , char* argv[] , UIntPack< FEMSigs ... > )
#pragma omp parallel for
for( int i=0 ; i<resolution ; i++ ) values[i] -= isoValue;
profiler.dumpOutput( "Got grid:" );
if( !WriteImage< Real , DIMENSION >( values , res , Grid.value , Verbose.set ) ) WriteGrid< Real , DIMENSION >( values , res , Grid.value );
WriteGrid< Real , DIMENSION >( values , res , Grid.value );
DeletePointer( values );
if( Verbose.set )
{