From 6ab8b5811df8db5f77dad7c3a57be47c4a9fa75e Mon Sep 17 00:00:00 2001 From: Laura Canalini <44258837+lauracanalini@users.noreply.github.com> Date: Mon, 7 Feb 2022 18:31:38 +0100 Subject: [PATCH 01/10] Update github workflows --- .github/workflows/windows.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index aa3cfcc3..6a757f7e 100644 --- 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 From 4df5252627faaa2864ad806175163381a45632c3 Mon Sep 17 00:00:00 2001 From: simleo Date: Tue, 8 Feb 2022 10:26:55 +0100 Subject: [PATCH 02/10] add missing include to metadata.h --- modules/core/include/ecvl/core/metadata.h | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/core/include/ecvl/core/metadata.h b/modules/core/include/ecvl/core/metadata.h index 577ed2fe..82cc2a7f 100644 --- a/modules/core/include/ecvl/core/metadata.h +++ b/modules/core/include/ecvl/core/metadata.h @@ -14,6 +14,7 @@ #ifndef ECVL_METADATA_H_ #define ECVL_METADATA_H_ +#include #include #include #include "ecvl/core/any.h" From 5974e21d2198968464cbc6351d9a75dcbe94fdc3 Mon Sep 17 00:00:00 2001 From: Laura Canalini Date: Tue, 8 Feb 2022 10:38:37 +0100 Subject: [PATCH 03/10] Change some DLDataset attributes from protected to public --- modules/eddl/include/ecvl/support_eddl.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/eddl/include/ecvl/support_eddl.h b/modules/eddl/include/ecvl/support_eddl.h index 73dd7b1a..dc28ce0b 100644 --- a/modules/eddl/include/ecvl/support_eddl.h +++ b/modules/eddl/include/ecvl/support_eddl.h @@ -276,14 +276,7 @@ class DLDataset : public Dataset { const unsigned processor_count_ = std::thread::hardware_concurrency(); protected: - int batch_size_; /**< @brief Size of each dataset mini batch. */ - std::vector current_batch_; /**< @brief Number of batches already loaded for each split. */ - ColorType ctype_; /**< @brief ecvl::ColorType of the Dataset images. */ - ColorType ctype_gt_; /**< @brief ecvl::ColorType of the Dataset ground truth images. */ - DatasetAugmentations augs_; /**< @brief ecvl::DatasetAugmentations to be applied to the Dataset images (and ground truth if exist) for each split. */ unsigned num_workers_; /**< @brief Number of parallel workers. */ - ProducersConsumerQueue queue_; /**< @brief Producers-consumer queue of the dataset. */ - std::pair< std::vector, std::vector> tensors_shape_; /**< @brief Shape of sample and label tensors. */ std::vector> splits_tc_; /**< @brief Each dataset split has its own vector of threads, each of which has its counters: . */ std::vector producers_; /**< @brief Vector of threads representing the samples producers. */ bool active_ = false; /**< @brief Whether the threads have already been launched or not. */ @@ -317,6 +310,13 @@ class DLDataset : public Dataset int n_channels_; /**< @brief Number of channels of the images. */ int n_channels_gt_ = -1; /**< @brief Number of channels of the ground truth images. */ std::vector resize_dims_; /**< @brief Dimensions (HxW) to which Dataset images must be resized. */ + int batch_size_; /**< @brief Size of each dataset mini batch. */ + std::vector current_batch_; /**< @brief Number of batches already loaded for each split. */ + ColorType ctype_; /**< @brief ecvl::ColorType of the Dataset images. */ + ColorType ctype_gt_; /**< @brief ecvl::ColorType of the Dataset ground truth images. */ + DatasetAugmentations augs_; /**< @brief ecvl::DatasetAugmentations to be applied to the Dataset images (and ground truth if exist) for each split. */ + ProducersConsumerQueue queue_; /**< @brief Producers-consumer queue of the dataset. */ + std::pair< std::vector, std::vector> tensors_shape_; /**< @brief Shape of sample and label tensors. */ /** @param[in] filename Path to the Dataset file. From dbd340d7b7f749e184da2c70d427e7741157333f Mon Sep 17 00:00:00 2001 From: Laura Canalini Date: Tue, 8 Feb 2022 10:41:59 +0100 Subject: [PATCH 04/10] Update README.md --- README.md | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 293a211b..7cf43b08 100644 --- a/README.md +++ b/README.md @@ -33,6 +33,18 @@ The ECVL documentation is available [here](https://deephealthproject.github.io/e + + 1.0.1 + 1.0.4b + + + 1.0.0 + 1.0.4b + + + 0.4.2 + 1.0.3b + 0.4.1 1.0.2a @@ -194,20 +206,13 @@ Contributions of any kind are welcome! Jenkins Workflow status badge - - Windows Server 2016 - VS 2017 15.9.28307 - 3.4.14 - 0.9.2b - GitHub Actions - Workflow status badge - Windows Server 2019 VS 2019 16.9.31229 3.4.14 0.9.2b GitHub Actions + Workflow status badge From 1149dda91067483a74e1ffea920bee41cf5d088b Mon Sep 17 00:00:00 2001 From: Laura Canalini Date: Tue, 8 Feb 2022 10:58:32 +0100 Subject: [PATCH 05/10] Update version to 1.0.1 --- CMakeLists.txt | 2 +- cmake/ecvlConfig.cmake.in | 2 +- examples/CMakeLists.txt | 2 +- examples/example_core_iterators.cpp | 2 +- examples/example_dataset_generator.cpp | 2 +- examples/example_dataset_parser.cpp | 2 +- examples/example_ecvl_eddl.cpp | 2 +- examples/example_ecvl_gui.cpp | 2 +- examples/example_image_view.cpp | 2 +- examples/example_imagewatch.cpp | 2 +- examples/example_imgcodecs.cpp | 2 +- examples/example_imgproc.cpp | 2 +- examples/example_moments.cpp | 2 +- examples/example_nifti_dicom.cpp | 2 +- examples/example_openslide.cpp | 2 +- examples/example_performance.cpp | 2 +- examples/example_pipeline.cpp | 2 +- examples/example_threshold.cpp | 2 +- modules/core/CMakeLists.txt | 2 +- modules/core/include/ecvl/CMakeLists.txt | 2 +- modules/core/include/ecvl/core.h | 2 +- modules/core/include/ecvl/core/any.h | 2 +- modules/core/include/ecvl/core/arithmetic.h | 2 +- modules/core/include/ecvl/core/arithmetic_impl.inc.h | 2 +- modules/core/include/ecvl/core/cpu_hal.h | 2 +- modules/core/include/ecvl/core/cuda/common.h | 2 +- modules/core/include/ecvl/core/cuda/gpu_hal.h | 2 +- modules/core/include/ecvl/core/datatype.h | 2 +- modules/core/include/ecvl/core/datatype_existing_tuples.inc.h | 2 +- .../include/ecvl/core/datatype_existing_tuples_signed.inc.h | 2 +- .../include/ecvl/core/datatype_existing_tuples_unsigned.inc.h | 2 +- modules/core/include/ecvl/core/datatype_matrix.h | 2 +- modules/core/include/ecvl/core/datatype_tuples.inc.h | 2 +- modules/core/include/ecvl/core/filesystem.h | 2 +- modules/core/include/ecvl/core/fpga_hal.h | 2 +- modules/core/include/ecvl/core/hal.h | 2 +- modules/core/include/ecvl/core/image.h | 2 +- modules/core/include/ecvl/core/imgcodecs.h | 2 +- modules/core/include/ecvl/core/imgproc.h | 2 +- modules/core/include/ecvl/core/iterators.h | 2 +- modules/core/include/ecvl/core/iterators_impl.inc.h | 2 +- modules/core/include/ecvl/core/macros.h | 2 +- modules/core/include/ecvl/core/metadata.h | 2 +- modules/core/include/ecvl/core/optional.h | 2 +- modules/core/include/ecvl/core/saturate_cast.h | 2 +- modules/core/include/ecvl/core/standard_errors.h | 2 +- modules/core/include/ecvl/core/support_dcmtk.h | 2 +- modules/core/include/ecvl/core/support_nifti.h | 2 +- modules/core/include/ecvl/core/support_opencv.h | 2 +- modules/core/include/ecvl/core/support_openslide.h | 2 +- modules/core/include/ecvl/core/type_promotion.h | 2 +- modules/core/src/CMakeLists.txt | 2 +- modules/core/src/arithmetic.cpp | 2 +- modules/core/src/core.cpp | 2 +- modules/core/src/cpu_hal.cpp | 2 +- modules/core/src/cpu_hal_arithmetic.cpp | 2 +- modules/core/src/cpu_hal_imgproc.cpp | 2 +- modules/core/src/cpu_hal_volproc.cpp | 2 +- modules/core/src/cuda/gpu_hal.cpp | 2 +- modules/core/src/datatype.cpp | 2 +- modules/core/src/fpga_hal.cpp | 2 +- modules/core/src/hal.cpp | 2 +- modules/core/src/image.cpp | 2 +- modules/core/src/imgcodecs.cpp | 2 +- modules/core/src/imgproc.cpp | 2 +- modules/core/src/support_dcmtk.cpp | 2 +- modules/core/src/support_nifti.cpp | 2 +- modules/core/src/support_opencv.cpp | 2 +- modules/core/src/support_openslide.cpp | 2 +- modules/core/test/CMakeLists.txt | 2 +- modules/core/test/test_core.cpp | 2 +- modules/core/test/test_cuda.cu | 2 +- modules/core/test/test_cuda.h | 2 +- modules/core/test/test_imgproc.cpp | 2 +- modules/core/test/test_volproc.cpp | 2 +- modules/dataset/CMakeLists.txt | 2 +- modules/dataset/include/ecvl/CMakeLists.txt | 2 +- modules/dataset/include/ecvl/dataset_generator.h | 2 +- modules/dataset/include/ecvl/dataset_parser.h | 2 +- modules/dataset/src/CMakeLists.txt | 2 +- modules/dataset/src/dataset_generator.cpp | 2 +- modules/dataset/src/dataset_parser.cpp | 2 +- modules/dataset/test/CMakeLists.txt | 2 +- modules/dataset/test/test_dataset_parser.cpp | 2 +- modules/eddl/CMakeLists.txt | 2 +- modules/eddl/include/ecvl/CMakeLists.txt | 2 +- modules/eddl/include/ecvl/augmentations.h | 2 +- modules/eddl/include/ecvl/support_eddl.h | 2 +- modules/eddl/src/CMakeLists.txt | 2 +- modules/eddl/src/augmentations.cpp | 2 +- modules/eddl/src/support_eddl.cpp | 2 +- modules/eddl/test/CMakeLists.txt | 2 +- modules/eddl/test/test_eddl.cpp | 2 +- modules/gui/CMakeLists.txt | 2 +- modules/gui/include/ecvl/CMakeLists.txt | 2 +- modules/gui/include/ecvl/gui.h | 2 +- modules/gui/include/ecvl/gui/shader.h | 2 +- modules/gui/src/CMakeLists.txt | 2 +- modules/gui/src/gui.cpp | 2 +- modules/gui/src/gui3D.cpp | 2 +- spike/operators_lazy_evaluation.cpp | 2 +- 101 files changed, 101 insertions(+), 101 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9ceaba68..45aa309d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ # ECVL - European Computer Vision Library -# Version: 1.0.0 +# Version: 1.0.1 # copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab # Authors: # Costantino Grana (costantino.grana@unimore.it) diff --git a/cmake/ecvlConfig.cmake.in b/cmake/ecvlConfig.cmake.in index cb2a24da..cc8b9007 100644 --- 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.1 # copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab # Authors: # Costantino Grana (costantino.grana@unimore.it) diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index cd88d737..4c0393b6 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -1,5 +1,5 @@ # ECVL - European Computer Vision Library -# Version: 1.0.0 +# Version: 1.0.1 # copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab # Authors: # Costantino Grana (costantino.grana@unimore.it) diff --git a/examples/example_core_iterators.cpp b/examples/example_core_iterators.cpp index d0316092..533af250 100644 --- 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.1 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/examples/example_dataset_generator.cpp b/examples/example_dataset_generator.cpp index 10924d15..f123d459 100644 --- 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.1 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/examples/example_dataset_parser.cpp b/examples/example_dataset_parser.cpp index 211e66fe..419107a5 100644 --- 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.1 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/examples/example_ecvl_eddl.cpp b/examples/example_ecvl_eddl.cpp index 7eab74df..a115ecec 100644 --- 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.1 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/examples/example_ecvl_gui.cpp b/examples/example_ecvl_gui.cpp index 19e9b19b..21d8d2da 100644 --- 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.1 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/examples/example_image_view.cpp b/examples/example_image_view.cpp index 90e48d36..38f659f8 100644 --- 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.1 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/examples/example_imagewatch.cpp b/examples/example_imagewatch.cpp index 3c78972c..c5352305 100644 --- 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.1 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/examples/example_imgcodecs.cpp b/examples/example_imgcodecs.cpp index d4a01870..71c322dc 100644 --- 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.1 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/examples/example_imgproc.cpp b/examples/example_imgproc.cpp index 34dc02da..d548ef96 100644 --- 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.1 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/examples/example_moments.cpp b/examples/example_moments.cpp index 5c38f0ea..c3db7583 100644 --- 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.1 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/examples/example_nifti_dicom.cpp b/examples/example_nifti_dicom.cpp index 4f48499c..2330ef3e 100644 --- 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.1 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/examples/example_openslide.cpp b/examples/example_openslide.cpp index 6cefcc41..c8af5731 100644 --- 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.1 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/examples/example_performance.cpp b/examples/example_performance.cpp index 17647a77..45f1612c 100644 --- 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.1 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/examples/example_pipeline.cpp b/examples/example_pipeline.cpp index ce3d7109..029bfeae 100644 --- 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.1 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/examples/example_threshold.cpp b/examples/example_threshold.cpp index 5c255f0f..961301ef 100644 --- 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.1 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/CMakeLists.txt b/modules/core/CMakeLists.txt index 6e8fd43c..0c75c9a0 100644 --- 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.1 # copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab # Authors: # Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/include/ecvl/CMakeLists.txt b/modules/core/include/ecvl/CMakeLists.txt index 54cdd254..9d56fb66 100644 --- 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.1 # copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab # Authors: # Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/include/ecvl/core.h b/modules/core/include/ecvl/core.h index 57f64cd3..978729a4 100644 --- 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.1 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/include/ecvl/core/any.h b/modules/core/include/ecvl/core/any.h index 3f474068..10089561 100644 --- 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.1 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/include/ecvl/core/arithmetic.h b/modules/core/include/ecvl/core/arithmetic.h index a6c2047d..43588c9e 100644 --- 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.1 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/include/ecvl/core/arithmetic_impl.inc.h b/modules/core/include/ecvl/core/arithmetic_impl.inc.h index 3f60ae5f..334fe0a0 100644 --- 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.1 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/include/ecvl/core/cpu_hal.h b/modules/core/include/ecvl/core/cpu_hal.h index cbc7642b..23a871de 100644 --- 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.1 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/include/ecvl/core/cuda/common.h b/modules/core/include/ecvl/core/cuda/common.h index b6ac62f6..75b94e3d 100644 --- 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.1 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/include/ecvl/core/cuda/gpu_hal.h b/modules/core/include/ecvl/core/cuda/gpu_hal.h index d97b488b..dc846e02 100644 --- 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.1 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/include/ecvl/core/datatype.h b/modules/core/include/ecvl/core/datatype.h index 0906c491..d347221c 100644 --- 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.1 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/include/ecvl/core/datatype_existing_tuples.inc.h b/modules/core/include/ecvl/core/datatype_existing_tuples.inc.h index c8dc51fe..48d487f6 100644 --- 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.1 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) 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 index 4dd0fdbd..972bdbbf 100644 --- 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.1 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) 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 index 3fbd6371..3d0540b5 100644 --- 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.1 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/include/ecvl/core/datatype_matrix.h b/modules/core/include/ecvl/core/datatype_matrix.h index 234b533e..7b8b0ff7 100644 --- 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.1 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/include/ecvl/core/datatype_tuples.inc.h b/modules/core/include/ecvl/core/datatype_tuples.inc.h index 78dc6c0f..f649de8b 100644 --- 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.1 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/include/ecvl/core/filesystem.h b/modules/core/include/ecvl/core/filesystem.h index 7a74e63a..90553cc0 100644 --- 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.1 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/include/ecvl/core/fpga_hal.h b/modules/core/include/ecvl/core/fpga_hal.h index 75988810..588f5220 100644 --- 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.1 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/include/ecvl/core/hal.h b/modules/core/include/ecvl/core/hal.h index 0fd5e100..2e49aecd 100644 --- 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.1 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/include/ecvl/core/image.h b/modules/core/include/ecvl/core/image.h index b69a70fd..17e62f21 100644 --- 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.1 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/include/ecvl/core/imgcodecs.h b/modules/core/include/ecvl/core/imgcodecs.h index e0aa2d5e..4a0bc8ca 100644 --- 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.1 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/include/ecvl/core/imgproc.h b/modules/core/include/ecvl/core/imgproc.h index 7586ad83..02295711 100644 --- a/modules/core/include/ecvl/core/imgproc.h +++ b/modules/core/include/ecvl/core/imgproc.h @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.0 +* Version: 1.0.1 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/include/ecvl/core/iterators.h b/modules/core/include/ecvl/core/iterators.h index a90597fa..264a1bc8 100644 --- a/modules/core/include/ecvl/core/iterators.h +++ b/modules/core/include/ecvl/core/iterators.h @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.0 +* Version: 1.0.1 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/include/ecvl/core/iterators_impl.inc.h b/modules/core/include/ecvl/core/iterators_impl.inc.h index 8ff9ed68..ac8ec905 100644 --- a/modules/core/include/ecvl/core/iterators_impl.inc.h +++ b/modules/core/include/ecvl/core/iterators_impl.inc.h @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.0 +* Version: 1.0.1 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/include/ecvl/core/macros.h b/modules/core/include/ecvl/core/macros.h index 6daed6b9..3a0d872c 100644 --- a/modules/core/include/ecvl/core/macros.h +++ b/modules/core/include/ecvl/core/macros.h @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.0 +* Version: 1.0.1 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/include/ecvl/core/metadata.h b/modules/core/include/ecvl/core/metadata.h index 82cc2a7f..ab1d7eb5 100644 --- a/modules/core/include/ecvl/core/metadata.h +++ b/modules/core/include/ecvl/core/metadata.h @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 0.2.3 +* Version: 1.0.1 * copyright (c) 2020, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/include/ecvl/core/optional.h b/modules/core/include/ecvl/core/optional.h index 710a55fa..f1267891 100644 --- a/modules/core/include/ecvl/core/optional.h +++ b/modules/core/include/ecvl/core/optional.h @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.0 +* Version: 1.0.1 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/include/ecvl/core/saturate_cast.h b/modules/core/include/ecvl/core/saturate_cast.h index 3c74434f..1e40a80b 100644 --- a/modules/core/include/ecvl/core/saturate_cast.h +++ b/modules/core/include/ecvl/core/saturate_cast.h @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.0 +* Version: 1.0.1 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/include/ecvl/core/standard_errors.h b/modules/core/include/ecvl/core/standard_errors.h index 9ccdefd4..4392a391 100644 --- a/modules/core/include/ecvl/core/standard_errors.h +++ b/modules/core/include/ecvl/core/standard_errors.h @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.0 +* Version: 1.0.1 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/include/ecvl/core/support_dcmtk.h b/modules/core/include/ecvl/core/support_dcmtk.h index 8b3511d3..be381831 100644 --- a/modules/core/include/ecvl/core/support_dcmtk.h +++ b/modules/core/include/ecvl/core/support_dcmtk.h @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.0 +* Version: 1.0.1 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/include/ecvl/core/support_nifti.h b/modules/core/include/ecvl/core/support_nifti.h index 289c35aa..80f0443b 100644 --- a/modules/core/include/ecvl/core/support_nifti.h +++ b/modules/core/include/ecvl/core/support_nifti.h @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.0 +* Version: 1.0.1 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/include/ecvl/core/support_opencv.h b/modules/core/include/ecvl/core/support_opencv.h index 9d75fbfe..ff100b11 100644 --- a/modules/core/include/ecvl/core/support_opencv.h +++ b/modules/core/include/ecvl/core/support_opencv.h @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.0 +* Version: 1.0.1 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/include/ecvl/core/support_openslide.h b/modules/core/include/ecvl/core/support_openslide.h index 7113ac64..76a46a0c 100644 --- a/modules/core/include/ecvl/core/support_openslide.h +++ b/modules/core/include/ecvl/core/support_openslide.h @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.0 +* Version: 1.0.1 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/include/ecvl/core/type_promotion.h b/modules/core/include/ecvl/core/type_promotion.h index 5eeedfd4..18cce49c 100644 --- a/modules/core/include/ecvl/core/type_promotion.h +++ b/modules/core/include/ecvl/core/type_promotion.h @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.0 +* Version: 1.0.1 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/src/CMakeLists.txt b/modules/core/src/CMakeLists.txt index eadedf4e..8e27d569 100644 --- a/modules/core/src/CMakeLists.txt +++ b/modules/core/src/CMakeLists.txt @@ -1,5 +1,5 @@ # ECVL - European Computer Vision Library -# Version: 1.0.0 +# Version: 1.0.1 # copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab # Authors: # Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/src/arithmetic.cpp b/modules/core/src/arithmetic.cpp index 3da4d8ad..72ad18d8 100644 --- a/modules/core/src/arithmetic.cpp +++ b/modules/core/src/arithmetic.cpp @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.0 +* Version: 1.0.1 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/src/core.cpp b/modules/core/src/core.cpp index c5831240..b5dff268 100644 --- a/modules/core/src/core.cpp +++ b/modules/core/src/core.cpp @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.0 +* Version: 1.0.1 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/src/cpu_hal.cpp b/modules/core/src/cpu_hal.cpp index 088398c9..e7ab5a9f 100644 --- a/modules/core/src/cpu_hal.cpp +++ b/modules/core/src/cpu_hal.cpp @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.0 +* Version: 1.0.1 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/src/cpu_hal_arithmetic.cpp b/modules/core/src/cpu_hal_arithmetic.cpp index b8d645c1..e35deb3e 100644 --- a/modules/core/src/cpu_hal_arithmetic.cpp +++ b/modules/core/src/cpu_hal_arithmetic.cpp @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.0 +* Version: 1.0.1 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/src/cpu_hal_imgproc.cpp b/modules/core/src/cpu_hal_imgproc.cpp index 853c2f1c..7141e25e 100644 --- a/modules/core/src/cpu_hal_imgproc.cpp +++ b/modules/core/src/cpu_hal_imgproc.cpp @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.0 +* Version: 1.0.1 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/src/cpu_hal_volproc.cpp b/modules/core/src/cpu_hal_volproc.cpp index b1a8cbf0..50ba3c93 100644 --- a/modules/core/src/cpu_hal_volproc.cpp +++ b/modules/core/src/cpu_hal_volproc.cpp @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.0 +* Version: 1.0.1 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/src/cuda/gpu_hal.cpp b/modules/core/src/cuda/gpu_hal.cpp index 044ce81f..126b8a25 100644 --- a/modules/core/src/cuda/gpu_hal.cpp +++ b/modules/core/src/cuda/gpu_hal.cpp @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.0 +* Version: 1.0.1 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/src/datatype.cpp b/modules/core/src/datatype.cpp index 8be6b9f4..a70155ec 100644 --- a/modules/core/src/datatype.cpp +++ b/modules/core/src/datatype.cpp @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.0 +* Version: 1.0.1 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/src/fpga_hal.cpp b/modules/core/src/fpga_hal.cpp index f22e6e52..f7daa474 100644 --- a/modules/core/src/fpga_hal.cpp +++ b/modules/core/src/fpga_hal.cpp @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.0 +* Version: 1.0.1 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/src/hal.cpp b/modules/core/src/hal.cpp index 07719747..6ad5c08a 100644 --- a/modules/core/src/hal.cpp +++ b/modules/core/src/hal.cpp @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.0 +* Version: 1.0.1 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/src/image.cpp b/modules/core/src/image.cpp index 982fbb4f..f3ef2e81 100644 --- a/modules/core/src/image.cpp +++ b/modules/core/src/image.cpp @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.0 +* Version: 1.0.1 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/src/imgcodecs.cpp b/modules/core/src/imgcodecs.cpp index dae1e22f..88b129ad 100644 --- a/modules/core/src/imgcodecs.cpp +++ b/modules/core/src/imgcodecs.cpp @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.0 +* Version: 1.0.1 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/src/imgproc.cpp b/modules/core/src/imgproc.cpp index 9f53d738..28120b4d 100644 --- a/modules/core/src/imgproc.cpp +++ b/modules/core/src/imgproc.cpp @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.0 +* Version: 1.0.1 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/src/support_dcmtk.cpp b/modules/core/src/support_dcmtk.cpp index 974ef0a5..9cfecaa5 100644 --- a/modules/core/src/support_dcmtk.cpp +++ b/modules/core/src/support_dcmtk.cpp @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.0 +* Version: 1.0.1 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/src/support_nifti.cpp b/modules/core/src/support_nifti.cpp index 71d2cc80..b823c345 100644 --- a/modules/core/src/support_nifti.cpp +++ b/modules/core/src/support_nifti.cpp @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.0 +* Version: 1.0.1 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/src/support_opencv.cpp b/modules/core/src/support_opencv.cpp index f11cdb77..69802ee7 100644 --- a/modules/core/src/support_opencv.cpp +++ b/modules/core/src/support_opencv.cpp @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.0 +* Version: 1.0.1 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/src/support_openslide.cpp b/modules/core/src/support_openslide.cpp index 961c95a8..cf53e123 100644 --- a/modules/core/src/support_openslide.cpp +++ b/modules/core/src/support_openslide.cpp @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.0 +* Version: 1.0.1 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/test/CMakeLists.txt b/modules/core/test/CMakeLists.txt index db161045..40288b85 100644 --- a/modules/core/test/CMakeLists.txt +++ b/modules/core/test/CMakeLists.txt @@ -1,5 +1,5 @@ # ECVL - European Computer Vision Library -# Version: 1.0.0 +# Version: 1.0.1 # copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab # Authors: # Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/test/test_core.cpp b/modules/core/test/test_core.cpp index 5dfb1e4d..c5b18f53 100644 --- a/modules/core/test/test_core.cpp +++ b/modules/core/test/test_core.cpp @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.0 +* Version: 1.0.1 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/test/test_cuda.cu b/modules/core/test/test_cuda.cu index 573b6aeb..63e5461f 100644 --- a/modules/core/test/test_cuda.cu +++ b/modules/core/test/test_cuda.cu @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.0 +* Version: 1.0.1 * copyright (c) 2020, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/test/test_cuda.h b/modules/core/test/test_cuda.h index c610cf20..ad9ac180 100644 --- a/modules/core/test/test_cuda.h +++ b/modules/core/test/test_cuda.h @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.0 +* Version: 1.0.1 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/test/test_imgproc.cpp b/modules/core/test/test_imgproc.cpp index 96eeb691..c424c840 100644 --- a/modules/core/test/test_imgproc.cpp +++ b/modules/core/test/test_imgproc.cpp @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.0 +* Version: 1.0.1 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/test/test_volproc.cpp b/modules/core/test/test_volproc.cpp index 8a38a28d..cdc7ff79 100644 --- a/modules/core/test/test_volproc.cpp +++ b/modules/core/test/test_volproc.cpp @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.0 +* Version: 1.0.1 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/dataset/CMakeLists.txt b/modules/dataset/CMakeLists.txt index 99f31a72..d66907f3 100644 --- a/modules/dataset/CMakeLists.txt +++ b/modules/dataset/CMakeLists.txt @@ -1,5 +1,5 @@ # ECVL - European Computer Vision Library -# Version: 1.0.0 +# Version: 1.0.1 # copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab # Authors: # Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/dataset/include/ecvl/CMakeLists.txt b/modules/dataset/include/ecvl/CMakeLists.txt index f15c03b5..74a4a1fb 100644 --- a/modules/dataset/include/ecvl/CMakeLists.txt +++ b/modules/dataset/include/ecvl/CMakeLists.txt @@ -1,5 +1,5 @@ # ECVL - European Computer Vision Library -# Version: 1.0.0 +# Version: 1.0.1 # copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab # Authors: # Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/dataset/include/ecvl/dataset_generator.h b/modules/dataset/include/ecvl/dataset_generator.h index 4f99d027..a47b9023 100644 --- a/modules/dataset/include/ecvl/dataset_generator.h +++ b/modules/dataset/include/ecvl/dataset_generator.h @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.0 +* Version: 1.0.1 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/dataset/include/ecvl/dataset_parser.h b/modules/dataset/include/ecvl/dataset_parser.h index ce15760e..6413d9f5 100644 --- a/modules/dataset/include/ecvl/dataset_parser.h +++ b/modules/dataset/include/ecvl/dataset_parser.h @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.0 +* Version: 1.0.1 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/dataset/src/CMakeLists.txt b/modules/dataset/src/CMakeLists.txt index 5ab0270f..dfe30e07 100644 --- a/modules/dataset/src/CMakeLists.txt +++ b/modules/dataset/src/CMakeLists.txt @@ -1,5 +1,5 @@ # ECVL - European Computer Vision Library -# Version: 1.0.0 +# Version: 1.0.1 # copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab # Authors: # Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/dataset/src/dataset_generator.cpp b/modules/dataset/src/dataset_generator.cpp index 8fcdfd3e..f30143b1 100644 --- a/modules/dataset/src/dataset_generator.cpp +++ b/modules/dataset/src/dataset_generator.cpp @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.0 +* Version: 1.0.1 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/dataset/src/dataset_parser.cpp b/modules/dataset/src/dataset_parser.cpp index 32ce5d90..ee6df6c6 100644 --- a/modules/dataset/src/dataset_parser.cpp +++ b/modules/dataset/src/dataset_parser.cpp @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.0 +* Version: 1.0.1 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/dataset/test/CMakeLists.txt b/modules/dataset/test/CMakeLists.txt index 5b68bb25..17ec8773 100644 --- a/modules/dataset/test/CMakeLists.txt +++ b/modules/dataset/test/CMakeLists.txt @@ -1,5 +1,5 @@ # ECVL - European Computer Vision Library -# Version: 1.0.0 +# Version: 1.0.1 # copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab # Authors: # Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/dataset/test/test_dataset_parser.cpp b/modules/dataset/test/test_dataset_parser.cpp index c664be30..75a4e9f5 100644 --- a/modules/dataset/test/test_dataset_parser.cpp +++ b/modules/dataset/test/test_dataset_parser.cpp @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.0 +* Version: 1.0.1 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/eddl/CMakeLists.txt b/modules/eddl/CMakeLists.txt index b46dc606..3dc854ad 100644 --- a/modules/eddl/CMakeLists.txt +++ b/modules/eddl/CMakeLists.txt @@ -1,5 +1,5 @@ # ECVL - European Computer Vision Library -# Version: 1.0.0 +# Version: 1.0.1 # copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab # Authors: # Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/eddl/include/ecvl/CMakeLists.txt b/modules/eddl/include/ecvl/CMakeLists.txt index 89d14168..425e2deb 100644 --- a/modules/eddl/include/ecvl/CMakeLists.txt +++ b/modules/eddl/include/ecvl/CMakeLists.txt @@ -1,5 +1,5 @@ # ECVL - European Computer Vision Library -# Version: 1.0.0 +# Version: 1.0.1 # copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab # Authors: # Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/eddl/include/ecvl/augmentations.h b/modules/eddl/include/ecvl/augmentations.h index 7dcf6816..e439ff11 100644 --- a/modules/eddl/include/ecvl/augmentations.h +++ b/modules/eddl/include/ecvl/augmentations.h @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.0 +* Version: 1.0.1 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/eddl/include/ecvl/support_eddl.h b/modules/eddl/include/ecvl/support_eddl.h index dc28ce0b..6b2d0057 100644 --- a/modules/eddl/include/ecvl/support_eddl.h +++ b/modules/eddl/include/ecvl/support_eddl.h @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.0 +* Version: 1.0.1 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/eddl/src/CMakeLists.txt b/modules/eddl/src/CMakeLists.txt index 16fce161..52b236f1 100644 --- a/modules/eddl/src/CMakeLists.txt +++ b/modules/eddl/src/CMakeLists.txt @@ -1,5 +1,5 @@ # ECVL - European Computer Vision Library -# Version: 1.0.0 +# Version: 1.0.1 # copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab # Authors: # Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/eddl/src/augmentations.cpp b/modules/eddl/src/augmentations.cpp index 961847b8..14381b18 100644 --- a/modules/eddl/src/augmentations.cpp +++ b/modules/eddl/src/augmentations.cpp @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.0 +* Version: 1.0.1 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/eddl/src/support_eddl.cpp b/modules/eddl/src/support_eddl.cpp index 62bfce9e..cb5624db 100644 --- a/modules/eddl/src/support_eddl.cpp +++ b/modules/eddl/src/support_eddl.cpp @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.0 +* Version: 1.0.1 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/eddl/test/CMakeLists.txt b/modules/eddl/test/CMakeLists.txt index 07354650..29da757a 100644 --- a/modules/eddl/test/CMakeLists.txt +++ b/modules/eddl/test/CMakeLists.txt @@ -1,5 +1,5 @@ # ECVL - European Computer Vision Library -# Version: 1.0.0 +# Version: 1.0.1 # copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab # Authors: # Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/eddl/test/test_eddl.cpp b/modules/eddl/test/test_eddl.cpp index 55fa1bee..f94c613a 100644 --- a/modules/eddl/test/test_eddl.cpp +++ b/modules/eddl/test/test_eddl.cpp @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.0 +* Version: 1.0.1 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/gui/CMakeLists.txt b/modules/gui/CMakeLists.txt index 8a3f953a..2a598dbf 100644 --- a/modules/gui/CMakeLists.txt +++ b/modules/gui/CMakeLists.txt @@ -1,5 +1,5 @@ # ECVL - European Computer Vision Library -# Version: 1.0.0 +# Version: 1.0.1 # copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab # Authors: # Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/gui/include/ecvl/CMakeLists.txt b/modules/gui/include/ecvl/CMakeLists.txt index c6da1336..5f044d2b 100644 --- a/modules/gui/include/ecvl/CMakeLists.txt +++ b/modules/gui/include/ecvl/CMakeLists.txt @@ -1,5 +1,5 @@ # ECVL - European Computer Vision Library -# Version: 1.0.0 +# Version: 1.0.1 # copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab # Authors: # Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/gui/include/ecvl/gui.h b/modules/gui/include/ecvl/gui.h index df3f4da8..31189f8e 100644 --- a/modules/gui/include/ecvl/gui.h +++ b/modules/gui/include/ecvl/gui.h @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.0 +* Version: 1.0.1 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/gui/include/ecvl/gui/shader.h b/modules/gui/include/ecvl/gui/shader.h index 97f9c19f..eacd5331 100644 --- a/modules/gui/include/ecvl/gui/shader.h +++ b/modules/gui/include/ecvl/gui/shader.h @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.0 +* Version: 1.0.1 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/gui/src/CMakeLists.txt b/modules/gui/src/CMakeLists.txt index 41e98f89..e6d1edce 100644 --- a/modules/gui/src/CMakeLists.txt +++ b/modules/gui/src/CMakeLists.txt @@ -1,5 +1,5 @@ # ECVL - European Computer Vision Library -# Version: 1.0.0 +# Version: 1.0.1 # copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab # Authors: # Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/gui/src/gui.cpp b/modules/gui/src/gui.cpp index 16d99135..c39d82f9 100644 --- a/modules/gui/src/gui.cpp +++ b/modules/gui/src/gui.cpp @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.0 +* Version: 1.0.1 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/gui/src/gui3D.cpp b/modules/gui/src/gui3D.cpp index ab7b6e40..e92ef443 100644 --- a/modules/gui/src/gui3D.cpp +++ b/modules/gui/src/gui3D.cpp @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.0 +* Version: 1.0.1 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/spike/operators_lazy_evaluation.cpp b/spike/operators_lazy_evaluation.cpp index 6cba28e0..d3dd5559 100644 --- a/spike/operators_lazy_evaluation.cpp +++ b/spike/operators_lazy_evaluation.cpp @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.0 +* Version: 1.0.1 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) From 12ef0ce0b5b9f609d95da2d9b7517cf04d77d500 Mon Sep 17 00:00:00 2001 From: Laura Canalini Date: Mon, 21 Feb 2022 17:50:30 +0100 Subject: [PATCH 06/10] Add the possibility to resize 3rd dimension in ResizeDim --- examples/example_nifti_dicom.cpp | 3 + modules/core/include/ecvl/core/cpu_hal.h | 1 + modules/core/include/ecvl/core/hal.h | 1 + modules/core/include/ecvl/core/imgproc.h | 2 +- modules/core/src/cpu_hal_imgproc.cpp | 101 +++++++++++++++++++++++ modules/core/src/imgproc.cpp | 12 ++- modules/core/src/support_opencv.cpp | 33 ++++++-- 7 files changed, 143 insertions(+), 10 deletions(-) diff --git a/examples/example_nifti_dicom.cpp b/examples/example_nifti_dicom.cpp index 2330ef3e..d6146d4b 100644 --- a/examples/example_nifti_dicom.cpp +++ b/examples/example_nifti_dicom.cpp @@ -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/modules/core/include/ecvl/core/cpu_hal.h b/modules/core/include/ecvl/core/cpu_hal.h index 23a871de..ec29af3f 100644 --- a/modules/core/include/ecvl/core/cpu_hal.h +++ b/modules/core/include/ecvl/core/cpu_hal.h @@ -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& newdims, InterpolationType interp) override; + void Resize3D(const ecvl::Image& src, ecvl::Image& dst, const std::vector& newdims, InterpolationType interp) override; void ResizeScale(const Image& src, Image& dst, const std::vector& scales, InterpolationType interp) override; void Flip2D(const ecvl::Image& src, ecvl::Image& dst) override; void Mirror2D(const ecvl::Image& src, ecvl::Image& dst) override; diff --git a/modules/core/include/ecvl/core/hal.h b/modules/core/include/ecvl/core/hal.h index 2e49aecd..dbf6a503 100644 --- a/modules/core/include/ecvl/core/hal.h +++ b/modules/core/include/ecvl/core/hal.h @@ -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& newdims, InterpolationType interp) { ECVL_ERROR_NOT_IMPLEMENTED } + virtual void Resize3D(const ecvl::Image& src, ecvl::Image& dst, const std::vector& newdims, InterpolationType interp) { ECVL_ERROR_NOT_IMPLEMENTED } virtual void ResizeScale(const Image& src, Image& dst, const std::vector& 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 } diff --git a/modules/core/include/ecvl/core/imgproc.h b/modules/core/include/ecvl/core/imgproc.h index 02295711..597d95bf 100644 --- a/modules/core/include/ecvl/core/imgproc.h +++ b/modules/core/include/ecvl/core/imgproc.h @@ -61,7 +61,7 @@ The function resizes Image src and outputs the result in dst. @param[in] src The input Image. @param[out] dst The output resized Image. @param[in] newdims std::vector that specifies the new size of each dimension. - The vector size must match the src Image dimensions, excluding the color channel. + The vector must be {new_width, new_height[, new_depth]}. @param[in] interp InterpolationType to be used. Default is InterpolationType::linear. */ diff --git a/modules/core/src/cpu_hal_imgproc.cpp b/modules/core/src/cpu_hal_imgproc.cpp index 7141e25e..6ce61932 100644 --- a/modules/core/src/cpu_hal_imgproc.cpp +++ b/modules/core/src/cpu_hal_imgproc.cpp @@ -66,6 +66,107 @@ void CpuHal::ResizeDim(const ecvl::Image& src, ecvl::Image& dst, const std::vect dst.meta_ = meta; } +void CpuHal::Resize3D(const ecvl::Image& src, ecvl::Image& dst, const std::vector& newdims, InterpolationType interp) +{ + Image resized_2d; + + ResizeDim(src, resized_2d, { newdims[0], newdims[1] }, interp); + + size_t c_pos = resized_2d.channels_.find('c'); + if (c_pos == string::npos) { + c_pos = resized_2d.channels_.find('z'); + } + if (c_pos == string::npos) { + c_pos = resized_2d.channels_.find('o'); + } + size_t x_pos = resized_2d.channels_.find('x'); + size_t y_pos = resized_2d.channels_.find('y'); + + int src_width = resized_2d.Width(); + int src_height = resized_2d.Height(); + int src_channels = resized_2d.Channels(); + + if (src_channels == newdims[2]) { + dst = std::move(resized_2d); + return; + } + + int src_stride_c = resized_2d.strides_[c_pos]; + int src_stride_x = resized_2d.strides_[x_pos]; + int src_stride_y = resized_2d.strides_[y_pos]; + + vector dims(3); + dims[x_pos] = src_channels; dims[y_pos] = src_width * src_height; dims[c_pos] = 1; + Image tmp(dims, resized_2d.elemtype_, resized_2d.channels_, ColorType::none); + vector src_vch(src_channels); + + for (int i = 0; i < src_channels; ++i) { + src_vch[i] = resized_2d.data_ + i * src_stride_c; + } + uint8_t* data = tmp.data_; + + for (int r = 0; r < src_height; ++r) { + int r1 = r * src_stride_y; + for (int c = 0; c < src_width; ++c) { + int p1 = r1 + src_stride_x * c; +#define ECVL_TUPLE(type, ...) \ + case DataType::type: \ + for (int ch = 0; ch < src_channels; ++ch) { \ + *reinterpret_cast*>(data) = *reinterpret_cast*>(src_vch[ch] + p1); \ + data += tmp.elemsize_; \ + } \ + break; + + switch (src.elemtype_) { +#include "ecvl/core/datatype_existing_tuples.inc.h" + } + +#undef ECVL_TUPLE + } + } + + ResizeDim(tmp, tmp, { newdims[2], tmp.Height() }, interp); + dims[x_pos] = newdims[0]; dims[y_pos] = newdims[1]; dims[c_pos] = newdims[2]; + Image output(dims, src.elemtype_, src.channels_, src.colortype_, src.spacings_, src.dev_, src.meta_); + + int output_width = output.Width(); + int output_height = output.Height(); + int output_channels = output.Channels(); + + int output_stride_c = output.strides_[c_pos]; + int output_stride_x = output.strides_[x_pos]; + int output_stride_y = output.strides_[y_pos]; + + vector output_vch(output_channels); + + for (int i = 0; i < output_channels; ++i) { + output_vch[i] = output.data_ + i * output_stride_c; + } + data = tmp.data_; + + for (int r = 0; r < output_height; ++r) { + int r1 = r * output_stride_y; + for (int c = 0; c < output_width; ++c) { + int p1 = r1 + output_stride_x * c; +#define ECVL_TUPLE(type, ...) \ + case DataType::type: \ + for (int ch = 0; ch < output_channels; ++ch) { \ + *reinterpret_cast*>(output_vch[ch] + p1) = *reinterpret_cast*>(data); \ + data += tmp.elemsize_;\ + } \ + break; + + switch (src.elemtype_) { +#include "ecvl/core/datatype_existing_tuples.inc.h" + } + +#undef ECVL_TUPLE + } + } + + dst = std::move(output); +} + void CpuHal::ResizeScale(const Image& src, Image& dst, const std::vector& scales, InterpolationType interp) { OpenCVAlwaysCheck(src); diff --git a/modules/core/src/imgproc.cpp b/modules/core/src/imgproc.cpp index 28120b4d..c3ad8fd9 100644 --- a/modules/core/src/imgproc.cpp +++ b/modules/core/src/imgproc.cpp @@ -36,7 +36,7 @@ bool ChannelsCheck(const Image& src, Image& tmp) ECVL_ERROR_NOT_IMPLEMENTED } - // check if channels_ starts with "xy" + // check if channels_ starts with "xy" if (src.channels_.rfind("xy", 0) != string::npos) { return true; // don't need to rearrange } @@ -70,11 +70,15 @@ void ResizeDim(const ecvl::Image& src, ecvl::Image& dst, const std::vector& { AlwaysCheck(src, dst); - if (newdims.size() != 2) { + if (newdims.size() == 2) { + src.hal_->ResizeDim(src, dst, newdims, interp); + } + else if (newdims.size() == 3) { + src.hal_->Resize3D(src, dst, newdims, interp); + } + else { ECVL_ERROR_WRONG_PARAMS("Number of dimensions specified doesn't match image dimensions") } - - src.hal_->ResizeDim(src, dst, newdims, interp); } void ResizeScale(const Image& src, Image& dst, const std::vector& scales, InterpolationType interp) diff --git a/modules/core/src/support_opencv.cpp b/modules/core/src/support_opencv.cpp index 69802ee7..cb910da2 100644 --- a/modules/core/src/support_opencv.cpp +++ b/modules/core/src/support_opencv.cpp @@ -47,6 +47,7 @@ Image MatToImage(const cv::Mat& m, ColorType ctype, const std::string& dst_chann // Channels and colors std::string channels; + char depth; if (m.dims < 2) { ECVL_ERROR_UNSUPPORTED_OPENCV_DIMS } @@ -55,6 +56,7 @@ Image MatToImage(const cv::Mat& m, ColorType ctype, const std::string& dst_chann } else if (m.dims == 3) { channels = "xyz"; + depth = 'z'; } else { ECVL_ERROR_UNSUPPORTED_OPENCV_DIMS @@ -63,25 +65,46 @@ Image MatToImage(const cv::Mat& m, ColorType ctype, const std::string& dst_chann ColorType colortype; if (m.type() == CV_8UC1 || m.type() == CV_16UC1 || m.type() == CV_32FC1 || m.type() == CV_64FC1 || m.type() == CV_8SC1 || m.type() == CV_16SC1 || m.type() == CV_32SC1) { // Guess this is a gray level image - channels += "c"; + depth = 'c'; dims.push_back(1); // Add another dim for color planes (but it is one dimensional) colortype = ColorType::GRAY; } else if (m.type() == CV_8UC3 || m.type() == CV_16UC3 || m.type() == CV_32FC3 || m.type() == CV_64FC3 - || m.type() == CV_8SC3 || m.type() == CV_16SC3 || m.type() == CV_32SC3) { // Guess this is a BGR image - channels += "c"; + || m.type() == CV_8SC3 || m.type() == CV_16SC3 || m.type() == CV_32SC3) { // Guess this is a BGR image + depth = 'c'; dims.push_back(3); // Add another dim for color planes colortype = ColorType::BGR; } else if (m.channels() == 1) { colortype = ColorType::none; } + else if (dst_channels.find('z') != std::string::npos) { + if (channels.find('z') == std::string::npos) { + depth = 'z'; + } + dims.push_back(m.channels()); // Add another dim for color planes + colortype = ColorType::none; + } else { - channels += "o"; + depth = 'o'; dims.push_back(m.channels()); // Add another dim for color planes colortype = ColorType::none; } + channels += depth; + auto channels_depth = channels.find(depth); + + auto dst_depth = dst_channels.find('c'); + if (dst_depth == std::string::npos) { + dst_depth = dst_channels.find('z'); + if (dst_depth == std::string::npos) { + dst_depth = dst_channels.find('o'); + } + } + + if (dst_depth != std::string::npos) { + channels[channels_depth] = dst_channels[dst_depth]; + } img.Create(dims, elemtype, channels, colortype); // The following code copies the data twice. Should be improved! @@ -233,7 +256,7 @@ Image MatVecToImage(const std::vector& v) /*memcpy(img.data_ + i * img.strides_.back() + j * img.strides_[img.strides_.size() - 2], vchannels[i].data, img.strides_[img.strides_.size() - 2]);*/ img.hal_->MemCopy(img.data_ + i * img.strides_.back() + j * img.strides_[img.strides_.size() - 2], - vchannels[i].data, img.strides_[img.strides_.size() - 2]); + vchannels[i].data, img.strides_[img.strides_.size() - 2]); } } } From c8f3c10c4d9ba98b960df166031e365d9239fcb5 Mon Sep 17 00:00:00 2001 From: Laura Canalini Date: Tue, 1 Mar 2022 17:23:06 +0100 Subject: [PATCH 07/10] Add ScaleFromTo and AugScaleFromTo --- modules/core/include/ecvl/core/cpu_hal.h | 1 + modules/core/include/ecvl/core/hal.h | 1 + modules/core/include/ecvl/core/imgproc.h | 14 ++++++++ modules/core/src/cpu_hal_imgproc.cpp | 40 +++++++++++++++++++++ modules/core/src/imgproc.cpp | 6 ++++ modules/core/test/test_imgproc.cpp | 13 +++++++ modules/eddl/include/ecvl/augmentations.h | 42 +++++++++++++++++++++++ modules/eddl/src/augmentations.cpp | 1 + 8 files changed, 118 insertions(+) diff --git a/modules/core/include/ecvl/core/cpu_hal.h b/modules/core/include/ecvl/core/cpu_hal.h index ec29af3f..dffd828e 100644 --- a/modules/core/include/ecvl/core/cpu_hal.h +++ b/modules/core/include/ecvl/core/cpu_hal.h @@ -105,6 +105,7 @@ class CpuHal : public HardwareAbstractionLayer void Normalize(const Image& src, Image& dst, const std::vector& mean, const std::vector& std) override; void CenterCrop(const Image& src, Image& dst, const std::vector& 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& padding, BorderType border_type, const int& border_value) override; void RandomCrop(const Image& src, Image& dst, const std::vector& size, bool pad_if_needed, BorderType border_type, const int& border_value, const unsigned seed) override; diff --git a/modules/core/include/ecvl/core/hal.h b/modules/core/include/ecvl/core/hal.h index dbf6a503..fdc59e7f 100644 --- a/modules/core/include/ecvl/core/hal.h +++ b/modules/core/include/ecvl/core/hal.h @@ -173,6 +173,7 @@ class HardwareAbstractionLayer virtual void Normalize(const Image& src, Image& dst, const std::vector& mean, const std::vector& std) { ECVL_ERROR_NOT_IMPLEMENTED } virtual void CenterCrop(const ecvl::Image& src, ecvl::Image& dst, const std::vector& 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& padding, BorderType border_type, const int& border_value) { ECVL_ERROR_NOT_IMPLEMENTED } virtual void RandomCrop(const Image& src, Image& dst, const std::vector& 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/imgproc.h b/modules/core/include/ecvl/core/imgproc.h index 597d95bf..dc9d801a 100644 --- a/modules/core/include/ecvl/core/imgproc.h +++ b/modules/core/include/ecvl/core/imgproc.h @@ -682,6 +682,20 @@ The function linearly rescale the Image having values in [min,max] into a new ar */ void ScaleTo(const Image& src, Image& dst, const double& new_min, const double& new_max); +/** @brief Linearly scale an Image from a specified range into a new range. + +The function linearly rescale the Image from the range [old_min,old_max] into a new arbitrary range [new_min,new_max]. +If the pixel value is less than old_min or greater than old_max it will be replaced with these range boundaries. + +@param[in] src The input Image. +@param[out] dst The output resized Image. +@param[in] old_min double which indicates the old minimum value. +@param[in] old_max double which indicates the old maximum value. +@param[in] new_min double which indicates the new minimum value. +@param[in] new_max double which indicates the new maximum value. +*/ +void ScaleFromTo(const Image& src, Image& dst, const double& old_min, const double& old_max, const double& new_min, const double& new_max); + /** @brief Pad an Image. A border is added to the 4 sides of the Image. It can be specified equal for all the sides, equal for top and bottom and for left and right or different for all the sides. diff --git a/modules/core/src/cpu_hal_imgproc.cpp b/modules/core/src/cpu_hal_imgproc.cpp index 6ce61932..47c02b00 100644 --- a/modules/core/src/cpu_hal_imgproc.cpp +++ b/modules/core/src/cpu_hal_imgproc.cpp @@ -2315,6 +2315,46 @@ void CpuHal::ScaleTo(const Image& src, Image& dst, const double& new_min, const dst = std::move(tmp); } +template +struct ScaleFromToStruct +{ + static void _(const Image& src, Image& dst, const double& old_min, const double& old_max, const double& new_min, const double& new_max) + { + // Formula + // newvalue = (new_max - new_min)/(max - min)*(value - max) + new_max + // or + // newvalue = a * value + b + // a = (new_max - new_min)/(max - min) + // b = new_max - a * max + ConstView src_v(src); + View dst_v(dst); + + double a = (new_max - new_min) / (old_max - old_min); + double b = new_max - a * old_max; + + auto dst_it = dst_v.Begin(); + auto src_it = src_v.Begin(), src_end = src_v.End(); + for (; src_it != src_end; ++src_it, ++dst_it) { + TypeInfo_t src_val = *src_it; + if (src_val < old_min) { + src_val = saturate_cast>(old_min); + } + else if (src_val > old_max) { + src_val = saturate_cast>(old_max); + } + *dst_it = saturate_cast>(src_val * a + b); + } + } +}; + +void CpuHal::ScaleFromTo(const Image& src, Image& dst, const double& old_min, const double& old_max, const double& new_min, const double& new_max) +{ + Image tmp{ src.dims_, src.elemtype_, src.channels_, src.colortype_, src.spacings_, src.dev_, src.meta_ }; + static constexpr Table1D table; + table(src.elemtype_)(src, tmp, old_min, old_max, new_min, new_max); + dst = std::move(tmp); +} + template struct RandomCropStruct { diff --git a/modules/core/src/imgproc.cpp b/modules/core/src/imgproc.cpp index c3ad8fd9..6e994cd2 100644 --- a/modules/core/src/imgproc.cpp +++ b/modules/core/src/imgproc.cpp @@ -727,6 +727,12 @@ void ScaleTo(const Image& src, Image& dst, const double& new_min, const double& return src.hal_->ScaleTo(src, dst, new_min, new_max); } +void ScaleFromTo(const Image& src, Image& dst, const double& old_min, const double& old_max, const double& new_min, const double& new_max) +{ + AlwaysCheck(src, dst); + return src.hal_->ScaleFromTo(src, dst, old_min, old_max, new_min, new_max); +} + void Pad(const Image& src, Image& dst, const vector& padding, BorderType border_type, const int& border_value) { AlwaysCheck(src, dst); diff --git a/modules/core/test/test_imgproc.cpp b/modules/core/test/test_imgproc.cpp index c424c840..e4c1e30a 100644 --- a/modules/core/test/test_imgproc.cpp +++ b/modules/core/test/test_imgproc.cpp @@ -787,6 +787,19 @@ TEST_F(Imgproc, ScaleTo_##type) \ EXPECT_TRUE(out_v({ 0,1,0 }) == static_cast>((g2_##type##_v({ 0,1,0 }) * (1 / 46.) + (1 - ((1 / 46.) * 60))))); \ EXPECT_TRUE(out_v({ 1,1,0 }) == static_cast>((g2_##type##_v({ 1,1,0 }) * (1 / 46.) + (1 - ((1 / 46.) * 60))))); \ }\ +TEST_F(Imgproc, ScaleFromTo_##type) \ +{ \ + ScaleFromTo(g2_##type, out, 14, 60, 14, 60); \ + View out_v(out); \ + EXPECT_TRUE(out_v({ 0,0,0 }) == 50); EXPECT_TRUE(out_v({ 1,0,0 }) == 32); \ + EXPECT_TRUE(out_v({ 0,1,0 }) == 14); EXPECT_TRUE(out_v({ 1,1,0 }) == 60); \ + ScaleFromTo(g2_##type, out, 14, 60, 0, 1); \ + out_v = out; \ + EXPECT_TRUE(out_v({ 0,0,0 }) == static_cast>((g2_##type##_v({ 0,0,0 }) * (1 / 46.) + (1 - ((1 / 46.) * 60))))); \ + EXPECT_TRUE(out_v({ 1,0,0 }) == static_cast>((g2_##type##_v({ 1,0,0 }) * (1 / 46.) + (1 - ((1 / 46.) * 60))))); \ + EXPECT_TRUE(out_v({ 0,1,0 }) == static_cast>((g2_##type##_v({ 0,1,0 }) * (1 / 46.) + (1 - ((1 / 46.) * 60))))); \ + EXPECT_TRUE(out_v({ 1,1,0 }) == static_cast>((g2_##type##_v({ 1,1,0 }) * (1 / 46.) + (1 - ((1 / 46.) * 60))))); \ +}\ \ TEST_F(Imgproc, GammaContrast_##type) \ { \ diff --git a/modules/eddl/include/ecvl/augmentations.h b/modules/eddl/include/ecvl/augmentations.h index e439ff11..3fd3d677 100644 --- a/modules/eddl/include/ecvl/augmentations.h +++ b/modules/eddl/include/ecvl/augmentations.h @@ -1507,6 +1507,48 @@ class AugScaleTo : public Augmentation } }; +/** @brief Augmentation wrapper for ecvl::ScaleFromTo. + +@anchor AugScaleFromTo +*/ +class AugScaleFromTo : public Augmentation +{ + double old_min_, old_max_, new_min_, new_max_; + + virtual void RealApply(ecvl::Image& img, const ecvl::Image& gt = Image()) override + { + ScaleFromTo(img, img, old_min_, old_max_, new_min_, new_max_); + } +public: + DEFINE_AUGMENTATION_CLONE(AugScaleFromTo) + + /** @brief AugScaleTo constructor + + @param[in] old_min double which indicates the old minimum value. + @param[in] old_max double which indicates the old maximum value. + @param[in] new_min double which indicates the new minimum value. + @param[in] new_max double which indicates the new maximum value. + */ + AugScaleFromTo(const double& old_min, const double& old_max, const double& new_min, const double& new_max) : old_min_{ old_min }, old_max_{ old_max }, new_min_{ new_min }, new_max_{ new_max } {} + AugScaleFromTo(std::istream& is) + { + auto m = param::read(is, "AugScaleFromTo"); + param p; + + m.Get("old_min", param::type::number, true, p); + old_min_ = p.vals_[0]; + + m.Get("old_max", param::type::number, true, p); + old_max_ = p.vals_[0]; + + m.Get("new_min", param::type::number, true, p); + new_min_ = p.vals_[0]; + + m.Get("new_max", param::type::number, true, p); + new_max_ = p.vals_[0]; + } +}; + /** @brief Augmentation wrapper for ecvl::RandomCrop. @anchor AugRandomCrop diff --git a/modules/eddl/src/augmentations.cpp b/modules/eddl/src/augmentations.cpp index 14381b18..6c5321dc 100644 --- a/modules/eddl/src/augmentations.cpp +++ b/modules/eddl/src/augmentations.cpp @@ -107,6 +107,7 @@ std::shared_ptr AugmentationFactory::create(const std::string& nam AUG(AugToFloat32); AUG(AugDivBy255); AUG(AugScaleTo); + AUG(AugScaleFromTo); AUG(AugRandomCrop); return nullptr; // Maybe throw? From 3d2a1cf15ce4e2df1aa9cb6e4c935bc0fa87ef6f Mon Sep 17 00:00:00 2001 From: Laura Canalini Date: Wed, 2 Mar 2022 11:51:28 +0100 Subject: [PATCH 08/10] Fix bug in ResetAllBatches --- modules/eddl/src/support_eddl.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/eddl/src/support_eddl.cpp b/modules/eddl/src/support_eddl.cpp index cb5624db..dba8b969 100644 --- a/modules/eddl/src/support_eddl.cpp +++ b/modules/eddl/src/support_eddl.cpp @@ -167,12 +167,12 @@ void DLDataset::ResetAllBatches(bool shuffle) { fill(current_batch_.begin(), current_batch_.end(), 0); - if (shuffle) { - for (int split_index = 0; split_index < vsize(split_); ++split_index) { + for (int split_index = 0; split_index < vsize(split_); ++split_index) { + if (shuffle) { std::shuffle(begin(GetSplit(split_index)), end(GetSplit(split_index)), re_); - for (auto& tc : splits_tc_[split_index]) { - tc.Reset(); - } + } + for (auto& tc : splits_tc_[split_index]) { + tc.Reset(); } } } From 5aa2785f4ea56efee8918f7b31ca704a2078f851 Mon Sep 17 00:00:00 2001 From: Laura Canalini Date: Wed, 2 Mar 2022 15:20:57 +0100 Subject: [PATCH 09/10] Update to version 1.0.2 --- CMakeLists.txt | 2 +- cmake/ecvlConfig.cmake.in | 2 +- examples/CMakeLists.txt | 2 +- examples/example_core_iterators.cpp | 2 +- examples/example_dataset_generator.cpp | 2 +- examples/example_dataset_parser.cpp | 2 +- examples/example_ecvl_eddl.cpp | 2 +- examples/example_ecvl_gui.cpp | 2 +- examples/example_image_view.cpp | 2 +- examples/example_imagewatch.cpp | 2 +- examples/example_imgcodecs.cpp | 2 +- examples/example_imgproc.cpp | 2 +- examples/example_moments.cpp | 2 +- examples/example_nifti_dicom.cpp | 2 +- examples/example_openslide.cpp | 2 +- examples/example_performance.cpp | 2 +- examples/example_pipeline.cpp | 2 +- examples/example_threshold.cpp | 2 +- modules/core/CMakeLists.txt | 2 +- modules/core/include/ecvl/CMakeLists.txt | 2 +- modules/core/include/ecvl/core.h | 2 +- modules/core/include/ecvl/core/any.h | 2 +- modules/core/include/ecvl/core/arithmetic.h | 2 +- modules/core/include/ecvl/core/arithmetic_impl.inc.h | 2 +- modules/core/include/ecvl/core/cpu_hal.h | 2 +- modules/core/include/ecvl/core/cuda/common.h | 2 +- modules/core/include/ecvl/core/cuda/gpu_hal.h | 2 +- modules/core/include/ecvl/core/datatype.h | 2 +- modules/core/include/ecvl/core/datatype_existing_tuples.inc.h | 2 +- .../include/ecvl/core/datatype_existing_tuples_signed.inc.h | 2 +- .../include/ecvl/core/datatype_existing_tuples_unsigned.inc.h | 2 +- modules/core/include/ecvl/core/datatype_matrix.h | 2 +- modules/core/include/ecvl/core/datatype_tuples.inc.h | 2 +- modules/core/include/ecvl/core/filesystem.h | 2 +- modules/core/include/ecvl/core/fpga_hal.h | 2 +- modules/core/include/ecvl/core/hal.h | 2 +- modules/core/include/ecvl/core/image.h | 2 +- modules/core/include/ecvl/core/imgcodecs.h | 2 +- modules/core/include/ecvl/core/imgproc.h | 2 +- modules/core/include/ecvl/core/iterators.h | 2 +- modules/core/include/ecvl/core/iterators_impl.inc.h | 2 +- modules/core/include/ecvl/core/macros.h | 2 +- modules/core/include/ecvl/core/metadata.h | 2 +- modules/core/include/ecvl/core/optional.h | 2 +- modules/core/include/ecvl/core/saturate_cast.h | 2 +- modules/core/include/ecvl/core/standard_errors.h | 2 +- modules/core/include/ecvl/core/support_dcmtk.h | 2 +- modules/core/include/ecvl/core/support_nifti.h | 2 +- modules/core/include/ecvl/core/support_opencv.h | 2 +- modules/core/include/ecvl/core/support_openslide.h | 2 +- modules/core/include/ecvl/core/type_promotion.h | 2 +- modules/core/src/CMakeLists.txt | 2 +- modules/core/src/arithmetic.cpp | 2 +- modules/core/src/core.cpp | 2 +- modules/core/src/cpu_hal.cpp | 2 +- modules/core/src/cpu_hal_arithmetic.cpp | 2 +- modules/core/src/cpu_hal_imgproc.cpp | 2 +- modules/core/src/cpu_hal_volproc.cpp | 2 +- modules/core/src/cuda/gpu_hal.cpp | 2 +- modules/core/src/datatype.cpp | 2 +- modules/core/src/fpga_hal.cpp | 2 +- modules/core/src/hal.cpp | 2 +- modules/core/src/image.cpp | 2 +- modules/core/src/imgcodecs.cpp | 2 +- modules/core/src/imgproc.cpp | 2 +- modules/core/src/support_dcmtk.cpp | 2 +- modules/core/src/support_nifti.cpp | 2 +- modules/core/src/support_opencv.cpp | 2 +- modules/core/src/support_openslide.cpp | 2 +- modules/core/test/CMakeLists.txt | 2 +- modules/core/test/test_core.cpp | 2 +- modules/core/test/test_cuda.cu | 2 +- modules/core/test/test_cuda.h | 2 +- modules/core/test/test_imgproc.cpp | 2 +- modules/core/test/test_volproc.cpp | 2 +- modules/dataset/CMakeLists.txt | 2 +- modules/dataset/include/ecvl/CMakeLists.txt | 2 +- modules/dataset/include/ecvl/dataset_generator.h | 2 +- modules/dataset/include/ecvl/dataset_parser.h | 2 +- modules/dataset/src/CMakeLists.txt | 2 +- modules/dataset/src/dataset_generator.cpp | 2 +- modules/dataset/src/dataset_parser.cpp | 2 +- modules/dataset/test/CMakeLists.txt | 2 +- modules/dataset/test/test_dataset_parser.cpp | 2 +- modules/eddl/CMakeLists.txt | 2 +- modules/eddl/include/ecvl/CMakeLists.txt | 2 +- modules/eddl/include/ecvl/augmentations.h | 2 +- modules/eddl/include/ecvl/support_eddl.h | 2 +- modules/eddl/src/CMakeLists.txt | 2 +- modules/eddl/src/augmentations.cpp | 2 +- modules/eddl/src/support_eddl.cpp | 2 +- modules/eddl/test/CMakeLists.txt | 2 +- modules/eddl/test/test_eddl.cpp | 2 +- modules/gui/CMakeLists.txt | 2 +- modules/gui/include/ecvl/CMakeLists.txt | 2 +- modules/gui/include/ecvl/gui.h | 2 +- modules/gui/include/ecvl/gui/shader.h | 2 +- modules/gui/src/CMakeLists.txt | 2 +- modules/gui/src/gui.cpp | 2 +- modules/gui/src/gui3D.cpp | 2 +- spike/operators_lazy_evaluation.cpp | 2 +- 101 files changed, 101 insertions(+), 101 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 45aa309d..28d7ce6b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ # ECVL - European Computer Vision Library -# Version: 1.0.1 +# Version: 1.0.2 # copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab # Authors: # Costantino Grana (costantino.grana@unimore.it) diff --git a/cmake/ecvlConfig.cmake.in b/cmake/ecvlConfig.cmake.in index cc8b9007..7aec2935 100644 --- a/cmake/ecvlConfig.cmake.in +++ b/cmake/ecvlConfig.cmake.in @@ -1,5 +1,5 @@ # ECVL - European Computer Vision Library -# Version: 1.0.1 +# Version: 1.0.2 # copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab # Authors: # Costantino Grana (costantino.grana@unimore.it) diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 4c0393b6..910a9728 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -1,5 +1,5 @@ # ECVL - European Computer Vision Library -# Version: 1.0.1 +# Version: 1.0.2 # copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab # Authors: # Costantino Grana (costantino.grana@unimore.it) diff --git a/examples/example_core_iterators.cpp b/examples/example_core_iterators.cpp index 533af250..126465dc 100644 --- a/examples/example_core_iterators.cpp +++ b/examples/example_core_iterators.cpp @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.1 +* Version: 1.0.2 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/examples/example_dataset_generator.cpp b/examples/example_dataset_generator.cpp index f123d459..b2c6d9a4 100644 --- a/examples/example_dataset_generator.cpp +++ b/examples/example_dataset_generator.cpp @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.1 +* Version: 1.0.2 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/examples/example_dataset_parser.cpp b/examples/example_dataset_parser.cpp index 419107a5..7050bc16 100644 --- a/examples/example_dataset_parser.cpp +++ b/examples/example_dataset_parser.cpp @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.1 +* Version: 1.0.2 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/examples/example_ecvl_eddl.cpp b/examples/example_ecvl_eddl.cpp index a115ecec..e7b4f536 100644 --- a/examples/example_ecvl_eddl.cpp +++ b/examples/example_ecvl_eddl.cpp @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.1 +* Version: 1.0.2 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/examples/example_ecvl_gui.cpp b/examples/example_ecvl_gui.cpp index 21d8d2da..a856d798 100644 --- a/examples/example_ecvl_gui.cpp +++ b/examples/example_ecvl_gui.cpp @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.1 +* Version: 1.0.2 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/examples/example_image_view.cpp b/examples/example_image_view.cpp index 38f659f8..a525cb88 100644 --- a/examples/example_image_view.cpp +++ b/examples/example_image_view.cpp @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.1 +* Version: 1.0.2 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/examples/example_imagewatch.cpp b/examples/example_imagewatch.cpp index c5352305..cbcb5faf 100644 --- a/examples/example_imagewatch.cpp +++ b/examples/example_imagewatch.cpp @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.1 +* Version: 1.0.2 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/examples/example_imgcodecs.cpp b/examples/example_imgcodecs.cpp index 71c322dc..e428835a 100644 --- a/examples/example_imgcodecs.cpp +++ b/examples/example_imgcodecs.cpp @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.1 +* Version: 1.0.2 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/examples/example_imgproc.cpp b/examples/example_imgproc.cpp index d548ef96..0dbe3fe9 100644 --- a/examples/example_imgproc.cpp +++ b/examples/example_imgproc.cpp @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.1 +* Version: 1.0.2 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/examples/example_moments.cpp b/examples/example_moments.cpp index c3db7583..3bfdd640 100644 --- a/examples/example_moments.cpp +++ b/examples/example_moments.cpp @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.1 +* Version: 1.0.2 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/examples/example_nifti_dicom.cpp b/examples/example_nifti_dicom.cpp index d6146d4b..dc34a7a0 100644 --- a/examples/example_nifti_dicom.cpp +++ b/examples/example_nifti_dicom.cpp @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.1 +* Version: 1.0.2 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/examples/example_openslide.cpp b/examples/example_openslide.cpp index c8af5731..57423830 100644 --- a/examples/example_openslide.cpp +++ b/examples/example_openslide.cpp @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.1 +* Version: 1.0.2 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/examples/example_performance.cpp b/examples/example_performance.cpp index 45f1612c..bbd7d3a1 100644 --- a/examples/example_performance.cpp +++ b/examples/example_performance.cpp @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.1 +* Version: 1.0.2 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/examples/example_pipeline.cpp b/examples/example_pipeline.cpp index 029bfeae..6286be39 100644 --- a/examples/example_pipeline.cpp +++ b/examples/example_pipeline.cpp @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.1 +* Version: 1.0.2 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/examples/example_threshold.cpp b/examples/example_threshold.cpp index 961301ef..4ecfa036 100644 --- a/examples/example_threshold.cpp +++ b/examples/example_threshold.cpp @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.1 +* Version: 1.0.2 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/CMakeLists.txt b/modules/core/CMakeLists.txt index 0c75c9a0..f12016f9 100644 --- a/modules/core/CMakeLists.txt +++ b/modules/core/CMakeLists.txt @@ -1,5 +1,5 @@ # ECVL - European Computer Vision Library -# Version: 1.0.1 +# Version: 1.0.2 # copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab # Authors: # Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/include/ecvl/CMakeLists.txt b/modules/core/include/ecvl/CMakeLists.txt index 9d56fb66..cce8f4e5 100644 --- 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.1 +# Version: 1.0.2 # copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab # Authors: # Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/include/ecvl/core.h b/modules/core/include/ecvl/core.h index 978729a4..5e0753d6 100644 --- 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.1 +* Version: 1.0.2 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/include/ecvl/core/any.h b/modules/core/include/ecvl/core/any.h index 10089561..a80ed1ab 100644 --- 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.1 +* Version: 1.0.2 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/include/ecvl/core/arithmetic.h b/modules/core/include/ecvl/core/arithmetic.h index 43588c9e..d89d626d 100644 --- 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.1 +* Version: 1.0.2 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/include/ecvl/core/arithmetic_impl.inc.h b/modules/core/include/ecvl/core/arithmetic_impl.inc.h index 334fe0a0..69e5b750 100644 --- 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.1 +* Version: 1.0.2 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/include/ecvl/core/cpu_hal.h b/modules/core/include/ecvl/core/cpu_hal.h index dffd828e..52bea64a 100644 --- 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.1 +* Version: 1.0.2 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/include/ecvl/core/cuda/common.h b/modules/core/include/ecvl/core/cuda/common.h index 75b94e3d..ed98114f 100644 --- 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.1 +* Version: 1.0.2 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/include/ecvl/core/cuda/gpu_hal.h b/modules/core/include/ecvl/core/cuda/gpu_hal.h index dc846e02..546be7eb 100644 --- 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.1 +* Version: 1.0.2 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/include/ecvl/core/datatype.h b/modules/core/include/ecvl/core/datatype.h index d347221c..faa661d5 100644 --- 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.1 +* Version: 1.0.2 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/include/ecvl/core/datatype_existing_tuples.inc.h b/modules/core/include/ecvl/core/datatype_existing_tuples.inc.h index 48d487f6..8440b159 100644 --- 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.1 +* Version: 1.0.2 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) 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 index 972bdbbf..fb231e23 100644 --- 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.1 +* Version: 1.0.2 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) 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 index 3d0540b5..8d183cbe 100644 --- 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.1 +* Version: 1.0.2 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/include/ecvl/core/datatype_matrix.h b/modules/core/include/ecvl/core/datatype_matrix.h index 7b8b0ff7..185ea7d9 100644 --- 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.1 +* Version: 1.0.2 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/include/ecvl/core/datatype_tuples.inc.h b/modules/core/include/ecvl/core/datatype_tuples.inc.h index f649de8b..ecdebe66 100644 --- 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.1 +* Version: 1.0.2 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/include/ecvl/core/filesystem.h b/modules/core/include/ecvl/core/filesystem.h index 90553cc0..44a2c590 100644 --- 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.1 +* Version: 1.0.2 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/include/ecvl/core/fpga_hal.h b/modules/core/include/ecvl/core/fpga_hal.h index 588f5220..b1046072 100644 --- 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.1 +* Version: 1.0.2 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/include/ecvl/core/hal.h b/modules/core/include/ecvl/core/hal.h index fdc59e7f..be1d9690 100644 --- 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.1 +* Version: 1.0.2 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/include/ecvl/core/image.h b/modules/core/include/ecvl/core/image.h index 17e62f21..c8b6c9e6 100644 --- 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.1 +* Version: 1.0.2 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/include/ecvl/core/imgcodecs.h b/modules/core/include/ecvl/core/imgcodecs.h index 4a0bc8ca..91b6ed19 100644 --- 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.1 +* Version: 1.0.2 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/include/ecvl/core/imgproc.h b/modules/core/include/ecvl/core/imgproc.h index dc9d801a..6635ce41 100644 --- a/modules/core/include/ecvl/core/imgproc.h +++ b/modules/core/include/ecvl/core/imgproc.h @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.1 +* Version: 1.0.2 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/include/ecvl/core/iterators.h b/modules/core/include/ecvl/core/iterators.h index 264a1bc8..9acaaf63 100644 --- a/modules/core/include/ecvl/core/iterators.h +++ b/modules/core/include/ecvl/core/iterators.h @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.1 +* Version: 1.0.2 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/include/ecvl/core/iterators_impl.inc.h b/modules/core/include/ecvl/core/iterators_impl.inc.h index ac8ec905..38c4f4dc 100644 --- a/modules/core/include/ecvl/core/iterators_impl.inc.h +++ b/modules/core/include/ecvl/core/iterators_impl.inc.h @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.1 +* Version: 1.0.2 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/include/ecvl/core/macros.h b/modules/core/include/ecvl/core/macros.h index 3a0d872c..e0113c83 100644 --- a/modules/core/include/ecvl/core/macros.h +++ b/modules/core/include/ecvl/core/macros.h @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.1 +* Version: 1.0.2 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/include/ecvl/core/metadata.h b/modules/core/include/ecvl/core/metadata.h index ab1d7eb5..f749e722 100644 --- a/modules/core/include/ecvl/core/metadata.h +++ b/modules/core/include/ecvl/core/metadata.h @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.1 +* Version: 1.0.2 * copyright (c) 2020, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/include/ecvl/core/optional.h b/modules/core/include/ecvl/core/optional.h index f1267891..4d8f1571 100644 --- a/modules/core/include/ecvl/core/optional.h +++ b/modules/core/include/ecvl/core/optional.h @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.1 +* Version: 1.0.2 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/include/ecvl/core/saturate_cast.h b/modules/core/include/ecvl/core/saturate_cast.h index 1e40a80b..76422d63 100644 --- a/modules/core/include/ecvl/core/saturate_cast.h +++ b/modules/core/include/ecvl/core/saturate_cast.h @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.1 +* Version: 1.0.2 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/include/ecvl/core/standard_errors.h b/modules/core/include/ecvl/core/standard_errors.h index 4392a391..8f4014ec 100644 --- a/modules/core/include/ecvl/core/standard_errors.h +++ b/modules/core/include/ecvl/core/standard_errors.h @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.1 +* Version: 1.0.2 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/include/ecvl/core/support_dcmtk.h b/modules/core/include/ecvl/core/support_dcmtk.h index be381831..ba920b77 100644 --- a/modules/core/include/ecvl/core/support_dcmtk.h +++ b/modules/core/include/ecvl/core/support_dcmtk.h @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.1 +* Version: 1.0.2 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/include/ecvl/core/support_nifti.h b/modules/core/include/ecvl/core/support_nifti.h index 80f0443b..c6832508 100644 --- a/modules/core/include/ecvl/core/support_nifti.h +++ b/modules/core/include/ecvl/core/support_nifti.h @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.1 +* Version: 1.0.2 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/include/ecvl/core/support_opencv.h b/modules/core/include/ecvl/core/support_opencv.h index ff100b11..2d092f25 100644 --- a/modules/core/include/ecvl/core/support_opencv.h +++ b/modules/core/include/ecvl/core/support_opencv.h @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.1 +* Version: 1.0.2 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/include/ecvl/core/support_openslide.h b/modules/core/include/ecvl/core/support_openslide.h index 76a46a0c..c369f1ae 100644 --- a/modules/core/include/ecvl/core/support_openslide.h +++ b/modules/core/include/ecvl/core/support_openslide.h @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.1 +* Version: 1.0.2 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/include/ecvl/core/type_promotion.h b/modules/core/include/ecvl/core/type_promotion.h index 18cce49c..6dce85ad 100644 --- a/modules/core/include/ecvl/core/type_promotion.h +++ b/modules/core/include/ecvl/core/type_promotion.h @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.1 +* Version: 1.0.2 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/src/CMakeLists.txt b/modules/core/src/CMakeLists.txt index 8e27d569..fa23c2ea 100644 --- a/modules/core/src/CMakeLists.txt +++ b/modules/core/src/CMakeLists.txt @@ -1,5 +1,5 @@ # ECVL - European Computer Vision Library -# Version: 1.0.1 +# Version: 1.0.2 # copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab # Authors: # Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/src/arithmetic.cpp b/modules/core/src/arithmetic.cpp index 72ad18d8..4f0cda90 100644 --- a/modules/core/src/arithmetic.cpp +++ b/modules/core/src/arithmetic.cpp @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.1 +* Version: 1.0.2 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/src/core.cpp b/modules/core/src/core.cpp index b5dff268..f6488c29 100644 --- a/modules/core/src/core.cpp +++ b/modules/core/src/core.cpp @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.1 +* Version: 1.0.2 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/src/cpu_hal.cpp b/modules/core/src/cpu_hal.cpp index e7ab5a9f..8067908c 100644 --- a/modules/core/src/cpu_hal.cpp +++ b/modules/core/src/cpu_hal.cpp @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.1 +* Version: 1.0.2 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/src/cpu_hal_arithmetic.cpp b/modules/core/src/cpu_hal_arithmetic.cpp index e35deb3e..fab2f948 100644 --- a/modules/core/src/cpu_hal_arithmetic.cpp +++ b/modules/core/src/cpu_hal_arithmetic.cpp @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.1 +* Version: 1.0.2 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/src/cpu_hal_imgproc.cpp b/modules/core/src/cpu_hal_imgproc.cpp index 47c02b00..201357a4 100644 --- a/modules/core/src/cpu_hal_imgproc.cpp +++ b/modules/core/src/cpu_hal_imgproc.cpp @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.1 +* Version: 1.0.2 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/src/cpu_hal_volproc.cpp b/modules/core/src/cpu_hal_volproc.cpp index 50ba3c93..742e4974 100644 --- a/modules/core/src/cpu_hal_volproc.cpp +++ b/modules/core/src/cpu_hal_volproc.cpp @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.1 +* Version: 1.0.2 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/src/cuda/gpu_hal.cpp b/modules/core/src/cuda/gpu_hal.cpp index 126b8a25..7db436b2 100644 --- a/modules/core/src/cuda/gpu_hal.cpp +++ b/modules/core/src/cuda/gpu_hal.cpp @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.1 +* Version: 1.0.2 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/src/datatype.cpp b/modules/core/src/datatype.cpp index a70155ec..64a6742c 100644 --- a/modules/core/src/datatype.cpp +++ b/modules/core/src/datatype.cpp @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.1 +* Version: 1.0.2 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/src/fpga_hal.cpp b/modules/core/src/fpga_hal.cpp index f7daa474..8a9c947a 100644 --- a/modules/core/src/fpga_hal.cpp +++ b/modules/core/src/fpga_hal.cpp @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.1 +* Version: 1.0.2 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/src/hal.cpp b/modules/core/src/hal.cpp index 6ad5c08a..e62461b1 100644 --- a/modules/core/src/hal.cpp +++ b/modules/core/src/hal.cpp @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.1 +* Version: 1.0.2 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/src/image.cpp b/modules/core/src/image.cpp index f3ef2e81..2dce7cb3 100644 --- a/modules/core/src/image.cpp +++ b/modules/core/src/image.cpp @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.1 +* Version: 1.0.2 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/src/imgcodecs.cpp b/modules/core/src/imgcodecs.cpp index 88b129ad..959c3518 100644 --- a/modules/core/src/imgcodecs.cpp +++ b/modules/core/src/imgcodecs.cpp @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.1 +* Version: 1.0.2 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/src/imgproc.cpp b/modules/core/src/imgproc.cpp index 6e994cd2..ac449251 100644 --- a/modules/core/src/imgproc.cpp +++ b/modules/core/src/imgproc.cpp @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.1 +* Version: 1.0.2 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/src/support_dcmtk.cpp b/modules/core/src/support_dcmtk.cpp index 9cfecaa5..72c9e067 100644 --- a/modules/core/src/support_dcmtk.cpp +++ b/modules/core/src/support_dcmtk.cpp @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.1 +* Version: 1.0.2 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/src/support_nifti.cpp b/modules/core/src/support_nifti.cpp index b823c345..6acfc370 100644 --- a/modules/core/src/support_nifti.cpp +++ b/modules/core/src/support_nifti.cpp @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.1 +* Version: 1.0.2 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/src/support_opencv.cpp b/modules/core/src/support_opencv.cpp index cb910da2..17f4729f 100644 --- a/modules/core/src/support_opencv.cpp +++ b/modules/core/src/support_opencv.cpp @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.1 +* Version: 1.0.2 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/src/support_openslide.cpp b/modules/core/src/support_openslide.cpp index cf53e123..4066f954 100644 --- a/modules/core/src/support_openslide.cpp +++ b/modules/core/src/support_openslide.cpp @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.1 +* Version: 1.0.2 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/test/CMakeLists.txt b/modules/core/test/CMakeLists.txt index 40288b85..bfe65ac7 100644 --- a/modules/core/test/CMakeLists.txt +++ b/modules/core/test/CMakeLists.txt @@ -1,5 +1,5 @@ # ECVL - European Computer Vision Library -# Version: 1.0.1 +# Version: 1.0.2 # copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab # Authors: # Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/test/test_core.cpp b/modules/core/test/test_core.cpp index c5b18f53..fd339425 100644 --- a/modules/core/test/test_core.cpp +++ b/modules/core/test/test_core.cpp @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.1 +* Version: 1.0.2 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/test/test_cuda.cu b/modules/core/test/test_cuda.cu index 63e5461f..b7e26ae9 100644 --- a/modules/core/test/test_cuda.cu +++ b/modules/core/test/test_cuda.cu @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.1 +* Version: 1.0.2 * copyright (c) 2020, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/test/test_cuda.h b/modules/core/test/test_cuda.h index ad9ac180..969a00ee 100644 --- a/modules/core/test/test_cuda.h +++ b/modules/core/test/test_cuda.h @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.1 +* Version: 1.0.2 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/test/test_imgproc.cpp b/modules/core/test/test_imgproc.cpp index e4c1e30a..730beb7a 100644 --- a/modules/core/test/test_imgproc.cpp +++ b/modules/core/test/test_imgproc.cpp @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.1 +* Version: 1.0.2 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/core/test/test_volproc.cpp b/modules/core/test/test_volproc.cpp index cdc7ff79..2648eccc 100644 --- a/modules/core/test/test_volproc.cpp +++ b/modules/core/test/test_volproc.cpp @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.1 +* Version: 1.0.2 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/dataset/CMakeLists.txt b/modules/dataset/CMakeLists.txt index d66907f3..10813537 100644 --- a/modules/dataset/CMakeLists.txt +++ b/modules/dataset/CMakeLists.txt @@ -1,5 +1,5 @@ # ECVL - European Computer Vision Library -# Version: 1.0.1 +# Version: 1.0.2 # copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab # Authors: # Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/dataset/include/ecvl/CMakeLists.txt b/modules/dataset/include/ecvl/CMakeLists.txt index 74a4a1fb..c2e1d06f 100644 --- a/modules/dataset/include/ecvl/CMakeLists.txt +++ b/modules/dataset/include/ecvl/CMakeLists.txt @@ -1,5 +1,5 @@ # ECVL - European Computer Vision Library -# Version: 1.0.1 +# Version: 1.0.2 # copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab # Authors: # Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/dataset/include/ecvl/dataset_generator.h b/modules/dataset/include/ecvl/dataset_generator.h index a47b9023..33bab427 100644 --- a/modules/dataset/include/ecvl/dataset_generator.h +++ b/modules/dataset/include/ecvl/dataset_generator.h @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.1 +* Version: 1.0.2 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/dataset/include/ecvl/dataset_parser.h b/modules/dataset/include/ecvl/dataset_parser.h index 6413d9f5..90c38d11 100644 --- a/modules/dataset/include/ecvl/dataset_parser.h +++ b/modules/dataset/include/ecvl/dataset_parser.h @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.1 +* Version: 1.0.2 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/dataset/src/CMakeLists.txt b/modules/dataset/src/CMakeLists.txt index dfe30e07..da028e6b 100644 --- a/modules/dataset/src/CMakeLists.txt +++ b/modules/dataset/src/CMakeLists.txt @@ -1,5 +1,5 @@ # ECVL - European Computer Vision Library -# Version: 1.0.1 +# Version: 1.0.2 # copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab # Authors: # Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/dataset/src/dataset_generator.cpp b/modules/dataset/src/dataset_generator.cpp index f30143b1..86c136af 100644 --- a/modules/dataset/src/dataset_generator.cpp +++ b/modules/dataset/src/dataset_generator.cpp @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.1 +* Version: 1.0.2 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/dataset/src/dataset_parser.cpp b/modules/dataset/src/dataset_parser.cpp index ee6df6c6..628fda54 100644 --- a/modules/dataset/src/dataset_parser.cpp +++ b/modules/dataset/src/dataset_parser.cpp @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.1 +* Version: 1.0.2 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/dataset/test/CMakeLists.txt b/modules/dataset/test/CMakeLists.txt index 17ec8773..6b3e0ba4 100644 --- a/modules/dataset/test/CMakeLists.txt +++ b/modules/dataset/test/CMakeLists.txt @@ -1,5 +1,5 @@ # ECVL - European Computer Vision Library -# Version: 1.0.1 +# Version: 1.0.2 # copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab # Authors: # Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/dataset/test/test_dataset_parser.cpp b/modules/dataset/test/test_dataset_parser.cpp index 75a4e9f5..29d331e2 100644 --- a/modules/dataset/test/test_dataset_parser.cpp +++ b/modules/dataset/test/test_dataset_parser.cpp @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.1 +* Version: 1.0.2 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/eddl/CMakeLists.txt b/modules/eddl/CMakeLists.txt index 3dc854ad..77f3aba5 100644 --- a/modules/eddl/CMakeLists.txt +++ b/modules/eddl/CMakeLists.txt @@ -1,5 +1,5 @@ # ECVL - European Computer Vision Library -# Version: 1.0.1 +# Version: 1.0.2 # copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab # Authors: # Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/eddl/include/ecvl/CMakeLists.txt b/modules/eddl/include/ecvl/CMakeLists.txt index 425e2deb..75efff93 100644 --- a/modules/eddl/include/ecvl/CMakeLists.txt +++ b/modules/eddl/include/ecvl/CMakeLists.txt @@ -1,5 +1,5 @@ # ECVL - European Computer Vision Library -# Version: 1.0.1 +# Version: 1.0.2 # copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab # Authors: # Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/eddl/include/ecvl/augmentations.h b/modules/eddl/include/ecvl/augmentations.h index 3fd3d677..7dc63f1e 100644 --- a/modules/eddl/include/ecvl/augmentations.h +++ b/modules/eddl/include/ecvl/augmentations.h @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.1 +* Version: 1.0.2 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/eddl/include/ecvl/support_eddl.h b/modules/eddl/include/ecvl/support_eddl.h index 6b2d0057..6ca1ff59 100644 --- a/modules/eddl/include/ecvl/support_eddl.h +++ b/modules/eddl/include/ecvl/support_eddl.h @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.1 +* Version: 1.0.2 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/eddl/src/CMakeLists.txt b/modules/eddl/src/CMakeLists.txt index 52b236f1..b368034e 100644 --- a/modules/eddl/src/CMakeLists.txt +++ b/modules/eddl/src/CMakeLists.txt @@ -1,5 +1,5 @@ # ECVL - European Computer Vision Library -# Version: 1.0.1 +# Version: 1.0.2 # copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab # Authors: # Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/eddl/src/augmentations.cpp b/modules/eddl/src/augmentations.cpp index 6c5321dc..239f00f3 100644 --- a/modules/eddl/src/augmentations.cpp +++ b/modules/eddl/src/augmentations.cpp @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.1 +* Version: 1.0.2 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/eddl/src/support_eddl.cpp b/modules/eddl/src/support_eddl.cpp index dba8b969..057106de 100644 --- a/modules/eddl/src/support_eddl.cpp +++ b/modules/eddl/src/support_eddl.cpp @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.1 +* Version: 1.0.2 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/eddl/test/CMakeLists.txt b/modules/eddl/test/CMakeLists.txt index 29da757a..51c9c7df 100644 --- a/modules/eddl/test/CMakeLists.txt +++ b/modules/eddl/test/CMakeLists.txt @@ -1,5 +1,5 @@ # ECVL - European Computer Vision Library -# Version: 1.0.1 +# Version: 1.0.2 # copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab # Authors: # Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/eddl/test/test_eddl.cpp b/modules/eddl/test/test_eddl.cpp index f94c613a..3478e976 100644 --- a/modules/eddl/test/test_eddl.cpp +++ b/modules/eddl/test/test_eddl.cpp @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.1 +* Version: 1.0.2 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/gui/CMakeLists.txt b/modules/gui/CMakeLists.txt index 2a598dbf..6bdfcd0a 100644 --- a/modules/gui/CMakeLists.txt +++ b/modules/gui/CMakeLists.txt @@ -1,5 +1,5 @@ # ECVL - European Computer Vision Library -# Version: 1.0.1 +# Version: 1.0.2 # copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab # Authors: # Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/gui/include/ecvl/CMakeLists.txt b/modules/gui/include/ecvl/CMakeLists.txt index 5f044d2b..4d2a1207 100644 --- a/modules/gui/include/ecvl/CMakeLists.txt +++ b/modules/gui/include/ecvl/CMakeLists.txt @@ -1,5 +1,5 @@ # ECVL - European Computer Vision Library -# Version: 1.0.1 +# Version: 1.0.2 # copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab # Authors: # Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/gui/include/ecvl/gui.h b/modules/gui/include/ecvl/gui.h index 31189f8e..3da52c66 100644 --- a/modules/gui/include/ecvl/gui.h +++ b/modules/gui/include/ecvl/gui.h @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.1 +* Version: 1.0.2 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/gui/include/ecvl/gui/shader.h b/modules/gui/include/ecvl/gui/shader.h index eacd5331..6d587d26 100644 --- a/modules/gui/include/ecvl/gui/shader.h +++ b/modules/gui/include/ecvl/gui/shader.h @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.1 +* Version: 1.0.2 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/gui/src/CMakeLists.txt b/modules/gui/src/CMakeLists.txt index e6d1edce..bf7075c9 100644 --- a/modules/gui/src/CMakeLists.txt +++ b/modules/gui/src/CMakeLists.txt @@ -1,5 +1,5 @@ # ECVL - European Computer Vision Library -# Version: 1.0.1 +# Version: 1.0.2 # copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab # Authors: # Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/gui/src/gui.cpp b/modules/gui/src/gui.cpp index c39d82f9..f3efc462 100644 --- a/modules/gui/src/gui.cpp +++ b/modules/gui/src/gui.cpp @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.1 +* Version: 1.0.2 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/modules/gui/src/gui3D.cpp b/modules/gui/src/gui3D.cpp index e92ef443..f1d2ce8a 100644 --- a/modules/gui/src/gui3D.cpp +++ b/modules/gui/src/gui3D.cpp @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.1 +* Version: 1.0.2 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) diff --git a/spike/operators_lazy_evaluation.cpp b/spike/operators_lazy_evaluation.cpp index d3dd5559..f43a0ac1 100644 --- a/spike/operators_lazy_evaluation.cpp +++ b/spike/operators_lazy_evaluation.cpp @@ -1,6 +1,6 @@ /* * ECVL - European Computer Vision Library -* Version: 1.0.1 +* Version: 1.0.2 * copyright (c) 2021, Università degli Studi di Modena e Reggio Emilia (UNIMORE), AImageLab * Authors: * Costantino Grana (costantino.grana@unimore.it) From 83112f63aec6213f50957f78998ca51a26e088cc Mon Sep 17 00:00:00 2001 From: Laura Canalini Date: Tue, 8 Mar 2022 10:28:21 +0100 Subject: [PATCH 10/10] Fix bug that blocks the data loader when not all batches in the queue are consumed --- modules/eddl/include/ecvl/support_eddl.h | 13 +++++++++++++ modules/eddl/src/support_eddl.cpp | 7 ++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/modules/eddl/include/ecvl/support_eddl.h b/modules/eddl/include/ecvl/support_eddl.h index 6ca1ff59..2326cd59 100644 --- a/modules/eddl/include/ecvl/support_eddl.h +++ b/modules/eddl/include/ecvl/support_eddl.h @@ -177,6 +177,19 @@ class ProducersConsumerQueue cond_notempty_.notify_one(); } + /** @brief Free threads locked on a push operation. + + Notifies all the locked threads on the condition variable cond_notfull_ that were waiting to retake the control in the + critical region of pushing new elements in to the queue. + + This method is specific to be used in the Stop() operation when the data loading process needs to be stopped before all + the elements (batches) of the queue have been consumed. + */ + void FreeLockedOnPush() + { + cond_notfull_.notify_all(); + } + /** @brief Pop a sample from the queue. Take the lock of the queue and wait if the queue is empty. Otherwise, pop a sample, an image and its label from the queue. diff --git a/modules/eddl/src/support_eddl.cpp b/modules/eddl/src/support_eddl.cpp index 057106de..6710d847 100644 --- a/modules/eddl/src/support_eddl.cpp +++ b/modules/eddl/src/support_eddl.cpp @@ -518,7 +518,12 @@ void DLDataset::Stop() ECVL_ERROR_STOP_ALREADY_END } - active_ = false; + { + std::unique_lock lock(active_mutex_); + active_ = false; + queue_.FreeLockedOnPush(); + } + for (auto i = 0u; i < num_workers_; ++i) { producers_[i].join(); }