server_common/recastnavigation_v1.6.0
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for Issue #12

Browse Source 
- fixed errors reported by valgrind
This commit is contained in:
Mikko Mononen 2014-01-02 21:03:01 +02:00
parent 64828488b1
commit b3d27bdb46
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Recast/Source/RecastMesh.cpp
View File

@ -661,7 +661,8 @@ static bool removeVertex(rcContext* ctx, rcPolyMesh& mesh, const unsigned short
} }
// Remove the polygon. // Remove the polygon.
unsigned short* p2 = &mesh.polys[(mesh.npolys-1)*nvp*2]; unsigned short* p2 = &mesh.polys[(mesh.npolys-1)*nvp*2];
memcpy(p,p2,sizeof(unsigned short)*nvp); if (p != p2)
memcpy(p,p2,sizeof(unsigned short)*nvp);
memset(p+nvp,0xff,sizeof(unsigned short)*nvp); memset(p+nvp,0xff,sizeof(unsigned short)*nvp);
mesh.regs[i] = mesh.regs[mesh.npolys-1]; mesh.regs[i] = mesh.regs[mesh.npolys-1];
mesh.areas[i] = mesh.areas[mesh.npolys-1]; mesh.areas[i] = mesh.areas[mesh.npolys-1];
@ -861,7 +862,9 @@ static bool removeVertex(rcContext* ctx, rcPolyMesh& mesh, const unsigned short
unsigned short* pa = &polys[bestPa*nvp]; unsigned short* pa = &polys[bestPa*nvp];
unsigned short* pb = &polys[bestPb*nvp]; unsigned short* pb = &polys[bestPb*nvp];
mergePolys(pa, pb, bestEa, bestEb, tmpPoly, nvp); mergePolys(pa, pb, bestEa, bestEb, tmpPoly, nvp);
memcpy(pb, &polys[(npolys-1)*nvp], sizeof(unsigned short)*nvp); unsigned short* last = &polys[(npolys-1)*nvp];
if (pb != last)
memcpy(pb, last, sizeof(unsigned short)*nvp);
pregs[bestPb] = pregs[npolys-1]; pregs[bestPb] = pregs[npolys-1];
pareas[bestPb] = pareas[npolys-1]; pareas[bestPb] = pareas[npolys-1];
npolys--; npolys--;