Author: Flavien Bridault <fbridault@ircad.fr>
Description: Remove service that requires ITKFFT which is not available on i386
Forwarded: not-needed
--- a/lib/filter/image/CMakeLists.txt
+++ b/lib/filter/image/CMakeLists.txt
@@ -7,8 +7,8 @@ if(MSVC)
     target_include_directories(filter_image SYSTEM PRIVATE ${VXL_CORE_INCLUDE_DIRS})
 endif()
 
-find_package(ITK QUIET COMPONENTS ITKCommon ITKLabelMap ITKOptimizersv4 ITKTransform ITKFFT ITKStatistics REQUIRED)
-target_link_libraries(filter_image PRIVATE ITKCommon ITKLabelMap ITKOptimizersv4 ITKTransform ITKFFT ITKStatistics)
+find_package(ITK QUIET COMPONENTS ITKCommon ITKLabelMap ITKOptimizersv4 ITKTransform ITKStatistics REQUIRED)
+target_link_libraries(filter_image PRIVATE ITKCommon ITKLabelMap ITKOptimizersv4 ITKTransform ITKStatistics)
 
 if(ITK_VERSION_MAJOR GREATER 4)
     find_package(ITK QUIET COMPONENTS ITKSmoothing ITKRegistrationMethodsv4 REQUIRED)
--- a/module/filter/image/rc/plugin.xml
+++ b/module/filter/image/rc/plugin.xml
@@ -56,12 +56,6 @@
     </extension>
 
     <extension implements="sight::service::extension::factory">
-        <type>sight::service::registerer</type>
-        <service>sight::module::filter::image::mip_matching_registration</service>
-        <desc>This service uses a fast registration algorithm to quickly register two images together if the transform</desc>
-    </extension>
-
-    <extension implements="sight::service::extension::factory">
         <type>sight::service::filter</type>
         <service>sight::module::filter::image::matrix_regressor</service>
         <object>sight::data::vector</object>
--- a/lib/filter/image/test/ut/mip_matching_registration_test.cpp
+++ /dev/null
@@ -1,214 +0,0 @@
-/************************************************************************
- *
- * Copyright (C) 2017-2025 IRCAD France
- * Copyright (C) 2017-2020 IHU Strasbourg
- *
- * This file is part of Sight.
- *
- * Sight is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Sight is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Sight. If not, see <https://www.gnu.org/licenses/>.
- *
- ***********************************************************************/
-
-// cspell:ignore FFTWFFT
-
-#include "helper.hpp"
-
-#include <core/tools/dispatcher.hpp>
-
-#include <data/helper/medical_image.hpp>
-#include <data/matrix4.hpp>
-
-#include <filter/image/metric.hpp>
-#include <filter/image/mip_matching_registration.hpp>
-#include "filter/image/detail/mip_matching_registration.hxx"
-#include <filter/image/resampler.hpp>
-
-#include <io/itk/itk.hpp>
-
-#include <utest_data/generator/image.hpp>
-
-#include <glm/gtc/matrix_access.hpp>
-#include <glm/gtc/matrix_transform.hpp>
-#include <glm/gtc/quaternion.hpp>
-#include <glm/mat4x4.hpp>
-
-#include <itkImage.h>
-#include <itkRegionOfInterestImageFilter.h>
-#include <itkResampleImageFilter.h>
-
-#if ITK_VERSION_MAJOR >= 5 && ITK_VERSION_MINOR >= 3 && defined(__unix__)
-#include <itkFFTWFFTImageFilterInitFactory.h>
-#endif
-
-#include <doctest/doctest.h>
-
-TEST_SUITE("sight::filter::image::mip_matching_registration")
-{
-//------------------------------------------------------------------------------
-
-    TEST_CASE("identity")
-    {
-#if ITK_VERSION_MAJOR >= 5 && ITK_VERSION_MINOR >= 3 && defined(__unix__)
-        auto factory = ::itk::FFTWFFTImageFilterInitFactory::New();
-        itk::FFTWFFTImageFilterInitFactory::RegisterFactories();
-#endif
-
-        sight::data::image::csptr moving = create_sphere_image<std::uint16_t, 3>();
-        sight::data::image::csptr fixed  = sight::data::object::copy(moving);
-
-        sight::data::matrix4::sptr mat = std::make_shared<sight::data::matrix4>();
-
-        sight::filter::image::registration_dispatch::parameters params;
-        params.fixed     = fixed;
-        params.moving    = moving;
-        params.transform = std::make_shared<sight::data::matrix4>();
-
-        sight::core::type type = moving->type();
-        sight::core::tools::dispatcher<sight::core::tools::supported_dispatcher_types,
-                                       sight::filter::image::registration_dispatch>::invoke(type, params);
-
-        for(std::size_t i = 0 ; i != 3 ; ++i)
-        {
-            CHECK_MESSAGE(
-                0. == (*params.transform)(i, 3),
-                "Translation value is not equal to '0' "
-            );
-        }
-    }
-
-//------------------------------------------------------------------------------
-
-    TEST_CASE("translate_transform")
-    {
-#if ITK_VERSION_MAJOR >= 5 && ITK_VERSION_MINOR >= 3 && defined(__unix__)
-        auto factory = ::itk::FFTWFFTImageFilterInitFactory::New();
-        itk::FFTWFFTImageFilterInitFactory::RegisterFactories();
-#endif
-
-        sight::data::image::csptr moving = create_sphere_image<std::uint16_t, 3>();
-        sight::data::image::sptr fixed   = std::make_shared<sight::data::image>();
-
-        sight::data::matrix4::sptr transform = std::make_shared<sight::data::matrix4>();
-        (*transform)(0, 3) = 4.;
-        (*transform)(1, 3) = 12.;
-        (*transform)(2, 3) = 7.;
-
-        sight::filter::image::resampler::resample(moving, fixed, transform);
-
-        std::array<double, 3> expected {{4., 12., 7.}};
-
-        sight::filter::image::registration_dispatch::parameters params;
-        params.fixed     = fixed;
-        params.moving    = moving;
-        params.transform = std::make_shared<sight::data::matrix4>();
-
-        sight::core::type type = moving->type();
-        sight::core::tools::dispatcher<sight::core::tools::supported_dispatcher_types,
-                                       sight::filter::image::registration_dispatch>::invoke(type, params);
-
-        for(std::size_t i = 0 ; i < 3 ; ++i)
-        {
-            CHECK_MESSAGE(
-                doctest::Approx(expected[i]).epsilon(1e-2) == (*params.transform)(i, 3),
-                "Actual transform does not match expected results"
-            );
-        }
-    }
-
-//------------------------------------------------------------------------------
-
-    TEST_CASE("translate_transform_with_scales")
-    {
-#if ITK_VERSION_MAJOR >= 5 && ITK_VERSION_MINOR >= 3 && defined(__unix__)
-        auto factory = ::itk::FFTWFFTImageFilterInitFactory::New();
-        itk::FFTWFFTImageFilterInitFactory::RegisterFactories();
-#endif
-
-        using image_t = itk::Image<std::uint16_t, 3>;
-
-        // Create the moving image
-        auto moving_spacing = image_t::SpacingType(1.);
-        moving_spacing[1] = 1.3;
-
-        sight::data::image::sptr moving = create_sphere_image<std::uint16_t, 3>(moving_spacing);
-        sight::data::image::sptr fixed  = std::make_shared<sight::data::image>();
-
-        moving->set_origin({107., 50., -30.});
-
-        // Translate the image a bit
-        std::array<double, 3> v_trans {{4., 19., 7.}};
-
-        sight::data::matrix4::sptr transform = std::make_shared<sight::data::matrix4>();
-        (*transform)(0, 3) = v_trans[0];
-        (*transform)(1, 3) = v_trans[1];
-        (*transform)(2, 3) = v_trans[2];
-
-        sight::filter::image::resampler::resample(moving, fixed, transform);
-
-        auto fixed_origin  = std::array<double, 3> {{20., 10., 35.}};
-        auto moving_origin = moving->origin();
-
-        fixed->set_origin(fixed_origin);
-
-        std::array<float, 3> expected
-        {
-            {
-                float(moving_origin[0] + v_trans[0] - fixed_origin[0]),
-                float(moving_origin[1] + v_trans[1] - fixed_origin[1]),
-                float(moving_origin[2] + v_trans[2] - fixed_origin[2])
-            }
-        };
-
-        auto itk_fixed = sight::io::itk::move_to_itk<image_t>(fixed);
-
-        // Resample the image to get a different spacing
-        image_t::SizeType new_size {};
-        image_t::SpacingType new_spacing(2.);
-
-        for(uint8_t i = 0 ; i != 3 ; ++i)
-        {
-            new_size[i] = static_cast<unsigned int>(moving_spacing[i] / new_spacing[i] * double(moving->size()[i]));
-        }
-
-        auto resample = itk::ResampleImageFilter<image_t, image_t>::New();
-        resample->SetInput(itk_fixed);
-        resample->SetSize(new_size);
-        resample->SetOutputSpacing(new_spacing);
-        resample->SetOutputOrigin(itk_fixed->GetOrigin());
-        resample->Update();
-
-        auto* resampled          = resample->GetOutput();
-        auto resampled_f4s_fixed = sight::io::itk::move_from_itk<image_t>(resampled, true);
-
-        sight::filter::image::registration_dispatch::parameters params;
-        params.fixed     = resampled_f4s_fixed;
-        params.moving    = moving;
-        params.transform = std::make_shared<sight::data::matrix4>();
-
-        sight::core::type type = moving->type();
-        sight::core::tools::dispatcher<sight::core::tools::supported_dispatcher_types,
-                                       sight::filter::image::registration_dispatch>::invoke(type, params);
-
-        for(std::size_t i = 0 ; i < 3 ; ++i)
-        {
-            CHECK_MESSAGE(
-                doctest::Approx(double(expected[i])).epsilon(double(moving_spacing[std::uint32_t(i)]))
-                == (*params.transform)(i, 3),
-                "Actual transform does not match expected results"
-            );
-        }
-    }
-
-//------------------------------------------------------------------------------
-} // TEST_SUITE("sight::filter::image::mip_matching_registration")
--- a/module/filter/image/mip_matching_registration.hpp
+++ /dev/null
@@ -1,117 +0,0 @@
-/************************************************************************
- *
- * Copyright (C) 2018-2024 IRCAD France
- * Copyright (C) 2018-2019 IHU Strasbourg
- *
- * This file is part of Sight.
- *
- * Sight is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Sight is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Sight. If not, see <https://www.gnu.org/licenses/>.
- *
- ***********************************************************************/
-
-#pragma once
-
-#include <data/image.hpp>
-#include <data/matrix4.hpp>
-
-#include <service/registerer.hpp>
-
-namespace sight::module::filter::image
-{
-
-/**
- * @brief This service uses a fast registration algorithm to quickly register two images together if the transform
- * between both is pure translation.
- *
- * @section Signals Signals
- *
- * @section Slots Slots
- *   - \b update: compute the registration
- *
- * @section XML XML Configuration
- *
- * @code{.xml}
-   <service uid="..." type="sight::module::filter::image::SFastRegistration">
-       <in key="source" uid="..." />
-       <in key="target" uid="..." />
-       <in key="transform" uid="..." />
-   </service>
- * @endcode
- *
- * @subsection Input Input
- * - \b source [sight::data::image]: Input image that will be aligned to the target.
- * - \b target [sight::data::image]: Input image to which the source will be aligned.
- *
- * @subsection In-Out In-Out
- * - \b transform [sight::data::matrix4]: initial registration. The computed registration will be
- *   concatenated to the initial registration matrix.
- */
-class mip_matching_registration : public service::registerer
-{
-public:
-
-    SIGHT_DECLARE_SERVICE(mip_matching_registration, service::registerer);
-
-    /**
-     * @brief Constructor
-     */
-    mip_matching_registration() noexcept = default;
-    /**
-     * @brief Destructor
-     */
-    ~mip_matching_registration() noexcept override = default;
-
-protected:
-
-    /**
-     * @brief Starts the service.
-     *
-     * @throw core::tools::failed
-     */
-    void starting() override;
-
-    /**
-     * @brief Stops the service.
-     *
-     * @throw core::tools::failed
-     */
-    void stopping() override;
-
-    /**
-     * @brief Configures the service.
-     *
-     * @throw core::tools::failed
-     */
-    void configuring() override;
-
-    /**
-     * @brief Compute the registration.
-     *
-     * @throw core::tools::failed
-     */
-    void updating() override;
-
-    /**
-     * @brief Compute the registration by calling the `update` slot. The timestamp parameter is discarded.
-     */
-    void compute_registration(core::clock::type _timestamp) override;
-
-private:
-
-    sight::data::ptr<sight::data::image, sight::data::access::in> m_source {this, "fixed"};
-    sight::data::ptr<sight::data::image, sight::data::access::in> m_target {this, "moving"};
-    sight::data::ptr<sight::data::matrix4, sight::data::access::inout> m_transform {this, "transform"};
-};
-
-} // namespace sight::module::filter::image
--- a/module/filter/image/mip_matching_registration.cpp
+++ /dev/null
@@ -1,80 +0,0 @@
-/************************************************************************
- *
- * Copyright (C) 2017-2025 IRCAD France
- * Copyright (C) 2017-2020 IHU Strasbourg
- *
- * This file is part of Sight.
- *
- * Sight is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Sight is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Sight. If not, see <https://www.gnu.org/licenses/>.
- *
- ***********************************************************************/
-
-#include "mip_matching_registration.hpp"
-
-#include <core/tools/dispatcher.hpp>
-
-#include <filter/image/mip_matching_registration.hpp>
-#include <filter/image/resampler.hpp>
-
-#include <geometry/data/matrix4.hpp>
-
-#include <functional>
-#include <numeric>
-
-namespace sight::module::filter::image
-{
-
-//------------------------------------------------------------------------------
-
-void mip_matching_registration::starting()
-{
-}
-
-//------------------------------------------------------------------------------
-
-void mip_matching_registration::stopping()
-{
-}
-
-//------------------------------------------------------------------------------
-
-void mip_matching_registration::configuring()
-{
-}
-
-//------------------------------------------------------------------------------
-
-void mip_matching_registration::updating()
-{
-    const auto fixed  = m_target.lock();
-    const auto moving = m_source.lock();
-    auto transform    = m_transform.lock();
-
-    SIGHT_ASSERT("Missing required input 'fixed'", fixed);
-    SIGHT_ASSERT("Missing required input 'moving'", moving);
-    SIGHT_ASSERT("Missing required inout 'transform'", transform);
-
-    sight::filter::image::mip_matching_register(*fixed, *moving, *transform);
-
-    transform->signal<data::matrix4::modified_signal_t>(data::matrix4::MODIFIED_SIG)->async_emit();
-}
-
-//------------------------------------------------------------------------------
-
-void mip_matching_registration::compute_registration(core::clock::type /*timestamp*/)
-{
-    this->updating();
-}
-
-} // namespace sight::module::filter::image