archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix for a *very* nasty bug... somewhere in the ancient past - I tracked it

Browse Source 
back to 1.4 - comparing pointers apparently gave warnings or errors... I
don't really have a memory of that. Could be the Irix compiler.

What it was used for is sorting edges in arrays or hash lists, like:

  if( ((long)v1) > ((long)v2) )

long is defined to be pointer size, so that should work 32/64 bits, where
it not that the long cast makes the value SIGNED! :)

Ken Hughes discovered this... noting that when his system uses a calloc, the
returned pointer had an uncommon address making the long negative.
It was a very hard bug to track, since (apparently) most OS's have an address
space being still in the lower part of an long...

Anyhoo; I have removed a couple of (long) casts from pointer comparing now,
need to get compile feedback if that's compliant for all our OS's.
If so, quite a lot of such hacks have to be removed from our code, or make
them casting to an unsigned long...

This has been confirmed to fix bugs #2709 and #2710. Thanks Ken!
This commit is contained in:
Ton Roosendaal
2005-07-14 13:12:29 +00:00
parent e5a639a161
commit 120427e96b
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/src/editmesh_tools.c
View File

@@ -118,7 +118,7 @@ static int vergxco(const void *v1, const void *v2)
}
struct facesort {
long x;
unsigned long x;
struct EditFace *efa;
};
@@ -360,8 +360,8 @@ int removedoublesflag(short flag, float limit) /* return amount */
efa= em->faces.first;
while(efa) {
if(efa->f1 & 1) {
if(efa->v4) vsb->x= (long) MIN4( (long)efa->v1, (long)efa->v2, (long)efa->v3, (long)efa->v4);
else vsb->x= (long) MIN3( (long)efa->v1, (long)efa->v2, (long)efa->v3);
if(efa->v4) vsb->x= (unsigned long) MIN4( (unsigned long)efa->v1, (unsigned long)efa->v2, (unsigned long)efa->v3, (unsigned long)efa->v4);
else vsb->x= (unsigned long) MIN3( (unsigned long)efa->v1, (unsigned long)efa->v2, (unsigned long)efa->v3);
vsb->efa= efa;
vsb++;
@@ -2465,7 +2465,7 @@ void beauty_fill(void)
if( convex(v1->co, v2->co, v3->co, v4->co) ) {
/* test edges */
if( ((long)v1) > ((long)v3) ) {
if( (v1) > (v3) ) {
dia1.v1= v3;
dia1.v2= v1;
}
@@ -2474,7 +2474,7 @@ void beauty_fill(void)
dia1.v2= v3;
}
if( ((long)v2) > ((long)v4) ) {
if( (v2) > (v4) ) {
dia2.v1= v4;
dia2.v2= v2;
}