diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2012-01-19 19:14:49 +0100 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2012-01-19 19:15:08 +0100 |
commit | d93536e52943c910936504e531956f04d9c0503f (patch) | |
tree | c3f8265e2544c8fac4f35abd59ded537e1aaa704 /basegfx | |
parent | 3e7151db8d6ffe1688f2b3c68dbc0741fe953cdc (diff) |
remove unused methods
Diffstat (limited to 'basegfx')
-rw-r--r-- | basegfx/inc/basegfx/color/bcolortools.hxx | 10 | ||||
-rw-r--r-- | basegfx/inc/basegfx/tools/canvastools.hxx | 15 | ||||
-rw-r--r-- | basegfx/source/color/bcolortools.cxx | 38 | ||||
-rw-r--r-- | basegfx/source/tools/canvastools.cxx | 78 |
4 files changed, 0 insertions, 141 deletions
diff --git a/basegfx/inc/basegfx/color/bcolortools.hxx b/basegfx/inc/basegfx/color/bcolortools.hxx index 5841f045b442..0bb065937a7f 100644 --- a/basegfx/inc/basegfx/color/bcolortools.hxx +++ b/basegfx/inc/basegfx/color/bcolortools.hxx @@ -50,16 +50,6 @@ namespace basegfx /// Transform from HSV to RGB BASEGFX_DLLPUBLIC BColor hsv2rgb(const BColor& rHSVColor); - /// Transform from R'G'B' to YIQ (NTSC color model - Y is used in monochrome mode) - BASEGFX_DLLPUBLIC BColor rgb2yiq(const BColor& rRGBColor); - /// Transform from YIQ to R'G'B' (NTSC color model - Y is used in monochrome mode) - BASEGFX_DLLPUBLIC BColor yiq2rgb(const BColor& rYIQColor); - - /// Transform from R'G'B' to Y'PbPr (the [0,1]x[-.5,.5]x[-.5,.5] equivalent of Y'CbCr (which is scaled into 8bit)) - BASEGFX_DLLPUBLIC BColor rgb2ypbpr(const BColor& rRGBColor); - /// Transform from Y'PbPr (the [0,1]x[-.5,.5]x[-.5,.5] equivalent of Y'CbCr (which is scaled into 8bit)) into R'G'B' - BASEGFX_DLLPUBLIC BColor ypbpr2rgb(const BColor& rYPbPrColor); - /// Transform from CIE XYZ into Rec. 709 RGB (D65 white point) BASEGFX_DLLPUBLIC BColor ciexyz2rgb( const BColor& rXYZColor ); /// Transform from Rec. 709 RGB (D65 white point) into CIE XYZ diff --git a/basegfx/inc/basegfx/tools/canvastools.hxx b/basegfx/inc/basegfx/tools/canvastools.hxx index 5884563afd33..ea1924afb994 100644 --- a/basegfx/inc/basegfx/tools/canvastools.hxx +++ b/basegfx/inc/basegfx/tools/canvastools.hxx @@ -138,7 +138,6 @@ namespace basegfx homMatrixFromAffineMatrix( ::basegfx::B2DHomMatrix& transform, const ::com::sun::star::geometry::AffineMatrix2D& matrix ); - BASEGFX_DLLPUBLIC ::basegfx::B2DHomMatrix homMatrixFromAffineMatrix( const ::com::sun::star::geometry::AffineMatrix2D& matrix ); BASEGFX_DLLPUBLIC ::basegfx::B3DHomMatrix homMatrixFromAffineMatrix3D( const ::com::sun::star::geometry::AffineMatrix3D& matrix ); BASEGFX_DLLPUBLIC ::com::sun::star::geometry::Matrix2D& @@ -157,17 +156,13 @@ namespace basegfx BASEGFX_DLLPUBLIC ::com::sun::star::geometry::RealRectangle2D rectangle2DFromB2DRectangle( const ::basegfx::B2DRange& ); BASEGFX_DLLPUBLIC ::com::sun::star::geometry::RealRectangle3D rectangle3DFromB3DRectangle( const ::basegfx::B3DRange& ); - BASEGFX_DLLPUBLIC ::basegfx::B2DVector b2DSizeFromRealSize2D( const ::com::sun::star::geometry::RealSize2D& ); BASEGFX_DLLPUBLIC ::basegfx::B2DPoint b2DPointFromRealPoint2D( const ::com::sun::star::geometry::RealPoint2D& ); BASEGFX_DLLPUBLIC ::basegfx::B2DRange b2DRectangleFromRealRectangle2D( const ::com::sun::star::geometry::RealRectangle2D& ); BASEGFX_DLLPUBLIC ::basegfx::B3DRange b3DRectangleFromRealRectangle3D( const ::com::sun::star::geometry::RealRectangle3D& ); BASEGFX_DLLPUBLIC ::com::sun::star::geometry::IntegerSize2D integerSize2DFromB2ISize( const ::basegfx::B2IVector& ); - BASEGFX_DLLPUBLIC ::com::sun::star::geometry::IntegerPoint2D integerPoint2DFromB2IPoint( const ::basegfx::B2IPoint& ); - BASEGFX_DLLPUBLIC ::com::sun::star::geometry::IntegerRectangle2D integerRectangle2DFromB2IRectangle( const ::basegfx::B2IRange& ); BASEGFX_DLLPUBLIC ::basegfx::B2IVector b2ISizeFromIntegerSize2D( const ::com::sun::star::geometry::IntegerSize2D& ); - BASEGFX_DLLPUBLIC ::basegfx::B2IPoint b2IPointFromIntegerPoint2D( const ::com::sun::star::geometry::IntegerPoint2D& ); BASEGFX_DLLPUBLIC ::basegfx::B2IRange b2IRectangleFromIntegerRectangle2D( const ::com::sun::star::geometry::IntegerRectangle2D& ); BASEGFX_DLLPUBLIC ::com::sun::star::awt::Size awtSizeFromB2ISize( const ::basegfx::B2IVector& ); @@ -181,16 +176,6 @@ namespace basegfx // Geometry comparisons // =================================================================== - BASEGFX_DLLPUBLIC bool RealSize2DAreEqual( const ::com::sun::star::geometry::RealSize2D& rA, const ::com::sun::star::geometry::RealSize2D& rB ); - BASEGFX_DLLPUBLIC bool RealPoint2DAreEqual( const ::com::sun::star::geometry::RealPoint2D& rA, const ::com::sun::star::geometry::RealPoint2D& rB ); - BASEGFX_DLLPUBLIC bool RealRectangle2DAreEqual( const ::com::sun::star::geometry::RealRectangle2D& rA, const ::com::sun::star::geometry::RealRectangle2D& rB ); - BASEGFX_DLLPUBLIC bool RealRectangle3DAreEqual( const ::com::sun::star::geometry::RealRectangle3D& rA, const ::com::sun::star::geometry::RealRectangle3D& rB ); - BASEGFX_DLLPUBLIC bool AffineMatrix2DAreEqual( const ::com::sun::star::geometry::AffineMatrix2D& rA, const ::com::sun::star::geometry::AffineMatrix2D& rB ); - - BASEGFX_DLLPUBLIC bool IntegerSize2DAreEqual( const ::com::sun::star::geometry::IntegerSize2D& rA, const ::com::sun::star::geometry::IntegerSize2D& rB ); - BASEGFX_DLLPUBLIC bool IntegerPoint2DAreEqual( const ::com::sun::star::geometry::IntegerPoint2D& rA, const ::com::sun::star::geometry::IntegerPoint2D& rB ); - BASEGFX_DLLPUBLIC bool IntegerRectangle2DAreEqual( const ::com::sun::star::geometry::IntegerRectangle2D& rA, const ::com::sun::star::geometry::IntegerRectangle2D& rB ); - BASEGFX_DLLPUBLIC bool awtSizeAreEqual( const ::com::sun::star::awt::Size& rA, const ::com::sun::star::awt::Size& rB ); BASEGFX_DLLPUBLIC bool awtPointAreEqual( const ::com::sun::star::awt::Point& rA, const ::com::sun::star::awt::Point& rB ); BASEGFX_DLLPUBLIC bool awtRectangleAreEqual( const ::com::sun::star::awt::Rectangle& rA, const ::com::sun::star::awt::Rectangle& rB ); diff --git a/basegfx/source/color/bcolortools.cxx b/basegfx/source/color/bcolortools.cxx index fb225e980ca2..f89a47574486 100644 --- a/basegfx/source/color/bcolortools.cxx +++ b/basegfx/source/color/bcolortools.cxx @@ -200,26 +200,6 @@ namespace basegfx { namespace tools } } - BColor rgb2yiq(const BColor& rRGBColor) - { - // from Foley, van Dam, Computer Graphics - const double r=rRGBColor.getRed(), g=rRGBColor.getGreen(), b=rRGBColor.getBlue(); - return BColor( - 0.299*r + 0.587*g + 0.114*b, - 0.596*r - 0.274*g - 0.322*b, - 0.211*r - 0.522*g + 0.311*b); - } - - BColor yiq2rgb(const BColor& rYIQColor) - { - // from Foley, van Dam, Computer Graphics - const double y=rYIQColor.getRed(), i=rYIQColor.getGreen(), q=rYIQColor.getBlue(); - return BColor( - y + 0.956*i + 0.623*q, - y - 0.272*i - 0.648*q, - y - 1.105*i + 1.705*q ); - } - BColor ciexyz2rgb( const BColor& rXYZColor ) { // from Poynton color faq, and SMPTE RP 177-1993, Derivation @@ -242,24 +222,6 @@ namespace basegfx { namespace tools 0.019334*r + 0.119193*g + 0.950227*b); } - BColor rgb2ypbpr(const BColor& rRGBColor) - { - const double r=rRGBColor.getRed(), g=rRGBColor.getGreen(), b=rRGBColor.getBlue(); - return BColor( - 0.299*r + 0.587*g + 0.114*b, - -0.168736*r - 0.331264*g + 0.5*b, - 0.5*r - 0.418688*g - 0.081312*b); - } - - BColor ypbpr2rgb(const BColor& rYPbPrColor) - { - const double y=rYPbPrColor.getRed(), pb=rYPbPrColor.getGreen(), pr=rYPbPrColor.getBlue(); - return BColor( - 1.*y + 0.*pb + 1.402*pr, - 1.*y - 0.344136*pb - 0.714136*pr, - 1.*y + 1.772*pb + 0.*pr); - } - } } // end of namespace basegfx ////////////////////////////////////////////////////////////////////////////// diff --git a/basegfx/source/tools/canvastools.cxx b/basegfx/source/tools/canvastools.cxx index a3d75ecf9ebc..18e0ad342b1f 100644 --- a/basegfx/source/tools/canvastools.cxx +++ b/basegfx/source/tools/canvastools.cxx @@ -363,20 +363,6 @@ namespace basegfx return output; } - ::basegfx::B2DHomMatrix homMatrixFromAffineMatrix( const geometry::AffineMatrix2D& input ) - { - ::basegfx::B2DHomMatrix output; - - output.set(0,0, input.m00); - output.set(0,1, input.m01); - output.set(0,2, input.m02); - output.set(1,0, input.m10); - output.set(1,1, input.m11); - output.set(1,2, input.m12); - - return output; - } - ::basegfx::B3DHomMatrix homMatrixFromAffineMatrix3D( const ::com::sun::star::geometry::AffineMatrix3D& input ) { ::basegfx::B3DHomMatrix output; @@ -482,12 +468,6 @@ namespace basegfx rRect.getMaxZ()); } - ::basegfx::B2DVector b2DSizeFromRealSize2D( const geometry::RealSize2D& rSize ) - { - return ::basegfx::B2DVector( rSize.Width, - rSize.Height ); - } - ::basegfx::B2DPoint b2DPointFromRealPoint2D( const geometry::RealPoint2D& rPoint ) { return ::basegfx::B2DPoint( rPoint.X, @@ -518,30 +498,12 @@ namespace basegfx rSize.getY() ); } - geometry::IntegerPoint2D integerPoint2DFromB2IPoint( const ::basegfx::B2IPoint& rPoint ) - { - return geometry::IntegerPoint2D( rPoint.getX(), - rPoint.getY() ); - } - - geometry::IntegerRectangle2D integerRectangle2DFromB2IRectangle( const ::basegfx::B2IRange& rRectangle ) - { - return geometry::IntegerRectangle2D( rRectangle.getMinX(), rRectangle.getMinY(), - rRectangle.getMaxX(), rRectangle.getMaxY() ); - } - ::basegfx::B2IVector b2ISizeFromIntegerSize2D( const geometry::IntegerSize2D& rSize ) { return ::basegfx::B2IVector( rSize.Width, rSize.Height ); } - ::basegfx::B2IPoint b2IPointFromIntegerPoint2D( const geometry::IntegerPoint2D& rPoint ) - { - return ::basegfx::B2IPoint( rPoint.X, - rPoint.Y ); - } - ::basegfx::B2IRange b2IRectangleFromIntegerRectangle2D( const geometry::IntegerRectangle2D& rRectangle ) { return ::basegfx::B2IRange( rRectangle.X1, rRectangle.Y1, @@ -622,46 +584,6 @@ namespace basegfx // Geometry comparisons // =================================================================== - bool RealSize2DAreEqual( const ::com::sun::star::geometry::RealSize2D& rA, const ::com::sun::star::geometry::RealSize2D& rB ) - { - return (rA.Width == rB.Width && rA.Height == rB.Height); - } - - bool RealPoint2DAreEqual( const ::com::sun::star::geometry::RealPoint2D& rA, const ::com::sun::star::geometry::RealPoint2D& rB ) - { - return (rA.X == rB.X && rA.Y == rB.Y); - } - - bool RealRectangle2DAreEqual( const ::com::sun::star::geometry::RealRectangle2D& rA, const ::com::sun::star::geometry::RealRectangle2D& rB ) - { - return (rA.X1 == rB.X1 && rA.Y1 == rB.Y1 && rA.X2 == rB.X2 && rA.Y2 == rB.Y2); - } - - bool RealRectangle3DAreEqual( const ::com::sun::star::geometry::RealRectangle3D& rA, const ::com::sun::star::geometry::RealRectangle3D& rB ) - { - return (rA.X1 == rB.X1 && rA.Y1 == rB.Y1 && rA.Z1 == rB.Z1 && rA.X2 == rB.X2 && rA.Y2 == rB.Y2 && rA.Z2 == rB.Z2); - } - - bool AffineMatrix2DAreEqual( const ::com::sun::star::geometry::AffineMatrix2D& rA, const ::com::sun::star::geometry::AffineMatrix2D& rB ) - { - return (rA.m00 == rB.m00 && rA.m01 == rB.m01 && rA.m02 == rB.m02 && rA.m10 == rB.m10 && rA.m11 == rB.m11 && rA.m12 == rB.m12); - } - - bool IntegerSize2DAreEqual( const ::com::sun::star::geometry::IntegerSize2D& rA, const ::com::sun::star::geometry::IntegerSize2D& rB ) - { - return (rA.Width == rB.Width && rA.Height == rB.Height); - } - - bool IntegerPoint2DAreEqual( const ::com::sun::star::geometry::IntegerPoint2D& rA, const ::com::sun::star::geometry::IntegerPoint2D& rB ) - { - return (rA.X == rB.X && rA.Y == rB.Y); - } - - bool IntegerRectangle2DAreEqual( const ::com::sun::star::geometry::IntegerRectangle2D& rA, const ::com::sun::star::geometry::IntegerRectangle2D& rB ) - { - return (rA.X1 == rB.X1 && rA.Y1 == rB.Y1 && rA.X2 == rB.X2 && rA.Y2 == rB.Y2); - } - bool awtSizeAreEqual( const ::com::sun::star::awt::Size& rA, const ::com::sun::star::awt::Size& rB ) { return (rA.Width == rB.Width && rA.Height == rB.Height); |