diff --git a/.gitignore b/.gitignore index 60663b5..bebb0db 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ # Object files *.o +*/mk/* # Libraries *.lib diff --git a/LocCorr_new/CMakeLists.txt b/LocCorr_new/CMakeLists.txt index f1e5509..00ddf1a 100644 --- a/LocCorr_new/CMakeLists.txt +++ b/LocCorr_new/CMakeLists.txt @@ -20,13 +20,13 @@ option(BASLER "Add Basler cameras support" OFF) option(GRASSHOPPER "Add GrassHopper cameras support" OFF) option(HIKROBOT "Add HikRobot cameras support" OFF) -# default flags -set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -W -Wextra -std=c17") +# default flags (c17 because MVS code have `typedef char bool`) +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -W -Wextra -Werror -std=c17") set(CMAKE_COLOR_MAKEFILE ON) # cmake -DDEBUG=yes -> debugging if(DEBUG) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Og -g3 -ggdb -fno-builtin-strlen -Werror") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Og -g3 -ggdb -fno-builtin-strlen") add_definitions(-DEBUG) set(CMAKE_BUILD_TYPE DEBUG) set(CMAKE_VERBOSE_MAKEFILE "ON") diff --git a/LocCorr_new/cameracapture.c b/LocCorr_new/cameracapture.c index cdac4d4..fa22143 100644 --- a/LocCorr_new/cameracapture.c +++ b/LocCorr_new/cameracapture.c @@ -301,7 +301,9 @@ int camcapture(void (*process)(Image*)){ } exptime = theconf.exptime; while(1){ +#ifdef EBUG double t0 = sl_dtime(); +#endif if(stopwork){ DBG("STOP"); break; diff --git a/LocCorr_new/imagefile.c b/LocCorr_new/imagefile.c index 5a31ad0..816368b 100644 --- a/LocCorr_new/imagefile.c +++ b/LocCorr_new/imagefile.c @@ -39,7 +39,7 @@ #include "median.h" typedef struct{ - const char signature[8]; + const uint8_t signature[8]; uint8_t len; InputType it; } imsign;