summaryrefslogtreecommitdiffstats
path: root/main_func
diff options
context:
space:
mode:
authorEdoardo Pasca <edo.paskino@gmail.com>2017-08-04 16:13:19 +0100
committerEdoardo Pasca <edo.paskino@gmail.com>2017-08-04 16:13:19 +0100
commitaa29eea34e3240f5a32baec0290c38d3b8cc9428 (patch)
tree75450ed95e3b440d865450e1f0d3dfbdc9966857 /main_func
parent6be601cf2f6b64c76689a1c830a1879cc7ade817 (diff)
downloadregularization-aa29eea34e3240f5a32baec0290c38d3b8cc9428.tar.gz
regularization-aa29eea34e3240f5a32baec0290c38d3b8cc9428.tar.bz2
regularization-aa29eea34e3240f5a32baec0290c38d3b8cc9428.tar.xz
regularization-aa29eea34e3240f5a32baec0290c38d3b8cc9428.zip
removed definition of CopyImage
Diffstat (limited to 'main_func')
-rw-r--r--main_func/regularizers_CPU/FGP_TV_core.c13
-rw-r--r--main_func/regularizers_CPU/LLT_model_core.c11
2 files changed, 4 insertions, 20 deletions
diff --git a/main_func/regularizers_CPU/FGP_TV_core.c b/main_func/regularizers_CPU/FGP_TV_core.c
index c383a71..ed5d337 100644
--- a/main_func/regularizers_CPU/FGP_TV_core.c
+++ b/main_func/regularizers_CPU/FGP_TV_core.c
@@ -3,7 +3,7 @@ This work is part of the Core Imaging Library developed by
Visual Analytics and Imaging System Group of the Science Technology
Facilities Council, STFC
-Copyright 2017 Daniil Kazanteev
+Copyright 2017 Daniil Kazantsev
Copyright 2017 Srikanth Nagella, Edoardo Pasca
Licensed under the Apache License, Version 2.0 (the "License");
@@ -188,13 +188,4 @@ float Rupd_func3D(float *P1, float *P1_old, float *P2, float *P2_old, float *P3,
return 1;
}
-/* General Functions */
-/*****************************************************************/
-/* Copy Image */
-float copyIm(float *A, float *B, int dimX, int dimY, int dimZ)
-{
- int j;
-#pragma omp parallel for shared(A, B) private(j)
- for (j = 0; j<dimX*dimY*dimZ; j++) B[j] = A[j];
- return *B;
-}
+
diff --git a/main_func/regularizers_CPU/LLT_model_core.c b/main_func/regularizers_CPU/LLT_model_core.c
index 3098269..e027231 100644
--- a/main_func/regularizers_CPU/LLT_model_core.c
+++ b/main_func/regularizers_CPU/LLT_model_core.c
@@ -3,7 +3,7 @@ This work is part of the Core Imaging Library developed by
Visual Analytics and Imaging System Group of the Science Technology
Facilities Council, STFC
-Copyright 2017 Daniil Kazanteev
+Copyright 2017 Daniil Kazantsev
Copyright 2017 Srikanth Nagella, Edoardo Pasca
Licensed under the Apache License, Version 2.0 (the "License");
@@ -289,12 +289,5 @@ float cleanMap(unsigned short *Map, int dimX, int dimY, int dimZ)
return *Map;
}
-/* Copy Image */
-float copyIm(float *A, float *U, int dimX, int dimY, int dimZ)
-{
- int j;
-#pragma omp parallel for shared(A, U) private(j)
- for (j = 0; j<dimX*dimY*dimZ; j++) U[j] = A[j];
- return *U;
-}
+
/*********************3D *********************/ \ No newline at end of file