From f38e0686d909aa0d2882c197aeff59eeefa17081 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Luc=20Peuri=C3=A8re?= Date: Sat, 4 Jun 2005 16:22:50 +0000 Subject: new round of warning fixes. we are now down to 24 with Xcode on blender alone with the following flags : -Wall -Wno-char-subscripts -Wno-missing-braces. the only one still worrying me is in rand.c line 57 : rand.c:57: integer constant is too large for "long" type but i have no clue about how correct cross-compiler and 32/64 bits friendly see also my mail to commiter list for signed/unsigned issues --- extern/qhull/src/geom.c | 4 ++-- extern/qhull/src/io.c | 4 ++-- extern/qhull/src/stat.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'extern/qhull') diff --git a/extern/qhull/src/geom.c b/extern/qhull/src/geom.c index b3cf198d510..9d8f5480028 100755 --- a/extern/qhull/src/geom.c +++ b/extern/qhull/src/geom.c @@ -139,7 +139,7 @@ facetT *qh_findbest (pointT *point, facetT *startfacet, realT *dist, boolT *isoutside, int *numpart) { realT bestdist= -REALmax/2 /* avoid underflow */; facetT *facet, *neighbor, **neighborp, *bestfacet= NULL; - facetT *bestfacet_all= startfacet; + // facetT *bestfacet_all= startfacet; int oldtrace= qh IStracing; unsigned int visitid= ++qh visit_id; int numpartnew=0; @@ -409,7 +409,7 @@ facetT *qh_findbesthorizon (boolT ischeckmax, pointT* point, facetT *startfacet, */ facetT *qh_findbestnew (pointT *point, facetT *startfacet, realT *dist, boolT bestoutside, boolT *isoutside, int *numpart) { - realT bestdist= -REALmax/2, minsearch= -REALmax/2; + realT bestdist= -REALmax/2; //, minsearch= -REALmax/2; facetT *bestfacet= NULL, *facet; int oldtrace= qh IStracing, i; unsigned int visitid= ++qh visit_id; diff --git a/extern/qhull/src/io.c b/extern/qhull/src/io.c index 79ca7995d1e..9b0ccdd0b24 100755 --- a/extern/qhull/src/io.c +++ b/extern/qhull/src/io.c @@ -73,8 +73,8 @@ void qh_produce_output(void) { qh_memstatistics (qh ferr); d_1= sizeof(setT) + (qh hull_dim - 1) * SETelemsize; fprintf(qh ferr, "\ - size in bytes: merge %d ridge %d vertex %d facet %d\n\ - normal %d ridge vertices %d facet vertices or neighbors %d\n", + size in bytes: merge %ld ridge %ld vertex %ld facet %ld\n\ + normal %d ridge vertices %d facet vertices or neighbors %ld\n", sizeof(mergeT), sizeof(ridgeT), sizeof(vertexT), sizeof(facetT), qh normal_size, d_1, d_1 + SETelemsize); diff --git a/extern/qhull/src/stat.c b/extern/qhull/src/stat.c index e8d21fe69db..ede0323cb88 100755 --- a/extern/qhull/src/stat.c +++ b/extern/qhull/src/stat.c @@ -458,7 +458,7 @@ void qh_initstatistics (void) { qh_allstatI(); if (qhstat next > sizeof(qhstat id)) { fprintf (qhmem.ferr, "qhull error (qh_initstatistics): increase size of qhstat.id[].\n\ - qhstat.next %d should be <= sizeof(qhstat id) %d\n", qhstat next, sizeof(qhstat id)); + qhstat.next %d should be <= sizeof(qhstat id) %ld\n", qhstat next, sizeof(qhstat id)); #if 0 /* for locating error, Znumridges should be duplicated */ for (i=0; i < ZEND; i++) { int j; -- cgit v1.2.3