Merge pull request #1976 from alicevision/dev/cleanupImage

Cleanup image module

Author: servantftransperfect

src/aliceVision/featureEngine/FeatureExtractor.cpp

@@ -6,6 +6,7 @@
 
 #include "FeatureExtractor.hpp"
 #include <aliceVision/image/io.hpp>
+#include <aliceVision/image/imageAlgo.hpp>
 #include <aliceVision/system/MemoryInfo.hpp>
 #include <aliceVision/utils/filesIO.hpp>
 #include <aliceVision/alicevision_omp.hpp>

src/aliceVision/fuseCut/PointCloud.cpp

@@ -19,6 +19,8 @@
 #include <geogram/mesh/mesh.h>
 #include <geogram/basic/geometry_nd.h>
 
+#include <aliceVision/image/imageAlgo.hpp>
+
 namespace aliceVision {
 namespace fuseCut {
 

src/aliceVision/image/CMakeLists.txt

@@ -6,7 +6,6 @@ set(image_files_headers
     Image.hpp
     imageAlgo.hpp
     colorspace.hpp
-    concat.hpp
     conversion.hpp
     convolutionBase.hpp
     convolution.hpp
@@ -17,7 +16,6 @@ set(image_files_headers
     io.hpp
     jetColorMap.cpp
     resampling.hpp
-    warping.hpp
     pixelTypes.hpp
     Rgb.hpp
     Sampler.hpp

src/aliceVision/image/all.hpp

@@ -19,7 +19,6 @@
 #include "aliceVision/image/filtering.hpp"
 #include "aliceVision/image/resampling.hpp"
 #include "aliceVision/image/diffusion.hpp"
-#include "aliceVision/image/concat.hpp"
 #include <aliceVision/image/imageAlgo.hpp>
 #include "aliceVision/image/io.hpp"
 #include "aliceVision/image/convolutionBase.hpp"

src/aliceVision/image/concat.hpp

@@ -111,47 +111,5 @@ void ConvertPixelType(const ImageIn& imaIn, ImageOut* imaOut)
             Convert(imaIn(j, i), (*imaOut)(j, i));
 }
 
-//--------------------------------------------------------------------------
-// RGB ( unsigned char or int ) to Float
-//--------------------------------------------------------------------------
-
-template<typename Tin, typename Tout>
-inline void convertRGB2Float(const Tin& valIn, Tout& valOut, float factor = 1.0f / 255.f)
-{
-    for (int channel = 0; channel < 3; ++channel)
-        valOut(channel) = (float)((int)(valIn(channel)) * factor);
-}
-
-template<typename ImageIn>
-void rgb2Float(const ImageIn& imaIn, Image<RGBfColor>* imaOut, float factor = 1.0f / 255.f)
-{
-    assert(imaIn.depth() == 3);
-    (*imaOut).resize(imaIn.width(), imaIn.height());
-    // Convert each int RGB to float RGB values
-    for (int j = 0; j < imaIn.height(); ++j)
-        for (int i = 0; i < imaIn.width(); ++i)
-            convertRGB2Float(imaIn(j, i), (*imaOut)(j, i), factor);
-}
-
-//--------------------------------------------------------------------------
-// Float to RGB ( unsigned char or int )
-//--------------------------------------------------------------------------
-
-inline void convertFloatToInt(const RGBfColor& valIn, RGBColor& valOut, float factor = 255.f)
-{
-    for (int channel = 0; channel < 3; ++channel)
-        valOut(channel) = (int)(valIn(channel) * factor);
-}
-
-inline void rgbFloat2rgbInt(const Image<RGBfColor>& imaIn, Image<RGBColor>* imaOut, float factor = 255.f)
-{
-    assert(imaIn.depth() == 3);
-    (*imaOut).resize(imaIn.width(), imaIn.height());
-    // Convert each int RGB to float RGB values
-    for (int j = 0; j < imaIn.height(); ++j)
-        for (int i = 0; i < imaIn.width(); ++i)
-            convertFloatToInt(imaIn(j, i), (*imaOut)(j, i), factor);
-}
-
 }  // namespace image
 }  // namespace aliceVision

src/aliceVision/image/conversion.hpp

@@ -7,8 +7,7 @@
 #include <string>
 
 #include <OpenImageIO/imagebuf.h>
-
-#include <aliceVision/image/all.hpp>
+#include <aliceVision/image/Image.hpp>
 
 namespace aliceVision {
 namespace image {

src/aliceVision/image/dcp.hpp

@@ -5,7 +5,7 @@
 // v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
-#include "aliceVision/image/all.hpp"
+#include "aliceVision/image/drawing.hpp"
 
 #define BOOST_TEST_MODULE ImageDrawing
 

src/aliceVision/image/drawing_test.cpp

@@ -60,49 +60,6 @@ void imageYDerivative(const Image& img, Image& out, const bool normalize = true)
     imageVerticalConvolution(img, kernel, out);
 }
 
-/**
- ** Compute X-derivative using 3x3 Sobel kernel
- ** @param img Input image
- ** @param out Output image
- ** @param normalize true if kernel must be scaled by 1/8
- **/
-template<typename Image>
-void imageSobelXDerivative(const Image& img, Image& out, const bool normalize = true)
-{
-    Vec3 kernel_horiz(-1.0, 0.0, 1.0);
-
-    if (normalize)
-        kernel_horiz *= 0.5;
-
-    Vec3 kernel_vert(1.0, 2.0, 1.0);
-
-    if (normalize)
-        kernel_vert *= 0.25;
-
-    imageSeparableConvolution(img, kernel_horiz, kernel_vert, out);
-}
-
-/**
- ** Compute Y-derivative using 3x3 Sobel kernel
- ** @param img Input image
- ** @param out Output image
- ** @param normalize true if kernel must be scaled by 1/8
- **/
-template<typename Image>
-void imageSobelYDerivative(const Image& img, Image& out, const bool normalize = true)
-{
-    Vec3 kernel_horiz(1.0, 2.0, 1.0);
-
-    if (normalize)
-        kernel_horiz *= 0.25;
-
-    Vec3 kernel_vert(-1.0, 0.0, 1.0);
-
-    if (normalize)
-        kernel_vert *= 0.5;
-
-    imageSeparableConvolution(img, kernel_horiz, kernel_vert, out);
-}
 
 /**
  ** Compute X-derivative using 3x3 Scharr kernel

src/aliceVision/image/filtering.hpp

@@ -5,7 +5,10 @@
 // v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
-#include "aliceVision/image/all.hpp"
+#include <aliceVision/image/Image.hpp>
+#include <aliceVision/image/colorspace.hpp>
+#include <aliceVision/image/filtering.hpp>
+#include <aliceVision/image/io.hpp>
 
 #include <iostream>
 
@@ -100,42 +103,3 @@ BOOST_AUTO_TEST_CASE(Image_Convolution_Scharr_X_Y)
       writeImage("out_ScharrY.png", outFilteredCast, image::ImageWriteOptions().toColorSpace(image::EImageColorSpace::NO_CONVERSION)));
 }
 
-BOOST_AUTO_TEST_CASE(Image_Convolution_Sobel_X_Y)
-{
-    Image<float> in(40, 40, true);
-    in.block(10, 10, 20, 20).fill(255.f);
-
-    Image<float> outFiltered(40, 40, true);
-
-    imageSobelXDerivative(in, outFiltered);
-
-    // X dir
-    BOOST_CHECK_EQUAL(127.5f, outFiltered(20, 10));
-    BOOST_CHECK_EQUAL(-127.5f, outFiltered(20, 30));
-    // Y dir
-    BOOST_CHECK_EQUAL(0.f, outFiltered(10, 20));
-    BOOST_CHECK_EQUAL(0.f, outFiltered(30, 20));
-    // Check it exist a vertical black band
-    BOOST_CHECK_EQUAL(0.f, outFiltered.block(0, 10 + 3, 40, 20 - 2 * 3).array().abs().sum());
-
-    Image<unsigned char> inCast = Image<unsigned char>(in.cast<unsigned char>());
-    Image<unsigned char> outFilteredCast = Image<unsigned char>(outFiltered.cast<unsigned char>());
-    BOOST_CHECK_NO_THROW(writeImage("in_Scharr.png", inCast, image::ImageWriteOptions().toColorSpace(image::EImageColorSpace::NO_CONVERSION)));
-    BOOST_CHECK_NO_THROW(
-      writeImage("out_SobelX.png", outFilteredCast, image::ImageWriteOptions().toColorSpace(image::EImageColorSpace::NO_CONVERSION)));
-
-    outFiltered.fill(0.0f);
-    imageSobelYDerivative(in, outFiltered);
-
-    // X dir
-    BOOST_CHECK_EQUAL(0.f, outFiltered(20, 10));
-    BOOST_CHECK_EQUAL(0.f, outFiltered(20, 30));
-    // Y dir
-    BOOST_CHECK_EQUAL(127.5f, outFiltered(10, 20));
-    BOOST_CHECK_EQUAL(-127.5f, outFiltered(30, 20));
-    // Check it exist a horizontal black band
-    BOOST_CHECK_EQUAL(0.f, outFiltered.block(10 + 3, 0, 20 - 2 * 3, 40).array().abs().sum());
-    outFilteredCast = Image<unsigned char>(outFiltered.cast<unsigned char>());
-    BOOST_CHECK_NO_THROW(
-      writeImage("out_SobelY.png", outFilteredCast, image::ImageWriteOptions().toColorSpace(image::EImageColorSpace::NO_CONVERSION)));
-}