diff --git a/.gitignore b/.gitignore index b1aa150c..a5dcea72 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,8 @@ local _tmplist.txt .vscode +Testing/ + # # ignore all plugins by default # diff --git a/Testing/Temporary/LastTest.log b/Testing/Temporary/LastTest.log deleted file mode 100644 index e69de29b..00000000 diff --git a/src/COREMOD_arith/CMakeLists.txt b/src/COREMOD_arith/CMakeLists.txt index eadf1850..b34efb70 100644 --- a/src/COREMOD_arith/CMakeLists.txt +++ b/src/COREMOD_arith/CMakeLists.txt @@ -10,6 +10,7 @@ set(SOURCEFILES image_crop.c image_crop2D.c image_multicrop2D.c + image_cropmask.c image_merge3D.c image_norm.c image_pixremap.c diff --git a/src/COREMOD_arith/COREMOD_arith.c b/src/COREMOD_arith/COREMOD_arith.c index c9d417f5..dd1f75f9 100644 --- a/src/COREMOD_arith/COREMOD_arith.c +++ b/src/COREMOD_arith/COREMOD_arith.c @@ -50,9 +50,9 @@ //#include "COREMOD_arith/COREMOD_arith.h" #include "image_crop.h" -//#include "image_cropmask.h" #include "image_crop2D.h" #include "image_multicrop2D.h" +#include "image_cropmask.h" #include "image_dxdy.h" #include "image_norm.h" @@ -109,7 +109,7 @@ static errno_t init_module_CLI() CLIADDCMD_COREMOD_arith__image_normslice(); CLIADDCMD_COREMOD_arith__image_slicenormalize(); - //CLIADDCMD_COREMODE_arith__cropmask(); + CLIADDCMD_COREMODE_arith__cropmask(); CLIADDCMD_COREMODE_arith__crop2D(); CLIADDCMD_COREMODE_arith__multicrop2D(); diff --git a/src/COREMOD_arith/COREMOD_arith.h b/src/COREMOD_arith/COREMOD_arith.h index d93c15ab..c7ddf8b7 100644 --- a/src/COREMOD_arith/COREMOD_arith.h +++ b/src/COREMOD_arith/COREMOD_arith.h @@ -14,6 +14,7 @@ #include "COREMOD_arith/image_crop.h" #include "COREMOD_arith/image_crop2D.h" #include "COREMOD_arith/image_multicrop2D.h" +#include "COREMOD_arith/image_cropmask.h" #include "COREMOD_arith/image_dxdy.h" #include "COREMOD_arith/image_merge3D.h" #include "COREMOD_arith/image_stats.h" diff --git a/src/COREMOD_memory/logshmim.c b/src/COREMOD_memory/logshmim.c index 0767314d..b0a2ecb3 100644 --- a/src/COREMOD_memory/logshmim.c +++ b/src/COREMOD_memory/logshmim.c @@ -687,13 +687,6 @@ static errno_t compute_function() INSERT_STD_PROCINFO_COMPUTEFUNC_LOOPSTART { - //printf("Start loop\n"); - //fflush(stdout); - - //printf("triggerstatus = %d\n", processinfo->triggerstatus); - //fflush(stdout); - - if(processinfo->triggerstatus == PROCESSINFO_TRIGGERSTATUS_TIMEDOUT) { printf("------------ TIMEOUT\n");