Merge pull request #53 from alicevision/dev_alignfreeBug

[win32] Bugfix freeing page-aligned memory on Win32

Author: yann-lty

src/popsift/common/assist.h

@@ -139,4 +139,13 @@ static void* memalign(size_t alignment, size_t size)
 #endif
 }
 
+static void memalign_free( void* ptr )
+{
+#ifdef _WIN32
+    _aligned_free( ptr );
+#else
+    free( ptr );
+#endif
+}
+
 }; // namespace popsift

src/popsift/common/plane_2d.cu

@@ -101,20 +101,16 @@ void PlaneBase::freeHost2D( void* data, PlaneMapMode m )
 {
     if (!data)
         return;
-    if (m == CudaAllocated) {
+    else if (m == CudaAllocated) {
         cudaFreeHost(data);
         return;
     }
-    if (m == Unaligned) {
+    else if (m == Unaligned) {
         free(data);
         return;
     }
-    if (m == PageAligned) {
-#ifdef _WIN32
-	_aligned_free(data);
-#else
-	free(data);
-#endif
+    else if (m == PageAligned) {
+        memalign_free( data );
         return;
     }
     assert(!"Invalid PlaneMapMode");

src/popsift/features.cu

@@ -51,8 +51,8 @@ FeaturesHost::FeaturesHost( int num_ext, int num_ori )
 
 FeaturesHost::~FeaturesHost( )
 {
-    free( _ext );
-    free( _ori );
+    memalign_free( _ext );
+    memalign_free( _ori );
 }
 
 void FeaturesHost::reset( int num_ext, int num_ori )