manolas
/
vcglib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix stl filesize computation for >2gb files (see https://github.com/cnr-isti-vclab/meshlab/issues/924)

This commit is contained in:
alemuntoni 2021-03-02 14:25:30 +01:00
parent e292f0cc9b
commit fed787ebb9
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
wrap/io_trimesh/import_stl.h
View File

@ -24,7 +24,7 @@
#ifndef __VCGLIB_IMPORT_STL #ifndef __VCGLIB_IMPORT_STL
#define __VCGLIB_IMPORT_STL #define __VCGLIB_IMPORT_STL
#include <stdio.h> #include <stdio.h>
#include<algorithm> #include <algorithm>
#include <wrap/io_trimesh/io_mask.h> #include <wrap/io_trimesh/io_mask.h>
namespace vcg { namespace vcg {
@ -153,13 +153,13 @@ static bool IsSTLBinary(const char * filename, bool &binaryFlag)
FILE *fp = fopen(filename, "rb"); FILE *fp = fopen(filename, "rb");
/* Find size of file */ /* Find size of file */
fseek(fp, 0, SEEK_END); fseek(fp, 0, SEEK_END);
long file_size = ftell(fp); unsigned long file_size = ftell(fp);
unsigned int facenum; unsigned int facenum;
/* Check for binary or ASCII file */ /* Check for binary or ASCII file */
fseek(fp, STL_LABEL_SIZE, SEEK_SET); fseek(fp, STL_LABEL_SIZE, SEEK_SET);
fread(&facenum, sizeof(unsigned int), 1, fp); fread(&facenum, sizeof(unsigned int), 1, fp);
long expected_file_size=STL_LABEL_SIZE + 4 + (sizeof(short)+sizeof(STLFacet) )*facenum ; unsigned long expected_file_size=STL_LABEL_SIZE + 4 + (sizeof(short)+sizeof(STLFacet) )*facenum ;
if(file_size == expected_file_size) if(file_size == expected_file_size)
{ {
binaryFlag = true; binaryFlag = true;
@ -169,15 +169,16 @@ static bool IsSTLBinary(const char * filename, bool &binaryFlag)
// second check, sometimes the size is a bit wrong, // second check, sometimes the size is a bit wrong,
// lets'make a test to check that we find only ascii stuff before assuming it is ascii // lets'make a test to check that we find only ascii stuff before assuming it is ascii
unsigned char tmpbuf[1000]; unsigned char tmpbuf[1000];
int byte_to_read = std::min(int(sizeof(tmpbuf)), int(file_size - 80)); unsigned long byte_to_read = std::min(sizeof(tmpbuf), file_size - 80);
fread(tmpbuf, byte_to_read,1,fp); fread(tmpbuf, byte_to_read,1,fp);
fclose(fp); fclose(fp);
for(int i = 0; i < byte_to_read; i++) for(unsigned long i = 0; i < byte_to_read; i++)
{ {
if(tmpbuf[i] > 127) if(tmpbuf[i] > 127)
{ {
binaryFlag=true; binaryFlag=true;
if(abs(file_size-expected_file_size) > file_size/20 ) unsigned long diff = (file_size > expected_file_size) ? file_size-expected_file_size : expected_file_size-file_size;
if(diff > file_size/20 )
return false; // return false; //
break; break;
} }