diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d5ea92d7634bf5096d7a726a3ee65e7e2837f9a8..0b775781a2d490798832ca1f57057e89ae2f1215 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -121,12 +121,12 @@ fast-build: - merge_requests - branches stage: precheck - image: $BUILD_IMAGE_REGISTRY/otb-ubuntu-native:24.04 + image: $BUILD_IMAGE_REGISTRY/otb-ubuntu-native-itk5:22.04 before_script: - export GIT_LFS_SKIP_SMUDGE=1 - git checkout -f -q $CI_COMMIT_SHA script: - - ctest -V -S CI/main_ci.cmake -DIMAGE_NAME:string=ubuntu-24.04-fast + - ctest -V -S CI/main_ci.cmake -DIMAGE_NAME:string=ubuntu-22.04-fast - ccache -s legal-check: diff --git a/Modules/Core/Projection/include/otbImportGeoInformationImageFilter.h b/Modules/Core/Projection/include/otbImportGeoInformationImageFilter.h index f3694d9f14fc1afd59e212e72cb109e34ccddd2d..af41cf8d790f0952717983cf5cda150e2bc6c3e8 100644 --- a/Modules/Core/Projection/include/otbImportGeoInformationImageFilter.h +++ b/Modules/Core/Projection/include/otbImportGeoInformationImageFilter.h @@ -90,15 +90,6 @@ protected: /** Generate output information */ void GenerateOutputInformation(void) override; - /** Override VerifyInputInformation() since this filter's inputs do - * not need to occupy the same physical space. - * - * \sa ProcessObject::VerifyInputInformation - */ - void VerifyInputInformation() override - { - } - private: ImportGeoInformationImageFilter(const Self&) = delete; void operator=(const Self&) = delete; diff --git a/Modules/Core/Streaming/include/otbPersistentImageFilter.h b/Modules/Core/Streaming/include/otbPersistentImageFilter.h index 82f0bd7916ded958b27ee1a5a4befa178a0d0a71..74aaba6cfe5a98f7d8f33cbb4807dc8eb3d508e5 100644 --- a/Modules/Core/Streaming/include/otbPersistentImageFilter.h +++ b/Modules/Core/Streaming/include/otbPersistentImageFilter.h @@ -83,6 +83,8 @@ protected: Superclass::PrintSelf(os, indent); } + virtual void VerifyInputInformation(){}; + private: PersistentImageFilter(const Self&) = delete; void operator=(const Self&) = delete;