Merge pull request #1225 from benbennett/fix1224

Fixes 1224 for CUDA >= 6.x when calling fmin.
PointCloudLibrary · May 4, 2015 · ddd6b41 · ddd6b41
2 parents 0daa446 + 77614b7
commit ddd6b41
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/gpu/kinfu_large_scale/src/cuda/tsdf_volume.cu b/gpu/kinfu_large_scale/src/cuda/tsdf_volume.cu
@@ -247,7 +247,7 @@ namespace pcl
 
                 if (sdf >= -tranc_dist_mm)
                 {
-                  float tsdf = fmin (1, sdf / tranc_dist_mm);
+                  float tsdf = fmin (1.f, sdf / tranc_dist_mm);
 
                   int weight_prev;
                   float tsdf_prev;