diff --git a/src/Mod/Mesh/App/Core/Approximation.cpp b/src/Mod/Mesh/App/Core/Approximation.cpp index 0cc23d404..2c1731e26 100644 --- a/src/Mod/Mesh/App/Core/Approximation.cpp +++ b/src/Mod/Mesh/App/Core/Approximation.cpp @@ -452,8 +452,8 @@ void QuadraticFit::CalcEigenValues(double &dLambda1, double &dLambda2, double &d */ Wm4::Matrix3 akMat(_fCoeff[4], _fCoeff[7]/2.0f, _fCoeff[8]/2.0f, - _fCoeff[7]/2.0f, _fCoeff[5], _fCoeff[9]/2.0f, - _fCoeff[8]/2.0f, _fCoeff[9]/2.0f, _fCoeff[6] ); + _fCoeff[7]/2.0f, _fCoeff[5], _fCoeff[9]/2.0f, + _fCoeff[8]/2.0f, _fCoeff[9]/2.0f, _fCoeff[6] ); Wm4::Matrix3 rkRot, rkDiag; akMat.EigenDecomposition( rkRot, rkDiag ); @@ -476,9 +476,9 @@ void QuadraticFit::CalcZValues( double x, double y, double &dZ1, double &dZ2 ) c assert( _bIsFitted ); double dDisk = _fCoeff[3]*_fCoeff[3]+2*_fCoeff[3]*_fCoeff[8]*x+2*_fCoeff[3]*_fCoeff[9]*y+ - _fCoeff[8]*_fCoeff[8]*x*x+2*_fCoeff[8]*x*_fCoeff[9]*y+_fCoeff[9]*_fCoeff[9]*y*y- - 4*_fCoeff[6]*_fCoeff[0]-4*_fCoeff[6]*_fCoeff[1]*x-4*_fCoeff[6]*_fCoeff[2]*y- - 4*_fCoeff[6]*_fCoeff[7]*x*y-4*_fCoeff[6]*_fCoeff[4]*x*x-4*_fCoeff[6]*_fCoeff[5]*y*y; + _fCoeff[8]*_fCoeff[8]*x*x+2*_fCoeff[8]*x*_fCoeff[9]*y+_fCoeff[9]*_fCoeff[9]*y*y- + 4*_fCoeff[6]*_fCoeff[0]-4*_fCoeff[6]*_fCoeff[1]*x-4*_fCoeff[6]*_fCoeff[2]*y- + 4*_fCoeff[6]*_fCoeff[7]*x*y-4*_fCoeff[6]*_fCoeff[4]*x*x-4*_fCoeff[6]*_fCoeff[5]*y*y; if (fabs( _fCoeff[6] ) < 0.000005) { dZ1 = FLOAT_MAX; diff --git a/src/Mod/Mesh/App/Core/MeshIO.cpp b/src/Mod/Mesh/App/Core/MeshIO.cpp index 909c664f5..684df06d6 100644 --- a/src/Mod/Mesh/App/Core/MeshIO.cpp +++ b/src/Mod/Mesh/App/Core/MeshIO.cpp @@ -795,17 +795,17 @@ bool MeshInput::LoadPLY (std::istream &inp) } } else { - for (std::size_t i = 0; i < v_count && std::getline(inp, line); i++) { - if (boost::regex_match(line.c_str(), what, rx_p)) { - pt.x = (float)std::atof(what[1].first); - pt.y = (float)std::atof(what[4].first); - pt.z = (float)std::atof(what[7].first); - meshPoints.push_back(pt); + for (std::size_t i = 0; i < v_count && std::getline(inp, line); i++) { + if (boost::regex_match(line.c_str(), what, rx_p)) { + pt.x = (float)std::atof(what[1].first); + pt.y = (float)std::atof(what[4].first); + pt.z = (float)std::atof(what[7].first); + meshPoints.push_back(pt); + } + else { + return false; + } } - else { - return false; - } - } } int f1, f2, f3; for (std::size_t i = 0; i < f_count && std::getline(inp, line); i++) {