Skip to content

Commit

Permalink
Reinstate COREMOD_arith cropmask -- partially reverting 22840e4 (whic…
Browse files Browse the repository at this point in the history
…h introduced crop2D, but they're different)
  • Loading branch information
DasVinch committed Oct 1, 2024
1 parent 4006d03 commit 358aedb
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 9 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ local
_tmplist.txt
.vscode

Testing/

#
# ignore all plugins by default
#
Expand Down
Empty file removed Testing/Temporary/LastTest.log
Empty file.
1 change: 1 addition & 0 deletions src/COREMOD_arith/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/COREMOD_arith/COREMOD_arith.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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();

Expand Down
1 change: 1 addition & 0 deletions src/COREMOD_arith/COREMOD_arith.h
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
7 changes: 0 additions & 7 deletions src/COREMOD_memory/logshmim.c
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down

0 comments on commit 358aedb

Please sign in to comment.