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

removed other memset

This commit is contained in:
alemuntoni 2021-10-19 14:33:26 +02:00
parent 341148b961
commit 0bb69855d9
4 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
vcg/space/index/octree.h
View File

@ -310,7 +310,6 @@ public:
global_mark = 1; global_mark = 1;
marks.resize(placeholder_count); marks.resize(placeholder_count);
std::fill(marks.begin(), marks.end(), 0); std::fill(marks.begin(), marks.end(), 0);
//memset(&marks[0], 0, sizeof(unsigned char)*placeholder_count);
std::sort(placeholders.begin(), placeholders.end(), ObjectSorter< NodeType >()); std::sort(placeholders.begin(), placeholders.end(), ObjectSorter< NodeType >());
std::vector< NodePointer > filled_leaves(placeholder_count); std::vector< NodePointer > filled_leaves(placeholder_count);

9
vcg/space/index/octree_template.h
View File

@ -28,6 +28,8 @@
#include <vcg/space/point3.h> #include <vcg/space/point3.h>
#include <vcg/space/box3.h> #include <vcg/space/box3.h>
#include <vector> #include <vector>
#include <array>
#include <assert.h>
namespace vcg namespace vcg
@ -111,7 +113,7 @@ protected:
InnerNode() : Node() {} InnerNode() : Node() {}
InnerNode(NodePointer parent, int level) : Node(parent, level) InnerNode(NodePointer parent, int level) : Node(parent, level)
{ {
memset(&sons[0], 0, 8*sizeof(Node*)); sons.fill(nullptr);
} }
inline NodePointer &Son(int sonIndex) inline NodePointer &Son(int sonIndex)
@ -125,7 +127,7 @@ protected:
return false; return false;
} }
NodePointer sons[8]; std::array<NodePointer, 8> sons;
}; };
/* /*
@ -598,7 +600,8 @@ public:
assert( boundingBox.min.Y()<=p.Y() && p.Y()<=boundingBox.max.Y() ); assert( boundingBox.min.Y()<=p.Y() && p.Y()<=boundingBox.max.Y() );
assert( boundingBox.min.Z()<=p.Z() && p.Z()<=boundingBox.max.Z() ); assert( boundingBox.min.Z()<=p.Z() && p.Z()<=boundingBox.max.Z() );
memset(route, NULL, maximumDepth*sizeof(NodePointer)); for (unsigned int i = 0; i < maximumDepth; ++i)
route[i] = nullptr;
CenterType path = CenterType::Construct(Interize(p)); CenterType path = CenterType::Construct(Interize(p));
int shift = maximumDepth-1; int shift = maximumDepth-1;

9
wrap/io_trimesh/export_idtf.h
View File

@ -159,7 +159,8 @@ public:
tga.colourmaptype = 0; tga.colourmaptype = 0;
tga.imagetype = 2; tga.imagetype = 2;
memset(tga.colormapspecs,0,5); for (unsigned int i = 0; i < 5; ++i)
tga.colormapspecs[i] = '\0';
tga.xstart = (short) im.offset().x(); tga.xstart = (short) im.offset().x();
tga.ystart = (short) im.offset().y(); tga.ystart = (short) im.offset().y();
tga.height = (short) im.height(); tga.height = (short) im.height();
@ -180,10 +181,10 @@ public:
//is a 8-digits binary number code //is a 8-digits binary number code
// always 0 0 | mirroring | bits // always 0 0 | mirroring | bits
//(future uses)| image | for alpha-channel //(future uses)| image | for alpha-channel
//--------------------------------------------
// 7 6 | 5 4 | 3 2 1 0
//-------------------------------------------- //--------------------------------------------
// 0 0 | 1 0 | 1 0 0 0 // 7 6 | 5 4 | 3 2 1 0
//--------------------------------------------
// 0 0 | 1 0 | 1 0 0 0
tga.descriptor = (char) 40; tga.descriptor = (char) 40;
tga.bits = (char) 32; tga.bits = (char) 32;
} }

4
wrap/io_trimesh/import_raw.h
View File

@ -347,7 +347,9 @@ static int Open( MESH_TYPE &m, const char * filename, bool triangulate=false, in
//read a new line //read a new line
ii=0; ii=0;
memset( rawline, 0, 512); for (unsigned int i = 0; i < 512; ++i)
rawline[i] = 0;
//memset( rawline, 0, 512);
fread(&(rawline[ii++]),sizeof(char),1,fp); fread(&(rawline[ii++]),sizeof(char),1,fp);
while( (rawline[ii-1] != '\n') && (ii<512) ) while( (rawline[ii-1] != '\n') && (ii<512) )
{ {