Make KCF member variables constexpr where possible

[hercules2020/kcf.git] / Makefile

diff --git a/Makefile b/Makefile
index 542c419cc82724d383d7ad893e99cff589be873e..5ca40584a8c95041fa53ecb6bf807add51b0ece9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 
 BUILDS = opencvfft-st opencvfft-async opencvfft-openmp fftw fftw-async fftw-openmp fftw-big fftw-big-openmp cufftw cufftw-big cufftw-big-openmp cufft cufft-openmp cufft-big cufft-big-openmp
 TESTSEQ = bmx ball1 crossing racing book
-TESTFLAGS = default fit128
+TESTFLAGS = default fit
 
 all: $(BUILDS)
 
@@ -117,7 +117,7 @@ rule TEST_SEQ
   command = build-$$build/kcf_vot $$flags $$seq $(if $(TRAVIS),2>&1) >$$out $(if $(TRAVIS),| grep -v libdc1394); true
 rule PRINT_RESULTS
   description = Print results
-  command = ./wvtool -w131 -v run ./print-test-results $$in
+  command = ./wvtool -w120 -v run ./print-test-results $$in
 rule PLOT_RESULTS
   description = Plot results
   command = ./graphGen.sh -f -s $$in
@@ -150,5 +150,5 @@ define ninja-testcase
 build build-$(1)/kcf_vot-$(2)-$(3).log: TEST_SEQ build-$(1)/kcf_vot $(filter-out %/output.txt,$(wildcard vot2016/$(2)/*)) vot2016/$(2)
   build = $(1)
   seq = vot2016/$(2)
-  flags = $(if $(3:fit128=),,--fit=128)
+  flags = $(if $(3:fit128=),,--fit=128)$(if $(3:fit=),,--fit)
 endef