diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2011-07-26 11:54:19 +0200 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2011-07-26 23:39:04 +0200 |
commit | 188ed98e8604e2ff33724a270ebc59cef4480a25 (patch) | |
tree | 9bac6465c69b7e7e960916e0da4bbb57411ccb50 /basegfx | |
parent | 5f24eddfc8820aab181c20cd02198b5d4fb08930 (diff) |
callcatcher: remove unused methods
Diffstat (limited to 'basegfx')
-rw-r--r-- | basegfx/inc/basegfx/curve/b2dbeziertools.hxx | 1 | ||||
-rw-r--r-- | basegfx/inc/basegfx/curve/b2dcubicbezier.hxx | 16 | ||||
-rw-r--r-- | basegfx/inc/basegfx/vector/b3dvector.hxx | 13 | ||||
-rw-r--r-- | basegfx/source/curve/b2dbeziertools.cxx | 31 | ||||
-rw-r--r-- | basegfx/source/curve/b2dcubicbezier.cxx | 59 | ||||
-rw-r--r-- | basegfx/source/vector/b3dvector.cxx | 13 |
6 files changed, 0 insertions, 133 deletions
diff --git a/basegfx/inc/basegfx/curve/b2dbeziertools.hxx b/basegfx/inc/basegfx/curve/b2dbeziertools.hxx index abadf4958c90..2279cb9a8f24 100644 --- a/basegfx/inc/basegfx/curve/b2dbeziertools.hxx +++ b/basegfx/inc/basegfx/curve/b2dbeziertools.hxx @@ -56,7 +56,6 @@ namespace basegfx double getLength() const { if(maLengthArray.size()) return maLengthArray[maLengthArray.size() - 1]; else return 0.0; } double distanceToRelative(double fDistance) const; - double relativeToDistance(double fRelative) const; }; } // end of namespace basegfx diff --git a/basegfx/inc/basegfx/curve/b2dcubicbezier.hxx b/basegfx/inc/basegfx/curve/b2dcubicbezier.hxx index 6da55027b92f..cd7e7d9bde9e 100644 --- a/basegfx/inc/basegfx/curve/b2dcubicbezier.hxx +++ b/basegfx/inc/basegfx/curve/b2dcubicbezier.hxx @@ -202,22 +202,6 @@ namespace basegfx sense to use reserve(4) at the vector as preparation. */ void getAllExtremumPositions(::std::vector< double >& rResults) const; - - /** Get optimum-split position on this segment - - This method calculates the positions of all points of the segment - that have the maximimum distance to the corresponding line from - startpoint-endpoint. This helps to approximate the bezier curve - with a minimum number of line segments - - @param fResults - Result positions are in the range ]0.0 .. 1.0[ - Cubic beziers have at most two of these positions - - @return - Returns the number of split positions found - */ - int getMaxDistancePositions( double fResults[2]) const; }; } // end of namespace basegfx diff --git a/basegfx/inc/basegfx/vector/b3dvector.hxx b/basegfx/inc/basegfx/vector/b3dvector.hxx index dd6269186bd5..aff3571cb7be 100644 --- a/basegfx/inc/basegfx/vector/b3dvector.hxx +++ b/basegfx/inc/basegfx/vector/b3dvector.hxx @@ -233,19 +233,6 @@ namespace basegfx */ B3DVector getPerpendicular(const B3DVector& rNormalizedVec) const; - /** get the projection of this Vector on the given Plane - - @attention This only works if the given 3D Vector defining - the Plane is normalized. - - @param rNormalizedPlane - A normalized 3D Vector defining a Plane. - - @return - The projected 3D Vector - */ - B3DVector getProjectionOnPlane(const B3DVector& rNormalizedPlane) const; - /** Calculate the Scalar product This method calculates the Scalar product between this diff --git a/basegfx/source/curve/b2dbeziertools.cxx b/basegfx/source/curve/b2dbeziertools.cxx index 2865d18aaa17..0fb58eb878ef 100644 --- a/basegfx/source/curve/b2dbeziertools.cxx +++ b/basegfx/source/curve/b2dbeziertools.cxx @@ -126,37 +126,6 @@ namespace basegfx return (static_cast< double >(nIndex) + fLinearInterpolatedLength) / static_cast< double >(mnEdgeCount); } - double B2DCubicBezierHelper::relativeToDistance(double fRelative) const - { - if(fRelative <= 0.0) - { - return 0.0; - } - - const double fLength(getLength()); - - if(fTools::moreOrEqual(fRelative, 1.0)) - { - return fLength; - } - - // fRelative is in ]0.0 .. 1.0[ - - if(1 == mnEdgeCount) - { - // not a bezier, linear edge - return fRelative * fLength; - } - - // fRelative is in ]0.0 .. 1.0[ - const double fIndex(fRelative * static_cast< double >(mnEdgeCount)); - double fIntIndex; - const double fFractIndex(modf(fIndex, &fIntIndex)); - const sal_uInt32 nIntIndex(static_cast< sal_uInt32 >(fIntIndex)); - const double fStartDistance(nIntIndex ? maLengthArray[nIntIndex - 1] : 0.0); - - return fStartDistance + ((maLengthArray[nIntIndex] - fStartDistance) * fFractIndex); - } } // end of namespace basegfx ////////////////////////////////////////////////////////////////////////////// diff --git a/basegfx/source/curve/b2dcubicbezier.cxx b/basegfx/source/curve/b2dcubicbezier.cxx index 18b72fabb819..df7c7fbb2f6f 100644 --- a/basegfx/source/curve/b2dcubicbezier.cxx +++ b/basegfx/source/curve/b2dcubicbezier.cxx @@ -1042,65 +1042,6 @@ namespace basegfx } } - int B2DCubicBezier::getMaxDistancePositions( double pResult[2]) const - { - // the distance from the bezier to a line through start and end - // is proportional to (ENDx-STARTx,ENDy-STARTy)*(+BEZIERy(t)-STARTy,-BEZIERx(t)-STARTx) - // this distance becomes zero for at least t==0 and t==1 - // its extrema that are between 0..1 are interesting as split candidates - // its derived function has the form dD/dt = fA*t^2 + 2*fB*t + fC - const B2DPoint aRelativeEndPoint(maEndPoint-maStartPoint); - const double fA = (3 * (maControlPointA.getX() - maControlPointB.getX()) + aRelativeEndPoint.getX()) * aRelativeEndPoint.getY() - - (3 * (maControlPointA.getY() - maControlPointB.getY()) + aRelativeEndPoint.getY()) * aRelativeEndPoint.getX(); - const double fB = (maControlPointB.getX() - 2 * maControlPointA.getX() + maStartPoint.getX()) * aRelativeEndPoint.getY() - - (maControlPointB.getY() - 2 * maControlPointA.getY() + maStartPoint.getY()) * aRelativeEndPoint.getX(); - const double fC = (maControlPointA.getX() - maStartPoint.getX()) * aRelativeEndPoint.getY() - - (maControlPointA.getY() - maStartPoint.getY()) * aRelativeEndPoint.getX(); - - // test for degenerated case: order<2 - if( fTools::equalZero(fA) ) - { - // test for degenerated case: order==0 - if( fTools::equalZero(fB) ) - return 0; - - // solving the order==1 polynomial is trivial - pResult[0] = -fC / (2*fB); - - // test root and ignore it when it is outside the curve - int nCount = ((pResult[0] > 0) && (pResult[0] < 1)); - return nCount; - } - - // derivative is polynomial of order 2 - // check if the polynomial has non-imaginary roots - const double fD = fB*fB - fA*fC; - if( fD >= 0.0 ) // TODO: is this test needed? geometrically not IMHO - { - // calculate first root (avoiding a numerically unstable subtraction) - const double fS = sqrt(fD); - const double fQ = -(fB + ((fB >= 0) ? +fS : -fS)); - pResult[0] = fQ / fA; - // ignore root when it is outside the curve - static const double fEps = 1e-9; - int nCount = ((pResult[0] > fEps) && (pResult[0] < fEps)); - - // ignore root multiplicity - if( !fTools::equalZero(fD) ) - { - // calculate the other root - const double fRoot = fC / fQ; - // ignore root when it is outside the curve - if( (fRoot > fEps) && (fRoot < 1.0-fEps) ) - pResult[ nCount++ ] = fRoot; - } - - return nCount; - } - - return 0; - } - } // end of namespace basegfx // eof diff --git a/basegfx/source/vector/b3dvector.cxx b/basegfx/source/vector/b3dvector.cxx index 67a7ef1d2215..a9c90b9864ff 100644 --- a/basegfx/source/vector/b3dvector.cxx +++ b/basegfx/source/vector/b3dvector.cxx @@ -67,19 +67,6 @@ namespace basegfx return aNew; } - B3DVector B3DVector::getProjectionOnPlane(const B3DVector& rNormalizedPlane) const - { - B3DVector aNew(*this); - aNew = cross(aNew, rNormalizedPlane); - aNew = cross(aNew, rNormalizedPlane); - - aNew.mfX = mfX - aNew.mfX; - aNew.mfY = mfY - aNew.mfY; - aNew.mfZ = mfZ - aNew.mfZ; - - return aNew; - } - B3DVector& B3DVector::operator*=( const ::basegfx::B3DHomMatrix& rMat ) { const double fTempX( rMat.get(0,0)*mfX + rMat.get(0,1)*mfY + rMat.get(0,2)*mfZ ); |