Merge branch 'seth_old' of https://github.com/seth-planet/flann

Author: Marius Muja

examples/CMakeLists.txt

@@ -14,7 +14,7 @@ if (HDF5_FOUND)
     include_directories(${HDF5_INCLUDE_DIR})
 
     add_executable(flann_example_cpp flann_example.cpp)
-    target_link_libraries(flann_example_cpp ${HDF5_LIBRARIES})
+    target_link_libraries(flann_example_cpp ${HDF5_LIBRARIES} flann_cpp)
     if (HDF5_IS_PARALLEL)
         target_link_libraries(flann_example_cpp ${MPI_LIBRARIES})
     endif()

src/cpp/CMakeLists.txt

@@ -1,11 +1,11 @@
-#include_directories(${CMAKE_SOURCE_DIR}/include algorithms util nn .)
+#include_directories(${CMAKE_SOURCE_DIR}/include algorithms ext util nn .)
 
 add_definitions(-D_FLANN_VERSION=${FLANN_VERSION})
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/flann/config.h.in ${CMAKE_CURRENT_SOURCE_DIR}/flann/config.h)
 
-file(GLOB_RECURSE C_SOURCES flann.cpp)
-file(GLOB_RECURSE CPP_SOURCES flann_cpp.cpp)
+file(GLOB_RECURSE C_SOURCES flann.cpp lz4.c lz4hc.c)
+file(GLOB_RECURSE CPP_SOURCES flann_cpp.cpp lz4.c lz4hc.c)
 file(GLOB_RECURSE CU_SOURCES *.cu)
 
 add_library(flann_cpp_s STATIC ${CPP_SOURCES})

src/cpp/flann/algorithms/nn_index.h

@@ -228,22 +228,26 @@ class NNIndex : public IndexBase
     	IndexHeader header;
 
     	if (Archive::is_saving::value) {
-    		header.data_type = flann_datatype_value<ElementType>::value;
-    		header.index_type = getType();
-    		header.rows = size_;
-    		header.cols = veclen_;
+            header.h.data_type = flann_datatype_value<ElementType>::value;
+            header.h.index_type = getType();
+            header.h.rows = size_;
+            header.h.cols = veclen_;
     	}
     	ar & header;
 
     	// sanity checks
     	if (Archive::is_loading::value) {
-    	    if (strcmp(header.signature,FLANN_SIGNATURE_)!=0) {
+            if (strncmp(header.h.signature,
+                        FLANN_SIGNATURE_,
+                        strlen(FLANN_SIGNATURE_)) != 0) {
     	        throw FLANNException("Invalid index file, wrong signature");
     	    }
-            if (header.data_type != flann_datatype_value<ElementType>::value) {
+
+            if (header.h.data_type != flann_datatype_value<ElementType>::value) {
                 throw FLANNException("Datatype of saved index is different than of the one to be created.");
             }
-            if (header.index_type != getType()) {
+
+            if (header.h.index_type != getType()) {
                 throw FLANNException("Saved index type is different then the current index type.");
             }
             // TODO: check for distance type