bugfix: resolved windows seg fault

rmsalinas · Jun 7, 2018 · f5733f5 · f5733f5 · rmsalinas · Jun 7, 2018
1 parent 049600a
commit f5733f5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/fbow.cpp b/src/fbow.cpp
@@ -46,7 +46,7 @@ void Vocabulary::setParams(int aligment, int k, int desc_type, int desc_size, in
     //give memory
     _params._total_size=_params._block_size_bytes_wp*_params._nblocks;
 #if _WIN32
-    _data = (char*)_aligned_malloc(_params._aligment, _params._total_size);
+    _data = (char*)_aligned_malloc(_params._total_size, _params._aligment);
 #else
     _data=(char*)aligned_alloc(_params._aligment,_params._total_size);
 #endif
@@ -153,7 +153,7 @@ void Vocabulary::fromStream(std::istream &str)throw(std::exception)
     str.read((char*)&_params,sizeof(params));
 
 #if _WIN32
-    _data = (char*)_aligned_malloc(_params._aligment, _params._total_size);
+    _data = (char*)_aligned_malloc(_params._total_size, _params._aligment);
 #else
     _data = (char*)aligned_alloc(_params._aligment, _params._total_size);
 #endif

diff --git a/src/fbow.h b/src/fbow.h
@@ -192,7 +192,7 @@ class FBOW_API Vocabulary
             _nwords=_block_desc_size_bytes_wp/sizeof(register_type );//number of aligned words
 
 #if _WIN32
-            feature = (register_type*)_aligned_malloc(aligment, _nwords * sizeof(register_type));
+            feature = (register_type*)_aligned_malloc(_nwords * sizeof(register_type), aligment);
 #else
             feature = (register_type*)aligned_alloc(aligment, _nwords * sizeof(register_type));
 #endif