Changeset 211 in flair-src for trunk/lib/FlairCore

Timestamp:

Jan 25, 2018, 11:44:15 AM (7 years ago)

Author:

Sanahuja Guillaume

Message:

change opencv include dir for testing new toolchain

Location:

trunk/lib/FlairCore

Files:

• CMakeLists.txt (modified) (1 diff)
• src/Map.cpp (modified) (1 diff)

trunk/lib/FlairCore/CMakeLists.txt

@@ -22 +22 @@
 INCLUDE_DIRECTORIES(
         ${LIBXML2_INCLUDE_DIR}
-        ${CMAKE_SYSROOT}/usr/include/opencv
+        ${CMAKE_SYSROOT}/usr/include/opencv1
         ${CMAKE_SYSROOT}/usr/include/udt
         ${CMAKE_CURRENT_SOURCE_DIR}/src

trunk/lib/FlairCore/src/Map.cpp

@@ -99 +99 @@
             this, "checkpoint", latitude, longitude, altitude);
         checkpoints.push_back(checkpoint);
-      } else if(isnan(latitude) || isnan(longitude)) {
+      } else if(std::isnan(latitude) || std::isnan(longitude)) {
         //delete checkpoint
         removeCheckpoint(i);