diff --git a/src/G3PointAction.cpp b/src/G3PointAction.cpp index 2c091a2..e1e0e16 100644 --- a/src/G3PointAction.cpp +++ b/src/G3PointAction.cpp @@ -318,7 +318,7 @@ int G3PointAction::segmentLabels(bool useParallelStrategy) for (auto i : stack) { labels(i) = k; - labelsnpoint(i) = stack.size(); + labelsnpoint(i) = static_cast(stack.size()); if (g3point_label) { g3point_label->setValue(i, k); @@ -372,7 +372,7 @@ Eigen::ArrayXXd G3PointAction::computeMeanAngleBetweenNormalsAtBorders() duplicated_labels(Eigen::all, n) = m_labels; } Eigen::ArrayXXi labels_of_neighbors(m_cloud->size(), m_kNN); - for (int index = 0; index < m_cloud->size(); index++) + for (int index = 0; index < static_cast(m_cloud->size()); index++) { for (int n = 0; n < m_kNN; n++) { @@ -547,7 +547,7 @@ bool G3PointAction::updateLabelsAndColors() for (auto i : stack) { m_labels(i) = k; - m_labelsnpoint(i) = stack.size(); + m_labelsnpoint(i) = static_cast(stack.size()); if (g3point_label) { g3point_label->setValue(i, k); @@ -594,7 +594,7 @@ bool G3PointAction::exportLocalMaximaAsCloud(const Eigen::ArrayXi& localMaximumI //allocate colors if necessary if (cloud->resizeTheRGBTable()) { - for (int index = 0; index < cloud->size(); index++) + for (int index = 0; index < static_cast(cloud->size()); index++) { cloud->setPointColor(index, randomColors.getValue(index)); } @@ -665,7 +665,7 @@ bool G3PointAction::buildStacksFromG3PointLabelSF(CCCoreLib::ScalarField* g3Poin for (auto label : labels) { std::vector stack; - for (int idx =0; idx < m_cloud->size(); idx++) + for (int idx =0; idx < static_cast(m_cloud->size()); idx++) { if (g3PointLabel->getLocalValue(idx) == label) { @@ -802,7 +802,7 @@ bool G3PointAction::keep(Xb& condition) + "/" + QString::number(m_stacks.size()) + " gains (" + QString::number(m_stacks.size() - newStacks.size()) + " removed)"); - if (!processNewStacks(newStacks, pointCount)) + if (!processNewStacks(newStacks, static_cast(pointCount))) { ccLog::Error("[G3PointAction::keep] processing newStacks failed"); } @@ -1031,7 +1031,7 @@ void G3PointAction::fit() connect(m_dlg, &G3PointDialog::drawPoints, m_grainsAsEllipsoids, &GrainsAsEllipsoids::drawPoints); connect(m_dlg, &G3PointDialog::glPointSize, m_grainsAsEllipsoids, &GrainsAsEllipsoids::setGLPointSize); - m_dlg->setOnlyOneMax(m_stacks.size()); + m_dlg->setOnlyOneMax(static_cast(m_stacks.size())); m_dlg->emitSignals(); // force to send parameters to m_grainsAsEllipsoids // m_cloud->getParent()->addChild(m_grainsAsEllipsoids.get()); @@ -1122,7 +1122,7 @@ bool G3PointAction::wolman() } // get the ellipsoid y axes andd labels - int nEllipsoids = m_grainsAsEllipsoids->m_center.size(); + int nEllipsoids = static_cast(m_grainsAsEllipsoids->m_center.size()); Eigen::VectorXf b_axis(nEllipsoids); Eigen::VectorXi ellipsoidLabels(nEllipsoids); for (int i = 0; i < nEllipsoids; i++) @@ -1262,12 +1262,12 @@ bool G3PointAction::angles() return false; } - float delta = 1e32; - size_t n_ellipsoids = m_grainsAsEllipsoids->m_rotationMatrix.size(); + float delta = static_cast(1e32); + int n_ellipsoids = static_cast(m_grainsAsEllipsoids->m_rotationMatrix.size()); QVector granuloAngleMView(n_ellipsoids); QVector granuloAngleXView(n_ellipsoids); - for (size_t i = 0; i < n_ellipsoids; i++) + for (int i = 0; i < n_ellipsoids; i++) { float u, v, w; @@ -1341,7 +1341,7 @@ bool G3PointAction::cleanLabels() Eigen::ArrayXi stackSize(m_stacks.size()); for (size_t k = 0; k < m_stacks.size(); k++) { - stackSize(k) = m_stacks[k].size(); + stackSize(k) = static_cast(m_stacks[k].size()); } Xb condition = (stackSize > m_nMin); size_t numberOfGrainsToKeep = condition.count(); @@ -1561,7 +1561,7 @@ int G3PointAction::segmentLabelsBraunWillett(bool useParallelStrategy) for (auto i : stack) { m_initial_labels(i) = k; - m_initial_labelsnpoint(i) = stack.size(); + m_initial_labelsnpoint(i) = static_cast(stack.size()); if (g3point_label) { g3point_label->setValue(i, k); @@ -1822,7 +1822,7 @@ void G3PointAction::segment() computeNormalsWithOpen3D(); // compute the centroid - int pointCount = m_cloud->size(); + unsigned pointCount = m_cloud->size(); CCVector3d G(0, 0, 0); { for (unsigned i = 0; i < pointCount; ++i) @@ -1886,7 +1886,7 @@ void G3PointAction::getBorders() duplicatedLabelsInColumns(Eigen::all, n) = m_labels; } Eigen::ArrayXXi labelsOfNeighbors(m_cloud->size(), m_kNN); - for (int index = 0; index < m_cloud->size(); index++) + for (int index = 0; index < static_cast(m_cloud->size()); index++) { for (int n = 0; n < m_kNN; n++) { diff --git a/src/GrainsAsEllipsoids.cpp b/src/GrainsAsEllipsoids.cpp index 4e5fedb..abb5105 100644 --- a/src/GrainsAsEllipsoids.cpp +++ b/src/GrainsAsEllipsoids.cpp @@ -1005,7 +1005,7 @@ bool GrainsAsEllipsoids::drawEllipsoids(CC_DRAW_CONTEXT& context) glFunc->glDisable(GL_LIGHTING); glFunc->glDisable(GL_TEXTURE_2D); - glFunc->glDrawArrays(GL_POINTS, 0, stack.size()); + glFunc->glDrawArrays(GL_POINTS, 0, static_cast(stack.size())); // reset the vertex positions to the template sphere m_program->setAttributeArray("vertexPosition", static_cast(vertices.data()), 3);