Merge branch 'master' of https://git.frank-ebner.de/FHWS/Indoor

2017-05-24 09:29:52 +02:00
parent d40032ca74 8e295e25af
commit 1ef3e33f2e
8 changed files with 108 additions and 7 deletions
--- a/floorplan/v2/FloorplanCeilings.h
+++ b/floorplan/v2/FloorplanCeilings.h
@@ -114,8 +114,9 @@ namespace Floorplan {

 	#ifdef WITH_ASSERTIONS

-			static size_t numNear = 0;
-			static size_t numFar = 0;
+            static uint64_t numNear = 0;
+            static uint64_t numFar = 0;
+
 			for (const float z : ceilingsAtHeight_m) {
 				const float diff = std::min( std::abs(z-zMin), std::abs(z-zMax) );
 				if (diff < 0.1) {++numNear;} else {++numFar;}