Merge branch 'development' of https://github.com/deephealthproject/ecvl…

… into development
deephealthproject · Apr 29, 2022 · 7f681f0 · 7f681f0
2 parents def3d2d + 83112f6
commit 7f681f0
Show file tree

Hide file tree

Showing 103 changed files with 407 additions and 133 deletions.
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -14,7 +14,6 @@ jobs:
     strategy:
       matrix:
         cfg:
-          - { os: windows-2016, c-version: vc15, cxx-version: vc15, generator: "Visual Studio 15 2017 Win64" }
           - { os: windows-2019, c-version: vc16, cxx-version: vc16, generator: "Visual Studio 16 2019" }
     steps:
       - uses: actions/checkout@v2

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,5 +1,5 @@
 # ECVL - European Computer Vision Library
-# Version: 1.0.0
+# Version: 1.0.2
 # copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab
 # Authors:
 #    Costantino Grana ([email protected])

diff --git a/README.md b/README.md
@@ -33,6 +33,18 @@ The ECVL documentation is available [here](https://deephealthproject.github.io/e
       </tr>
     </thead>
     <tbody>
+      <tr>
+        <td>1.0.1</td>
+        <td>1.0.4b</td>
+      </tr>
+      <tr>
+        <td>1.0.0</td>
+        <td>1.0.4b</td>
+      </tr>
+      <tr>
+        <td>0.4.2</td>
+        <td>1.0.3b</td>
+      </tr>
       <tr>
         <td>0.4.1</td>
         <td>1.0.2a</td>
@@ -194,20 +206,13 @@ Contributions of any kind are welcome!
     <td style="text-align:center">Jenkins</td>
     <td style="text-align:center"><a href="https://jenkins-master-deephealth-unix01.ing.unimore.it/job/DeepHealth/job/ecvl/job/master"><img src="https://jenkins-master-deephealth-unix01.ing.unimore.it/badge/job/DeepHealth/job/ecvl/job/master/windows_end" alt="Workflow status badge" loading="lazy" height="20"></a></td>
   </tr>
-  <tr>
-    <td style="text-align:center">Windows Server 2016</td>
-    <td style="text-align:center">VS 2017 15.9.28307</td>
-    <td style="text-align:center">3.4.14</td>
-    <td style="text-align:center">0.9.2b</td>
-    <td style="text-align:center">GitHub Actions</td>
-    <td style="text-align:center" rowspan="2"><a href="https://github.com/deephealthproject/ecvl/actions?query=workflow%3Awindows"><img src="https://github.com/deephealthproject/ecvl/workflows/windows/badge.svg" alt="Workflow status badge" loading="lazy" height="20"></a></td>
-  </tr>
   <tr>
     <td style="text-align:center">Windows Server 2019</td>
     <td style="text-align:center">VS 2019 16.9.31229</td>
     <td style="text-align:center">3.4.14</td>
     <td style="text-align:center">0.9.2b</td>
     <td style="text-align:center">GitHub Actions</td>
+    <td style="text-align:center"><a href="https://github.com/deephealthproject/ecvl/actions?query=workflow%3Awindows"><img src="https://github.com/deephealthproject/ecvl/workflows/windows/badge.svg" alt="Workflow status badge" loading="lazy" height="20"></a></td>
   </tr>
 </table>
 

diff --git a/cmake/ecvlConfig.cmake.in b/cmake/ecvlConfig.cmake.in
@@ -1,5 +1,5 @@
 # ECVL - European Computer Vision Library
-# Version: 1.0.0
+# Version: 1.0.2
 # copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab
 # Authors:
 #    Costantino Grana ([email protected])

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -1,5 +1,5 @@
 # ECVL - European Computer Vision Library
-# Version: 1.0.0
+# Version: 1.0.2
 # copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab
 # Authors:
 #    Costantino Grana ([email protected])

diff --git a/examples/example_core_iterators.cpp b/examples/example_core_iterators.cpp
@@ -1,6 +1,6 @@
 /*
 * ECVL - European Computer Vision Library
-* Version: 1.0.0
+* Version: 1.0.2
 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab
 * Authors:
 *    Costantino Grana ([email protected])

diff --git a/examples/example_dataset_generator.cpp b/examples/example_dataset_generator.cpp
@@ -1,6 +1,6 @@
 /*
 * ECVL - European Computer Vision Library
-* Version: 1.0.0
+* Version: 1.0.2
 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab
 * Authors:
 *    Costantino Grana ([email protected])

diff --git a/examples/example_dataset_parser.cpp b/examples/example_dataset_parser.cpp
@@ -1,6 +1,6 @@
 /*
 * ECVL - European Computer Vision Library
-* Version: 1.0.0
+* Version: 1.0.2
 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab
 * Authors:
 *    Costantino Grana ([email protected])

diff --git a/examples/example_ecvl_eddl.cpp b/examples/example_ecvl_eddl.cpp
@@ -1,6 +1,6 @@
 /*
 * ECVL - European Computer Vision Library
-* Version: 1.0.0
+* Version: 1.0.2
 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab
 * Authors:
 *    Costantino Grana ([email protected])

diff --git a/examples/example_ecvl_gui.cpp b/examples/example_ecvl_gui.cpp
@@ -1,6 +1,6 @@
 /*
 * ECVL - European Computer Vision Library
-* Version: 1.0.0
+* Version: 1.0.2
 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab
 * Authors:
 *    Costantino Grana ([email protected])

diff --git a/examples/example_image_view.cpp b/examples/example_image_view.cpp
@@ -1,6 +1,6 @@
 /*
 * ECVL - European Computer Vision Library
-* Version: 1.0.0
+* Version: 1.0.2
 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab
 * Authors:
 *    Costantino Grana ([email protected])

diff --git a/examples/example_imagewatch.cpp b/examples/example_imagewatch.cpp
@@ -1,6 +1,6 @@
 /*
 * ECVL - European Computer Vision Library
-* Version: 1.0.0
+* Version: 1.0.2
 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab
 * Authors:
 *    Costantino Grana ([email protected])

diff --git a/examples/example_imgcodecs.cpp b/examples/example_imgcodecs.cpp
@@ -1,6 +1,6 @@
 /*
 * ECVL - European Computer Vision Library
-* Version: 1.0.0
+* Version: 1.0.2
 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab
 * Authors:
 *    Costantino Grana ([email protected])

diff --git a/examples/example_imgproc.cpp b/examples/example_imgproc.cpp
@@ -1,6 +1,6 @@
 /*
 * ECVL - European Computer Vision Library
-* Version: 1.0.0
+* Version: 1.0.2
 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab
 * Authors:
 *    Costantino Grana ([email protected])

diff --git a/examples/example_moments.cpp b/examples/example_moments.cpp
@@ -1,6 +1,6 @@
 /*
 * ECVL - European Computer Vision Library
-* Version: 1.0.0
+* Version: 1.0.2
 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab
 * Authors:
 *    Costantino Grana ([email protected])

diff --git a/examples/example_nifti_dicom.cpp b/examples/example_nifti_dicom.cpp
@@ -1,6 +1,6 @@
 /*
 * ECVL - European Computer Vision Library
-* Version: 1.0.0
+* Version: 1.0.2
 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab
 * Authors:
 *    Costantino Grana ([email protected])
@@ -26,6 +26,9 @@ int main()
         return EXIT_FAILURE;
     }
 
+    // Resize all the dimensions
+    ResizeDim(nifti_image, nifti_image, { 256, 256, 256 });
+
     // Apply some processing
     int gamma = 3;
     cout << "Executing GammaContrast" << endl;

diff --git a/examples/example_openslide.cpp b/examples/example_openslide.cpp
@@ -1,6 +1,6 @@
 /*
 * ECVL - European Computer Vision Library
-* Version: 1.0.0
+* Version: 1.0.2
 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab
 * Authors:
 *    Costantino Grana ([email protected])

diff --git a/examples/example_performance.cpp b/examples/example_performance.cpp
@@ -1,6 +1,6 @@
 /*
 * ECVL - European Computer Vision Library
-* Version: 1.0.0
+* Version: 1.0.2
 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab
 * Authors:
 *    Costantino Grana ([email protected])

diff --git a/examples/example_pipeline.cpp b/examples/example_pipeline.cpp
@@ -1,6 +1,6 @@
 /*
 * ECVL - European Computer Vision Library
-* Version: 1.0.0
+* Version: 1.0.2
 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab
 * Authors:
 *    Costantino Grana ([email protected])

diff --git a/examples/example_threshold.cpp b/examples/example_threshold.cpp
@@ -1,6 +1,6 @@
 /*
 * ECVL - European Computer Vision Library
-* Version: 1.0.0
+* Version: 1.0.2
 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab
 * Authors:
 *    Costantino Grana ([email protected])

diff --git a/modules/core/CMakeLists.txt b/modules/core/CMakeLists.txt
@@ -1,5 +1,5 @@
 # ECVL - European Computer Vision Library
-# Version: 1.0.0
+# Version: 1.0.2
 # copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab
 # Authors:
 #    Costantino Grana ([email protected])

diff --git a/modules/core/include/ecvl/CMakeLists.txt b/modules/core/include/ecvl/CMakeLists.txt
@@ -1,5 +1,5 @@
 # ECVL - European Computer Vision Library
-# Version: 1.0.0
+# Version: 1.0.2
 # copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab
 # Authors:
 #    Costantino Grana ([email protected])

diff --git a/modules/core/include/ecvl/core.h b/modules/core/include/ecvl/core.h
@@ -1,6 +1,6 @@
 /*
 * ECVL - European Computer Vision Library
-* Version: 1.0.0
+* Version: 1.0.2
 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab
 * Authors:
 *    Costantino Grana ([email protected])

diff --git a/modules/core/include/ecvl/core/any.h b/modules/core/include/ecvl/core/any.h
@@ -1,6 +1,6 @@
 /*
 * ECVL - European Computer Vision Library
-* Version: 1.0.0
+* Version: 1.0.2
 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab
 * Authors:
 *    Costantino Grana ([email protected])

diff --git a/modules/core/include/ecvl/core/arithmetic.h b/modules/core/include/ecvl/core/arithmetic.h
@@ -1,6 +1,6 @@
 /*
 * ECVL - European Computer Vision Library
-* Version: 1.0.0
+* Version: 1.0.2
 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab
 * Authors:
 *    Costantino Grana ([email protected])

diff --git a/modules/core/include/ecvl/core/arithmetic_impl.inc.h b/modules/core/include/ecvl/core/arithmetic_impl.inc.h
@@ -1,6 +1,6 @@
 /*
 * ECVL - European Computer Vision Library
-* Version: 1.0.0
+* Version: 1.0.2
 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab
 * Authors:
 *    Costantino Grana ([email protected])

diff --git a/modules/core/include/ecvl/core/cpu_hal.h b/modules/core/include/ecvl/core/cpu_hal.h
@@ -1,6 +1,6 @@
 /*
 * ECVL - European Computer Vision Library
-* Version: 1.0.0
+* Version: 1.0.2
 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab
 * Authors:
 *    Costantino Grana ([email protected])
@@ -60,6 +60,7 @@ class CpuHal : public HardwareAbstractionLayer
     void ConvertTo(const Image& src, Image& dst, DataType dtype, bool saturate) override;
 
     void ResizeDim(const ecvl::Image& src, ecvl::Image& dst, const std::vector<int>& newdims, InterpolationType interp) override;
+    void Resize3D(const ecvl::Image& src, ecvl::Image& dst, const std::vector<int>& newdims, InterpolationType interp) override;
     void ResizeScale(const Image& src, Image& dst, const std::vector<double>& scales, InterpolationType interp) override;
     void Flip2D(const ecvl::Image& src, ecvl::Image& dst) override;
     void Mirror2D(const ecvl::Image& src, ecvl::Image& dst) override;
@@ -104,6 +105,7 @@ class CpuHal : public HardwareAbstractionLayer
     void Normalize(const Image& src, Image& dst, const std::vector<double>& mean, const std::vector<double>& std) override;
     void CenterCrop(const Image& src, Image& dst, const std::vector<int>& size) override;
     void ScaleTo(const Image& src, Image& dst, const double& new_min, const double& new_max) override;
+    void ScaleFromTo(const Image& src, Image& dst, const double& old_min, const double& old_max, const double& new_min, const double& new_max) override;
     void Pad(const Image& src, Image& dst, const std::vector<int>& padding, BorderType border_type, const int& border_value) override;
     void RandomCrop(const Image& src, Image& dst, const std::vector<int>& size, bool pad_if_needed, BorderType border_type, const int& border_value, const unsigned seed) override;
 

diff --git a/modules/core/include/ecvl/core/cuda/common.h b/modules/core/include/ecvl/core/cuda/common.h
@@ -1,6 +1,6 @@
 /*
 * ECVL - European Computer Vision Library
-* Version: 1.0.0
+* Version: 1.0.2
 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab
 * Authors:
 *    Costantino Grana ([email protected])

diff --git a/modules/core/include/ecvl/core/cuda/gpu_hal.h b/modules/core/include/ecvl/core/cuda/gpu_hal.h
@@ -1,6 +1,6 @@
 /*
 * ECVL - European Computer Vision Library
-* Version: 1.0.0
+* Version: 1.0.2
 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab
 * Authors:
 *    Costantino Grana ([email protected])

diff --git a/modules/core/include/ecvl/core/datatype.h b/modules/core/include/ecvl/core/datatype.h
@@ -1,6 +1,6 @@
 /*
 * ECVL - European Computer Vision Library
-* Version: 1.0.0
+* Version: 1.0.2
 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab
 * Authors:
 *    Costantino Grana ([email protected])

diff --git a/modules/core/include/ecvl/core/datatype_existing_tuples.inc.h b/modules/core/include/ecvl/core/datatype_existing_tuples.inc.h
@@ -1,6 +1,6 @@
 /*
 * ECVL - European Computer Vision Library
-* Version: 1.0.0
+* Version: 1.0.2
 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab
 * Authors:
 *    Costantino Grana ([email protected])

diff --git a/modules/core/include/ecvl/core/datatype_existing_tuples_signed.inc.h b/modules/core/include/ecvl/core/datatype_existing_tuples_signed.inc.h
@@ -1,6 +1,6 @@
 /*
 * ECVL - European Computer Vision Library
-* Version: 1.0.0
+* Version: 1.0.2
 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab
 * Authors:
 *    Costantino Grana ([email protected])

diff --git a/modules/core/include/ecvl/core/datatype_existing_tuples_unsigned.inc.h b/modules/core/include/ecvl/core/datatype_existing_tuples_unsigned.inc.h
@@ -1,6 +1,6 @@
 /*
 * ECVL - European Computer Vision Library
-* Version: 1.0.0
+* Version: 1.0.2
 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab
 * Authors:
 *    Costantino Grana ([email protected])

diff --git a/modules/core/include/ecvl/core/datatype_matrix.h b/modules/core/include/ecvl/core/datatype_matrix.h
@@ -1,6 +1,6 @@
 /*
 * ECVL - European Computer Vision Library
-* Version: 1.0.0
+* Version: 1.0.2
 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab
 * Authors:
 *    Costantino Grana ([email protected])

diff --git a/modules/core/include/ecvl/core/datatype_tuples.inc.h b/modules/core/include/ecvl/core/datatype_tuples.inc.h
@@ -1,6 +1,6 @@
 /*
 * ECVL - European Computer Vision Library
-* Version: 1.0.0
+* Version: 1.0.2
 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab
 * Authors:
 *    Costantino Grana ([email protected])

diff --git a/modules/core/include/ecvl/core/filesystem.h b/modules/core/include/ecvl/core/filesystem.h
@@ -1,6 +1,6 @@
 /*
 * ECVL - European Computer Vision Library
-* Version: 1.0.0
+* Version: 1.0.2
 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab
 * Authors:
 *    Costantino Grana ([email protected])

diff --git a/modules/core/include/ecvl/core/fpga_hal.h b/modules/core/include/ecvl/core/fpga_hal.h
@@ -1,6 +1,6 @@
 /*
 * ECVL - European Computer Vision Library
-* Version: 1.0.0
+* Version: 1.0.2
 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab
 * Authors:
 *    Costantino Grana ([email protected])

diff --git a/modules/core/include/ecvl/core/hal.h b/modules/core/include/ecvl/core/hal.h
@@ -1,6 +1,6 @@
 /*
 * ECVL - European Computer Vision Library
-* Version: 1.0.0
+* Version: 1.0.2
 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab
 * Authors:
 *    Costantino Grana ([email protected])
@@ -128,6 +128,7 @@ class HardwareAbstractionLayer
     virtual void ConvertTo(const Image& src, Image& dst, DataType dtype, bool saturate) { ECVL_ERROR_NOT_IMPLEMENTED }
 
     virtual void ResizeDim(const ecvl::Image& src, ecvl::Image& dst, const std::vector<int>& newdims, InterpolationType interp) { ECVL_ERROR_NOT_IMPLEMENTED }
+    virtual void Resize3D(const ecvl::Image& src, ecvl::Image& dst, const std::vector<int>& newdims, InterpolationType interp) { ECVL_ERROR_NOT_IMPLEMENTED }
     virtual void ResizeScale(const Image& src, Image& dst, const std::vector<double>& scales, InterpolationType interp) { ECVL_ERROR_NOT_IMPLEMENTED }
     virtual void Flip2D(const ecvl::Image& src, ecvl::Image& dst) { ECVL_ERROR_NOT_IMPLEMENTED }
     virtual void Mirror2D(const ecvl::Image& src, ecvl::Image& dst) { ECVL_ERROR_NOT_IMPLEMENTED }
@@ -172,6 +173,7 @@ class HardwareAbstractionLayer
     virtual void Normalize(const Image& src, Image& dst, const std::vector<double>& mean, const std::vector<double>& std) { ECVL_ERROR_NOT_IMPLEMENTED }
     virtual void CenterCrop(const ecvl::Image& src, ecvl::Image& dst, const std::vector<int>& size) { ECVL_ERROR_NOT_IMPLEMENTED }
     virtual void ScaleTo(const Image& src, Image& dst, const double& new_min, const double& new_max) { ECVL_ERROR_NOT_IMPLEMENTED }
+    virtual void ScaleFromTo(const Image& src, Image& dst, const double& old_min, const double& old_max, const double& new_min, const double& new_max) { ECVL_ERROR_NOT_IMPLEMENTED }
     virtual void Pad(const Image& src, Image& dst, const std::vector<int>& padding, BorderType border_type, const int& border_value) { ECVL_ERROR_NOT_IMPLEMENTED }
     virtual void RandomCrop(const Image& src, Image& dst, const std::vector<int>& size, bool pad_if_needed, BorderType border_type, const int& border_value, const unsigned seed) { ECVL_ERROR_NOT_IMPLEMENTED }
 

diff --git a/modules/core/include/ecvl/core/image.h b/modules/core/include/ecvl/core/image.h
@@ -1,6 +1,6 @@
 /*
 * ECVL - European Computer Vision Library
-* Version: 1.0.0
+* Version: 1.0.2
 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab
 * Authors:
 *    Costantino Grana ([email protected])

diff --git a/modules/core/include/ecvl/core/imgcodecs.h b/modules/core/include/ecvl/core/imgcodecs.h
@@ -1,6 +1,6 @@
 /*
 * ECVL - European Computer Vision Library
-* Version: 1.0.0
+* Version: 1.0.2
 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab
 * Authors:
 *    Costantino Grana ([email protected])