Skip to content

Commit

Permalink
Merge branch 'mdejong-master'
Browse files Browse the repository at this point in the history
  • Loading branch information
jtsiomb committed Nov 28, 2018
2 parents 46a1e01 + 98bf20f commit d95a98a
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions kdtree.c
Original file line number Diff line number Diff line change
Expand Up @@ -666,9 +666,9 @@ void *kd_res_itemf(struct kdres *rset, float *pos)
void *kd_res_item3(struct kdres *rset, double *x, double *y, double *z)
{
if(rset->riter) {
if(*x) *x = rset->riter->item->pos[0];
if(*y) *y = rset->riter->item->pos[1];
if(*z) *z = rset->riter->item->pos[2];
if(x) *x = rset->riter->item->pos[0];
if(y) *y = rset->riter->item->pos[1];
if(z) *z = rset->riter->item->pos[2];
return rset->riter->item->data;
}
return 0;
Expand All @@ -677,9 +677,9 @@ void *kd_res_item3(struct kdres *rset, double *x, double *y, double *z)
void *kd_res_item3f(struct kdres *rset, float *x, float *y, float *z)
{
if(rset->riter) {
if(*x) *x = rset->riter->item->pos[0];
if(*y) *y = rset->riter->item->pos[1];
if(*z) *z = rset->riter->item->pos[2];
if(x) *x = rset->riter->item->pos[0];
if(y) *y = rset->riter->item->pos[1];
if(z) *z = rset->riter->item->pos[2];
return rset->riter->item->data;
}
return 0;
Expand Down

0 comments on commit d95a98a

Please sign in to comment.