[MERGE]

src/common/math/WSymmetricSphericalHarmonic.cpp

@@ -391,8 +391,6 @@ WMatrix_2 WSymmetricSphericalHarmonic::calcFRTMatrix( size_t order )
     return result;
 }
 
-#ifdef OW_USE_OSSIM
-
 WMatrix_2 WSymmetricSphericalHarmonic::calcSHToTensorSymMatrix( std::size_t order,
                                                                 const std::vector< WUnitSphereCoordinates >& orientations )
 {
@@ -445,8 +443,6 @@ WMatrix_2 WSymmetricSphericalHarmonic::calcSHToTensorSymMatrix( std::size_t orde
     return p * calcBaseMatrix( ori2, order );
 }
 
-#endif // OW_USE_OSSIM
-
 void WSymmetricSphericalHarmonic::normalize()
 {
   double scale = 0.0;

src/common/math/WSymmetricSphericalHarmonic.h

@@ -184,7 +184,6 @@ public:
     */
     static WMatrix_2 calcFRTMatrix( size_t order );
 
-#ifdef OW_USE_OSSIM
     /**
      * Calculates a matrix that converts spherical harmonics to symmetric tensors of equal or lower order.
      *
@@ -192,7 +191,6 @@ public:
      * \param orientations A vector of at least (orderTensor+1) * (orderTensor+2) / 2 orientations.
      */
     static WMatrix_2 calcSHToTensorSymMatrix( std::size_t order, const std::vector< WUnitSphereCoordinates >& orientations );
-#endif  // OW_USE_OSSIM
     void normalize();
 
 protected:

src/common/math/test/WSymmetricSphericalHarmonic_test.h

@@ -105,7 +105,6 @@ public:
      */
     void testCalcSHtoTensorMatrix()
     {
-#ifdef OW_USE_OSSIM
         WVector_2 w( 6 );
         for( int i = 0; i < 6; ++i )
         {
@@ -134,7 +133,6 @@ public:
         {
             TS_ASSERT_DELTA( i.getValue( *it ), evaluateSphericalFunction( t, it->getEuclidean() ), 0.001 );
         }
-#endif  // OW_USE_OSSIM
     }
 
     /**

src/modules/gaussFiltering/WMGaussFiltering.h

@@ -44,7 +44,7 @@
  * Gauss filtering for WDataSetScalar
  *
  * \problem It works only on double value sets so far.
- * \reminder The boundary values will not be touched an considered to be zero.
+ * \reminder The boundary values will not be touched and considered to be zero.
  *
  * \ingroup modules
  */