speed-dreams/speed-dreams-code
speed-dreams/speed-dreams-code
7
1
Fork 3
Code Issues 8 Pull requests Projects Releases 1 Packages Wiki Activity Actions

accc: fix another memory leak

Browse source 
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@7705 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 8d8a0b7dceed5466aab294c1b14961c7816c0508
Former-commit-id: e421f2c877d4edfc5c71a130069c9a584ddc62b2
This commit is contained in:
iobyte 2021-10-04 00:37:53 +00:00
parent 00392c8f86
commit 5a293ae58d
2 changed files with 21 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/tools/accc/ac3dload.cpp
View file

@ -173,7 +173,7 @@ void obCreateVertexArrays(ob_t * ob)
ob->vertexarray3 = (tcoord_t *) calloc(numEls, sizeof(tcoord_t));
}
void obCopyTextureNames(ob_t * destob, ob_t * srcob)
void obCopyTextureNames(ob_t * destob, const ob_t * srcob)
{
if(srcob->texture)
destob->texture = strdup(srcob->texture);
@ -335,7 +335,7 @@ void createTexCoordArray(double * destarr, tcoord_t * srcidxarr, int numidx)
*
* @return the created split object
*/
ob_t * createObjectSplitCopy(int splitid, ob_t * srcobj, ob_t * tmpob)
ob_t * createObjectSplitCopy(int splitid, const ob_t * srcobj, const ob_t * tmpob)
{
int numtri = tmpob->numsurf;
int numvert = tmpob->numvertice;
@ -438,7 +438,7 @@ void clearSavedInVertexArrayEntry(ob_t * object, int vertidx)
object->vertexarray[vertidx].saved = 0;
}
void createSingleTexChannelArrays(ob_t * destob, ob_t * srcob, int channel)
void createSingleTexChannelArrays(ob_t * destob, const ob_t * srcob, int channel)
{
int size_va = srcob->numsurf * 3 * sizeof(tcoord_t);
int size_ta = 2 * srcob->numvertice * sizeof(double);
@ -482,7 +482,7 @@ void createSingleTexChannelArrays(ob_t * destob, ob_t * srcob, int channel)
}
}
void createTexChannelArrays(ob_t * destob, ob_t * srcob)
void createTexChannelArrays(ob_t * destob, const ob_t * srcob)
{
if(srcob->vertexarray != NULL)
@ -843,7 +843,7 @@ ob_t* splitOb(ob_t *object)
/* The object we use as storage during splitting.
* Following attribs will be used: vertexarray, vertex, snorm, textarray
*/
ob_t * workob;
ob_t workob;
tcoord_t curvertex[3];
int curstoredidx[3];
@ -855,7 +855,6 @@ ob_t* splitOb(ob_t *object)
int numvertstored = 0; /* number of vertices stored in the object */
int numtristored = 0; /* number of triangles stored in the object: numvertstored/3 */
int mustcontinue = 1;
ob_t * tob = NULL;
ob_t * tob0 = NULL;
int numobject = 0;
int firstTri = 0;
@ -868,12 +867,12 @@ ob_t* splitOb(ob_t *object)
tri = (int *) calloc(orignumtris, sizeof(int));
oldva = (int *) calloc(orignumverts, sizeof(int));
workob = obCreate();
workob->vertex = (point_t *) calloc(orignumverts, sizeof(point_t));
workob->snorm = (point_t *) calloc(orignumverts, sizeof(point_t));
memset(&workob, 0, sizeof(workob));
workob.vertex = (point_t *) calloc(orignumverts, sizeof(point_t));
workob.snorm = (point_t *) calloc(orignumverts, sizeof(point_t));
// create texture channels
createTexChannelArrays(workob, object);
createTexChannelArrays(&workob, object);
while (mustcontinue == 1)
{
@ -919,8 +918,8 @@ ob_t* splitOb(ob_t *object)
for (int i = 0; i < 3; i++)
{
if (curstoredidx[i] != -1)
if(workob->textarray[curstoredidx[i] * 2] != curvertex[i].u
|| workob->textarray[curstoredidx[i] * 2 + 1] != curvertex[i].v)
if(workob.textarray[curstoredidx[i] * 2] != curvertex[i].u
|| workob.textarray[curstoredidx[i] * 2 + 1] != curvertex[i].v)
{
touse = 0;
/* triangle is not ok */
@ -943,8 +942,8 @@ ob_t* splitOb(ob_t *object)
if (curstoredidx[i] == -1)
{
workob->vertex[numptstored] = object->vertex[curvertex[i].indice];
workob->snorm[numptstored] = object->norm[curvertex[i].indice];
workob.vertex[numptstored] = object->vertex[curvertex[i].indice];
workob.snorm[numptstored] = object->norm[curvertex[i].indice];
clearSavedInVertexArrayEntry(object, curvert+i);
@ -953,7 +952,7 @@ ob_t* splitOb(ob_t *object)
numptstored++;
}
copySingleVertexData(workob, object, curstoredidx[i],
copySingleVertexData(&workob, object, curstoredidx[i],
oldnumptstored, numvertstored, curvert+i);
numvertstored++;
@ -971,10 +970,10 @@ ob_t* splitOb(ob_t *object)
continue;
/* must saved the object */
workob->numvertice = numptstored;
workob->numsurf = numvertstored/3;
workob.numvertice = numptstored;
workob.numsurf = numvertstored/3;
tob = createObjectSplitCopy(numobject++, object, workob);
ob_t * tob = createObjectSplitCopy(numobject++, object, &workob);
attrSurf = tob->attrSurf;
attrMat = tob->attrMat;
@ -988,7 +987,7 @@ ob_t* splitOb(ob_t *object)
free(tri);
free(oldva);
obFree(workob);
obFree(&workob);
return tob0;
}

6
src/tools/accc/accc.h
View file

@ -188,7 +188,7 @@ void obCreateVertexArrays(ob_t * ob);
void obCreateTextArrays(ob_t * ob);
/** copies the "texture" properties from srcob to destob. */
void obCopyTextureNames(ob_t * destob, ob_t * srcob);
void obCopyTextureNames(ob_t * destob, const ob_t * srcob);
/** Assigns the given "newIndex" to the indice property of all active "vertexarray"s at index
* "vaIdx".
@ -273,7 +273,7 @@ void clearSavedInVertexArrayEntry(ob_t * ob, int vertidx);
* and from numsurf and numvertice the number of points/indices are calculated.
* Creation means allocation and copying of the corresponding channels from srcob to destob.
*/
void createTexChannelArrays(ob_t * destob, ob_t * srcob);
void createTexChannelArrays(ob_t * destob, const ob_t * srcob);
/** Creates vertexarray{,1,2,3} and textarray{,1,2,3} in ob based on the given channel
* and on the given number of vertices. Creation means allocation and copying of the
@ -282,7 +282,7 @@ void createTexChannelArrays(ob_t * destob, ob_t * srcob);
* @param ob the object in which to allocate the texture channel
* @param channel which texture channel, value in range [0,3]
*/
void createSingleTexChannelArrays(ob_t * destob, ob_t * srcob, int channel);
void createSingleTexChannelArrays(ob_t * destob, const ob_t * srcob, int channel);
/** Computes the centroid of a triangle surface of the given object.
*