Merge pull request flann-lib#254 from seth-planet/efficient_compression

Efficient compression

Author: mariusmuja

src/cpp/flann/algorithms/autotuned_index.h

@@ -208,17 +208,21 @@ class AutotunedIndex : public NNIndex<Distance>
 
     void saveIndex(FILE* stream)
     {
-    	serialization::SaveArchive sa(stream);
-    	sa & *this;
+        {
+            serialization::SaveArchive sa(stream);
+            sa & *this;
+        }
 
     	bestIndex_->saveIndex(stream);
     }
 
     void loadIndex(FILE* stream)
     {
-    	serialization::LoadArchive la(stream);
-    	la & *this;
-
+        {
+            serialization::LoadArchive la(stream);
+            la & *this;
+        }
+        
         IndexParams params;
         flann_algorithm_t index_type = get_param<flann_algorithm_t>(bestParams_,"algorithm");
         bestIndex_ = create_index_by_type<Distance>((flann_algorithm_t)index_type, dataset_, params, distance_);

src/cpp/flann/algorithms/nn_index.h

@@ -239,7 +239,7 @@ class NNIndex : public IndexBase
     	if (Archive::is_loading::value) {
             if (strncmp(header.h.signature,
                         FLANN_SIGNATURE_,
-                        strlen(FLANN_SIGNATURE_)) != 0) {
+                        strlen(FLANN_SIGNATURE_) - strlen("v0.0")) != 0) {
     	        throw FLANNException("Invalid index file, wrong signature");
     	    }