Stereo Photometry: Add robustness to unexpected inputs

src/aliceVision/image/resampling.hpp

@@ -47,37 +47,6 @@ namespace image {
       }
   }
 
-  template <typename ImageType>
-  void downscaleImageInplace(ImageType& inout, int downscale)
-  {
-      if(downscale <= 1)
-          return;
-      ALICEVISION_LOG_TRACE("downscaleImageInplace in: " << inout.Width() << "x" << inout.Height());
-
-      {
-          // Rely on OpenImageIO to do the downscaling
-          const unsigned int w = inout.Width();
-          const unsigned int h = inout.Height();
-          const unsigned int nchannels = inout.Channels();
-
-          const unsigned int nw = (unsigned int)(floor(float(w) / downscale));
-          const unsigned int nh = (unsigned int)(floor(float(h) / downscale));
-
-          ImageType rescaled(nw, nh);
-
-          const oiio::ImageSpec imageSpecOrigin(w, h, nchannels, ColorTypeInfo<typename ImageType::Tpixel>::typeDesc);
-          const oiio::ImageSpec imageSpecResized(nw, nh, nchannels, ColorTypeInfo<typename ImageType::Tpixel>::typeDesc);
-
-          const oiio::ImageBuf inBuf(imageSpecOrigin, inout.data());
-          oiio::ImageBuf outBuf(imageSpecResized, rescaled.data());
-
-          oiio::ImageBufAlgo::resize(outBuf, inBuf);
-
-          inout.swap(rescaled);
-      }
-      ALICEVISION_LOG_TRACE("downscaleImageInplace out: " << inout.Width() << "x" << inout.Height());
-  }
-
   /**
    ** Half sample an image (ie reduce its size by a factor 2) using bilinear interpolation
    ** @param[in] src input image

src/aliceVision/lightingEstimation/augmentedNormals.hpp

@@ -25,125 +25,124 @@ using Eigen::MatrixXf;
  */
 class AugmentedNormal : public Eigen::Matrix<float, 9, 1, 0, 9, 1>
 {
-  using T = float;
-  typedef Eigen::Matrix<T, 9, 1, 0, 9, 1> BaseMatrix;
-  typedef T TBase;
-public:
+    using T = float;
+    typedef Eigen::Matrix<T, 9, 1, 0, 9, 1> BaseMatrix;
+    typedef T TBase;
 
-  AugmentedNormal() = default;
-
-  /**
-  * @brief Constructor from a normal value
-  */
-  inline AugmentedNormal(T nx, T ny, T nz)
-  {
-      (*this)(0) = nx;
-      (*this)(1) = ny;
-      (*this)(2) = nz;
-      (*this)(3) = 1;
-      (*this)(4) = nx*ny;
-      (*this)(5) = nx*nz;
-      (*this)(6) = ny*nz;
-      (*this)(7) = nx*nx - ny*ny;
-      (*this)(8) = 3 * nz * nz - 1;
-  }
-
-  /**
-  * @brief Constructor from eigen Matrix
-  */
-  explicit inline AugmentedNormal(const BaseMatrix& m)
-    : BaseMatrix(m)
-  {
-  }
-
-  explicit inline AugmentedNormal(const Eigen::Matrix<T, 3, 1, 0, 3, 1>& m)
-    : AugmentedNormal(m(0), m(1), m(2))
-  {
-  }
-
-  inline const T& nx() const
-  {
-    return ( *this )( 0 );
-  }
-  inline T& nx()
-  {
-    return ( *this )( 0 );
-  }
-
-  inline const T& ny() const
-  {
-    return ( *this )( 1 );
-  }
-  inline T& ny()
-  {
-    return ( *this )( 1 );
-  }
-
-  inline const T& nz() const
-  {
-    return ( *this )( 2 );
-  }
-  inline T& nz()
-  {
-    return ( *this )( 2 );
-  }
-
-  inline const T& nambiant() const
-  {
-    return ( *this )( 3 );
-  }
-  inline T& nambiant()
-  {
-    return ( *this )( 3 );
-  }
-
-  inline const T& nx_ny() const
-  {
-    return ( *this )( 4 );
-  }
-  inline T& nx_ny()
-  {
-    return ( *this )( 4 );
-  }
-
-  inline const T& nx_nz() const
-  {
-    return ( *this )( 5 );
-  }
-  inline T& nx_nz()
-  {
-    return ( *this )( 5 );
-  }
-
-  inline const T& ny_nz() const
-  {
-    return ( *this )( 6 );
-  }
-  inline T& ny_nz()
-  {
-    return ( *this )( 6 );
-  }
-
-  inline const T& nx2_ny2() const
-  {
-    return ( *this )( 7 );
-  }
-  inline T& nx2_ny2()
-  {
-    return ( *this )( 7 );
-  }
-
-  inline const T& nz2() const
-  {
-    return ( *this )( 8 );
-  }
-  inline T& nz2()
-  {
-    return ( *this )( 8 );
-  }
+public:
 
+    AugmentedNormal() = default;
+
+    /**
+     * @brief Constructor from a normal value
+     */
+    inline AugmentedNormal(T nx, T ny, T nz)
+    {
+        (*this)(0) = nx;
+        (*this)(1) = ny;
+        (*this)(2) = nz;
+        (*this)(3) = 1;
+        (*this)(4) = nx * ny;
+        (*this)(5) = nx * nz;
+        (*this)(6) = ny * nz;
+        (*this)(7) = nx * nx - ny * ny;
+        (*this)(8) = 3 * nz * nz - 1;
+    }
+
+    /**
+     * @brief Constructor from eigen Matrix
+     */
+    explicit inline AugmentedNormal(const BaseMatrix& m)
+      : BaseMatrix(m)
+    {
+    }
+
+    explicit inline AugmentedNormal(const Eigen::Matrix<T, 3, 1, 0, 3, 1>& m)
+      : AugmentedNormal(m(0), m(1), m(2))
+    {
+    }
+
+    inline const T& nx() const
+    {
+        return (*this)(0);
+    }
+    inline T& nx()
+    {
+        return (*this)(0);
+    }
+
+    inline const T& ny() const
+    {
+        return (*this)(1);
+    }
+    inline T& ny()
+    {
+        return (*this)(1);
+    }
+
+    inline const T& nz() const
+    {
+        return (*this)(2);
+    }
+    inline T& nz()
+    {
+        return (*this)(2);
+    }
+
+    inline const T& nambiant() const
+    {
+        return (*this)(3);
+    }
+    inline T& nambiant()
+    {
+        return (*this)(3);
+    }
+
+    inline const T& nx_ny() const
+    {
+        return (*this)(4);
+    }
+    inline T& nx_ny()
+    {
+        return (*this)(4);
+    }
+
+    inline const T& nx_nz() const
+    {
+        return (*this)(5);
+    }
+    inline T& nx_nz()
+    {
+        return (*this)(5);
+    }
+
+    inline const T& ny_nz() const
+    {
+        return (*this)(6);
+    }
+    inline T& ny_nz()
+    {
+        return (*this)(6);
+    }
+
+    inline const T& nx2_ny2() const
+    {
+        return (*this)(7);
+    }
+    inline T& nx2_ny2()
+    {
+        return (*this)(7);
+    }
+
+    inline const T& nz2() const
+    {
+        return (*this)(8);
+    }
+    inline T& nz2()
+    {
+        return (*this)(8);
+    }
 };
 
-
 }
 }