Minor fixes

Signed-off-by: Nick Avramoussis <[email protected]>

Author: Idclip

openvdb/openvdb/points/impl/PrincipalComponentAnalysisImpl.h

@@ -222,7 +222,7 @@ struct WeightPosSumsTransfer
 
     inline void rasterizePoints(const Coord&, const Index start, const Index end, const CoordBBox& bounds)
     {
-        const Index step = std::max(1ul, ((end - start) / this->maxSourcePointsPerVoxel()));
+        const Index step = std::max(Index(1), Index((end - start) / this->maxSourcePointsPerVoxel()));
 
         const auto* const data = this->template buffer<0>();
         const auto& mask = *(this->template mask<0>());
@@ -275,7 +275,7 @@ struct WeightPosSumsTransfer
                         const Index targetEnd = data[offset];
                         const Index targetStart = (offset == 0) ? 0 : Index(data[offset - 1]);
                         const Index targetStep =
-                            std::max(1ul, ((targetEnd - targetStart) / this->maxTargetPointsPerVoxel()));
+                            std::max(Index(1), Index((targetEnd - targetStart) / this->maxTargetPointsPerVoxel()));
 
                         /// @warning  stepping in this way does not guarantee
                         ///   we get a self contribution, could guarantee this
@@ -319,7 +319,7 @@ struct WeightPosSumsTransfer
 
         points::GroupWriteHandle group(leaf.groupWriteHandle(this->mIndices.mEllipsesGroupIndex));
 
-        const int32_t threshold = this->neighbourThreshold();
+        const int32_t threshold = int32_t(this->neighbourThreshold());
         for (Index i = 0; i < this->mTargetPosition->size(); ++i)
         {
             // turn points OFF if they are ON and don't meet max neighbour requirements
@@ -379,7 +379,7 @@ struct CovarianceTransfer
 
     inline void rasterizePoints(const Coord&, const Index start, const Index end, const CoordBBox& bounds)
     {
-        const Index step = std::max(1ul, ((end - start) / this->maxSourcePointsPerVoxel()));
+        const Index step = std::max(Index(1), Index((end - start) / this->maxSourcePointsPerVoxel()));
 
         const auto* const data = this->template buffer<0>();
         const auto& mask = *(this->template mask<0>());
@@ -431,7 +431,7 @@ struct CovarianceTransfer
                         const Index targetEnd = data[offset];
                         const Index targetStart = (offset == 0) ? 0 : Index(data[offset - 1]);
                         const Index targetStep =
-                            std::max(1ul, ((targetEnd - targetStart) / this->maxTargetPointsPerVoxel()));
+                            std::max(Index(1), Index((targetEnd - targetStart) / this->maxTargetPointsPerVoxel()));
 
                         for (Index tgtid = targetStart; tgtid < targetEnd; tgtid += targetStep)
                         {

openvdb/openvdb/unittest/TestPCA.cc

@@ -267,7 +267,7 @@ TEST_F(TestPCA, testPCA)
         points::PcaSettings s;
         s.searchRadius = std::numeric_limits<float>::max();
         s.averagePositions = 0.0f; // disable position smoothing
-        s.neighbourThreshold = 3; // more than 2, points should end up as spheres
+        s.neighbourThreshold = 4; // more than 3, points should end up as spheres
         s.nonAnisotropicStretch = 2.0f;
 
         points::pca(*points, s, a);

openvdb/openvdb/unittest/TestPointRasterizeSDF.cc

@@ -1203,15 +1203,15 @@ TEST_F(TestPointRasterizeSDF, testRasterizeEllipsoids)
         Ellipse ellipse(Vec3d(0), (stretch * (s.radiusScale/sdf->voxelSize()[0])), rot);
 
         for (auto iter = sdf->cbeginValueOn(); iter; ++iter) {
-            const float distance = ellipse.project(iter.getCoord().asVec3d()) * float(sdf->voxelSize()[0]);
+            const float distance = float(ellipse.project(iter.getCoord().asVec3d()) * float(sdf->voxelSize()[0]));
             EXPECT_NEAR(distance, *iter, 1e-6f);
         }
 
         // check off values (because we're also squashing the halfband we
         // just compre the overal length to 0.0)
         size_t interiorOff = 0, exteriorOff = 0;
         for (auto iter = sdf->cbeginValueOff(); iter; ++iter) {
-            const float distance = ellipse.project(iter.getCoord().asVec3d()) * float(sdf->voxelSize()[0]);
+            const float distance = float(ellipse.project(iter.getCoord().asVec3d()) * float(sdf->voxelSize()[0]));
             const bool interior = (distance <= 0.0);
             if (interior) EXPECT_EQ(-sdf->background(), *iter);
             else          EXPECT_EQ(sdf->background(), *iter);
@@ -1262,8 +1262,6 @@ TEST_F(TestPointRasterizeSDF, testRasterizeEllipsoids)
         c.setToRotation({0,0,1}, 66);
         rot = a * b * c;
 
-        // The transform that defines how we go from each voxel back to the source point
-        const math::Mat3s inv = rot.timesDiagonal(1.0 / stretch) * rot.transpose();
         //
 
         /// 1) test with a single ellips with Y stretch/rotation
@@ -1289,15 +1287,15 @@ TEST_F(TestPointRasterizeSDF, testRasterizeEllipsoids)
         const Ellipse ellipse(sdf->worldToIndex(center), stretch * (1/sdf->voxelSize()[0]), rot);
 
         for (auto iter = sdf->cbeginValueOn(); iter; ++iter) {
-            const float distance = ellipse.project(iter.getCoord().asVec3d()) * float(sdf->voxelSize()[0]);
+            const float distance = float(ellipse.project(iter.getCoord().asVec3d()) * float(sdf->voxelSize()[0]));
             EXPECT_NEAR(distance, *iter, 1e-6f);
         }
 
         // check off values (because we're also squashing the halfband we
         // just compre the overal length to 0.0)
         size_t interiorOff = 0, exteriorOff = 0;
         for (auto iter = sdf->cbeginValueOff(); iter; ++iter) {
-            const float distance = ellipse.project(iter.getCoord().asVec3d()) * float(sdf->voxelSize()[0]);
+            const float distance = float(ellipse.project(iter.getCoord().asVec3d()) * float(sdf->voxelSize()[0]));
             const bool interior = (distance <= 0.0);
             if (interior) EXPECT_EQ(-sdf->background(), *iter);
             else          EXPECT_EQ(sdf->background(), *iter);