Merge remote-tracking branch 'origin/integrate-openni2'

Conflicts:
	doc/doxygen-pages/changeLog_doc.h

Author: jlblancoc

AUTHORS

@@ -104,6 +104,8 @@ the University of Malaga.
   - Several improvements and bug fixes in the mrpt-reactivenav library.
   - Developemnt in octomap classes.
   - Some improvements and bug fixes in the mrpt-opengl library.
+  - Visual Odometry based on depth images (mrpt::vision::CDifodo) and 2 applications to use it: DifOdometry-Camera and DifOdometry-Datasets
+  - Examples to manage an RGB-D camera with openNI2
 
 * Robert Schattschneider, University of Canterbury (2012)
   - Patches for bug fixes, serialization of templates.

CMakeLists.txt

@@ -180,6 +180,7 @@ include(cmakemodules/script_ftdi.cmake REQUIRED)        # Check for the FTDI hea
 include(cmakemodules/script_inotify.cmake REQUIRED)     # Check for the sys/inotify headers (Linux only, in win32 we use the equivalent API for file system monitoring):
 include(cmakemodules/script_gl_glut.cmake REQUIRED)     # Check for the GL,GLUT libraries 
 include(cmakemodules/script_opencv.cmake REQUIRED)      # Check for the OpenCV libraries (via pkg-config, CMake, with different options)
+include(cmakemodules/script_openni2.cmake REQUIRED)     # Check for the OpenNI2 library
 include(cmakemodules/script_ffmpeg.cmake REQUIRED)      # Check for ffmpeg C libraries: libavcodec, libavutil, libavformat, libswscale
 include(cmakemodules/script_wxwidgets.cmake REQUIRED)   # Check for wxWidgets + GL
 include(cmakemodules/script_libdc1394.cmake REQUIRED)   # Check for libdc1394-2

apps/DifOdometry-Camera/CMakeLists.txt

@@ -0,0 +1,40 @@
+INCLUDE(../../cmakemodules/AssureCMakeRootFile.cmake) # Avoid user mistake in CMake source directory
+
+if (CMAKE_MRPT_HAS_OPENNI2) # This project can't be built without OpenNI2
+
+#-----------------------------------------------------------------
+# CMake file for the MRPT application:  ReactiveNav3D-Demo
+#
+#  Run with "cmake ." at the root directory
+#
+#  January 2014, Mariano Jaimez Tarifa <marianojt@uma.es>
+#-----------------------------------------------------------------
+PROJECT(DifOdometry-Camera)
+
+#MESSAGE(STATUS "Makefile for application: /apps/ReactiveNav3D-Demo ")
+
+# ---------------------------------------------
+# TARGET:
+# ---------------------------------------------
+# Define the executable target:
+ADD_EXECUTABLE(DifOdometry-Camera
+               DifOdometry_Camera_main.cpp
+			   DifOdometry_Camera.cpp
+			   DifOdometry_Camera.h)
+
+SET(TMP_TARGET_NAME "DifOdometry-Camera")
+
+
+
+# Add the required libraries for linking:
+TARGET_LINK_LIBRARIES(${TMP_TARGET_NAME} ${MRPT_LINKER_LIBS} ${OPENNI2_LIBRARIES})
+
+# Dependencies on MRPT libraries:
+#  Just mention the top-level dependency, the rest will be detected automatically, 
+#  and all the needed #include<> dirs added (see the script DeclareAppDependencies.cmake for further details)
+DeclareAppDependencies(${TMP_TARGET_NAME} mrpt-gui mrpt-opengl mrpt-vision)
+
+DeclareAppForInstall(${TMP_TARGET_NAME})
+
+endif (CMAKE_MRPT_HAS_OPENNI2) # This project can't be built without OpenNI2
+