Windows: fixes compatibility

vlfeat · Aug 21, 2013 · 4f0098f · 4f0098f
1 parent 71e7cc4
commit 4f0098f
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 10 deletions.
diff --git a/Makefile.mak b/Makefile.mak
@@ -139,6 +139,7 @@ objdir = $(bindir)\objs
 CFLAGS = /nologo /TC /MD \
          /D"_CRT_SECURE_NO_DEPRECATE" \
          /D"__LITTLE_ENDIAN__" \
+         /D"VL_DISABLE_AVX" \
          /I. \
          /W1 /Zp8 /openmp
 

diff --git a/toolbox/sift/vl_covdet.c b/toolbox/sift/vl_covdet.c
@@ -709,9 +709,9 @@ mexFunction(int nout, mxArray *out[],
           break ;
         }
         case VL_COVDET_DESC_LIOP :
-        {
-          // TODO: get parameters form input
+        {          // TODO: get parameters form input
           vl_size numFeatures = vl_covdet_get_num_features(covdet) ;
+          vl_size dimension ;
           VlCovDetFeature const * feature = vl_covdet_get_features(covdet);
           vl_index i ;
 
@@ -722,7 +722,7 @@ mexFunction(int nout, mxArray *out[],
           if (!vl_is_nan_f(liopIntensityThreshold)) {
             vl_liopdesc_set_intensity_threshold(liop, liopIntensityThreshold) ;
           }
-          vl_size dimension = vl_liopdesc_get_dimension(liop) ;
+          dimension = vl_liopdesc_get_dimension(liop) ;
           if (verbose) {
             mexPrintf("vl_covdet: descriptors: type=liop, "
                       "resolution=%d, extent=%g, smoothing=%g\n",

diff --git a/vl/gmm.c b/vl/gmm.c
@@ -880,6 +880,8 @@ VL_XCAT(_vl_gmm_restart_empty_modes_, SFX) (VlGMM * self, TYPE const * data)
 
   /* search for cluster with negligible weight and reassign them to fat clusters */
   for (i_cl = 0 ; i_cl < (signed)numClusters ; ++i_cl) {
+    double size = - VL_INFINITY_D ;
+    vl_index best = -1 ;
 
     if (mass[i_cl] >= VL_GMM_MIN_POSTERIOR *
         VL_MAX(1.0, (double) self->numData / self->numClusters))
@@ -891,9 +893,6 @@ VL_XCAT(_vl_gmm_restart_empty_modes_, SFX) (VlGMM * self, TYPE const * data)
       VL_PRINTF("gmm: mode %d is nearly empty (mass %f)\n", i_cl, mass[i_cl]) ;
     }
 
-    double size = - VL_INFINITY_D ;
-    vl_index best = -1 ;
-
     /*
      Search for the cluster that (approximately)
      maximally contribute to make the log-likelihood

diff --git a/vlfeat.vcproj b/vlfeat.vcproj
@@ -188,6 +188,14 @@
 				RelativePath=".\vl\getopt_long.h"
 				>
 			</File>
+			<File
+				RelativePath=".\vl\gmm.c"
+				>
+			</File>
+			<File
+				RelativePath=".\vl\gmm.h"
+				>
+			</File>
 			<File
 				RelativePath=".\vl\heap-def.h"
 				>
@@ -300,6 +308,14 @@
 				RelativePath=".\vl\mathop.h"
 				>
 			</File>
+			<File
+				RelativePath=".\vl\mathop_avx.c"
+				>
+			</File>
+			<File
+				RelativePath=".\vl\mathop_avx.h"
+				>
+			</File>
 			<File
 				RelativePath=".\vl\mathop_sse2.c"
 				>
@@ -641,10 +657,6 @@
 			RelativePath=".\Makefile.mak"
 			>
 		</File>
-		<File
-			RelativePath=".\readme.txt"
-			>
-		</File>
 	</Files>
 	<Globals>
 	</Globals>