Merge

stevenlovegrove · Dec 12, 2013 · b6b4660 · b6b4660
2 parents 2e97460 + 814506b
commit b6b4660
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 4 deletions.
diff --git a/CMakeModules/AndroidUtils.cmake b/CMakeModules/AndroidUtils.cmake
@@ -93,9 +93,18 @@ void ANativeActivity_onCreate(ANativeActivity * app, void * ud, size_t udsize) {
     endmacro()
 
     macro( android_update android_project_name)
+        # Find which android platforms are available.
+        execute_process(
+            COMMAND android list targets -c
+            OUTPUT_VARIABLE android_target_list
+        )
+
+        # Pick first platform from this list.
+        string(REGEX MATCH "^.*[^\n]" android_target ${android_target_list} )
+
         # Generate ant build scripts for making APK
         execute_process(
-            COMMAND android update project --name ${android_project_name} --path . --target android-17 --subprojects
+            COMMAND android update project --name ${android_project_name} --path . --target ${android_target} --subprojects
             WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
         )
     endmacro()

diff --git a/include/pangolin/compat/boostd.h b/include/pangolin/compat/boostd.h
@@ -28,6 +28,8 @@
 #ifndef PANGOLIN_COMPAT_BOOSTD_H
 #define PANGOLIN_COMPAT_BOOSTD_H
 
+#include <pangolin/platform.h>
+
 #ifdef CPP11_NO_BOOST
 namespace boostd = std;
 #else

diff --git a/include/pangolin/compat/function.h b/include/pangolin/compat/function.h
@@ -28,6 +28,8 @@
 #ifndef PANGOLIN_COMPAT_FUNCTION_H
 #define PANGOLIN_COMPAT_FUNCTION_H
 
+#include <pangolin/platform.h>
+
 #ifdef CPP11_NO_BOOST
 #include <functional>
 #else

diff --git a/include/pangolin/compat/type_traits.h b/include/pangolin/compat/type_traits.h
@@ -28,6 +28,8 @@
 #ifndef PANGOLIN_COMPAT_TYPE_TRAITS_H
 #define PANGOLIN_COMPAT_TYPE_TRAITS_H
 
+#include <pangolin/platform.h>
+
 #include <typeinfo>
 
 #ifdef CPP11_NO_BOOST

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -88,6 +88,7 @@ if(BUILD_PANGOLIN_GUI)
       list(APPEND LINK_LIBS "${OPENGL_LIBRARIES};${GLEW_LIBRARY}" )
   else()
       find_package(GLUES REQUIRED)
+      list(APPEND USER_INC  "${GLUES_INCLUDE_DIR};" )
       list(APPEND LINK_LIBS "${GLUES_LIBRARY}" )
       list(APPEND LINK_LIBS "-lEGL;-lGLESv2;-lGLESv1_CM" )
   endif()
@@ -152,6 +153,10 @@ if(NOT ANDROID)
         message(STATUS "Glut Found and Enabled")
     endif()
 else()  # NOT ANDROID
+    # Fix issue with thread local storage on android.
+    add_definitions(-fno-data-sections)
+
+    # Android specific display code
     list(APPEND HEADERS ${INCDIR}/display_android.h )
     list(APPEND SOURCES display_android.cpp )
     set(HAVE_GLES 1)

diff --git a/src/display_android.cpp b/src/display_android.cpp
@@ -50,6 +50,7 @@
 #include <sstream>
 #include <algorithm>
 #include <iterator>
+#include <stdexcept>
 
 #include <jni.h>
 

diff --git a/src/plotter.cpp b/src/plotter.cpp
@@ -35,6 +35,7 @@
 #include <fstream>
 #include <sstream>
 #include <iomanip>
+#include <stdexcept>
 #include <map>
 
 using namespace std;
@@ -408,7 +409,7 @@ void Plotter::Render()
         }else if( plot_mode==STACKED_HISTOGRAM ) {
             DrawSequenceHistogram(*log);
         }else {
-            assert(false);
+            throw std::logic_error("Unknown plot mode.");
         }
     }
 

diff --git a/src/view.cpp b/src/view.cpp
@@ -24,6 +24,8 @@
     #endif // HAVE_TIFF
 #endif // HAVE_BOOST_GIL
 
+#include <stdexcept>
+
 namespace pangolin
 {
 
@@ -513,8 +515,7 @@ View& View::VisibleChild(size_t i)
         }
     }
     // Shouldn't get here
-    assert(0);
+    throw std::out_of_range("No such child.");
-    return *this;
 }
 
 View* View::FindChild(int x, int y)