Skip to content

Commit 88eca3c

Browse files
authored
Merge pull request #6 from jinnsjj/fix_cpp_build
fix compiler error when built with c++.
2 parents f030d18 + ca9275f commit 88eca3c

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

convhull_3d.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1669,7 +1669,7 @@ void delaunay_nd_mesh
16691669
CH_FLOAT* projpoints, *cf, *df, *p0, *p, *visible;
16701670

16711671
/* Project the N-dimensional points onto a N+1-dimensional paraboloid */
1672-
projpoints = ch_malloc(nPoints*(nd+1)*sizeof(CH_FLOAT));
1672+
projpoints = (CH_FLOAT*)ch_malloc(nPoints*(nd+1)*sizeof(CH_FLOAT));
16731673
for(i = 0; i < nPoints; i++) {
16741674
projpoints[i*(nd+1)+nd] = 0.0;
16751675
for(j=0; j<nd; j++){
@@ -1702,7 +1702,7 @@ void delaunay_nd_mesh
17021702
assert(maxW_idx!=-1);
17031703
#endif
17041704
w0 = projpoints[maxW_idx*(nd+1)+nd];
1705-
p0 = ch_malloc(nd*sizeof(CH_FLOAT));
1705+
p0 = (CH_FLOAT*)ch_malloc(nd*sizeof(CH_FLOAT));
17061706
for(j=0; j<nd; j++)
17071707
p0[j] = projpoints[maxW_idx*(nd+1)+j];
17081708

@@ -1718,11 +1718,11 @@ void delaunay_nd_mesh
17181718
w_optimal2=w_optimal-1000.0*fabs(w_optimal);
17191719

17201720
/* Set the point where the tangent plane crosses the w axis */
1721-
p = ch_calloc((nd+1),sizeof(CH_FLOAT));
1721+
p = (CH_FLOAT*)ch_calloc((nd+1),sizeof(CH_FLOAT));
17221722
p[nd] = w_optimal2;
17231723

17241724
/* Find all faces that are visible from this point */
1725-
visible = ch_malloc(nHullFaces*sizeof(CH_FLOAT));
1725+
visible = (CH_FLOAT*)ch_malloc(nHullFaces*sizeof(CH_FLOAT));
17261726
#ifdef CONVHULL_3D_USE_CBLAS
17271727
if(sizeof(CH_FLOAT)==sizeof(double)){
17281728
cblas_dgemm(CblasRowMajor, CblasNoTrans, CblasNoTrans, nHullFaces, 1, nd+1, 1.0,
@@ -1753,7 +1753,7 @@ void delaunay_nd_mesh
17531753
/* Output */
17541754
(*nMesh) = nVisible;
17551755
if(nVisible>0){
1756-
(*Mesh) = ch_malloc(nVisible*(nd+1)*sizeof(int));
1756+
(*Mesh) = (int*)ch_malloc(nVisible*(nd+1)*sizeof(int));
17571757
for(i=0, j=0; i<nHullFaces; i++){
17581758
if(visible[i]>0.0){
17591759
for(k=0; k<nd+1; k++)

0 commit comments

Comments
 (0)