diff options
author | Andrea Gelmini <andrea.gelmini@gelma.net> | 2017-08-18 23:31:10 +0200 |
---|---|---|
committer | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2017-08-19 11:54:25 +0200 |
commit | daecb11ee244b1306cec14a2e1fc5237926786d8 (patch) | |
tree | 5240b955c25d3ce34b2b4e6f8ebf63f98c2e97c4 /include/canvas | |
parent | bf41e713f62d4a181a6916680cd64d60728b1a52 (diff) |
Removed ignored includes
By brute force analysis, it seems to me that we can easily
remove these not used includes.
It passed "make check install"
Change-Id: I34ea2aae57e56fb8b2cf1066cf51b08068fa0b53
Reviewed-on: https://gerrit.libreoffice.org/41312
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Jochen Nitschke <j.nitschke+logerrit@ok.de>
Diffstat (limited to 'include/canvas')
-rw-r--r-- | include/canvas/rendering/bitmap.hxx | 302 | ||||
-rw-r--r-- | include/canvas/rendering/icachedprimitive.hxx | 58 |
2 files changed, 0 insertions, 360 deletions
diff --git a/include/canvas/rendering/bitmap.hxx b/include/canvas/rendering/bitmap.hxx deleted file mode 100644 index 3a878ce64da9..000000000000 --- a/include/canvas/rendering/bitmap.hxx +++ /dev/null @@ -1,302 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_CANVAS_RENDERING_BITMAP_HXX -#define INCLUDED_CANVAS_RENDERING_BITMAP_HXX - -#include <com/sun/star/uno/Reference.hxx> -#include <com/sun/star/rendering/XCanvas.hpp> -#include <com/sun/star/rendering/IntegerBitmapLayout.hpp> -#include <com/sun/star/geometry/IntegerRectangle2D.hpp> -#include <com/sun/star/geometry/IntegerPoint2D.hpp> -#include <canvas/rendering/icolorbuffer.hxx> -#include <canvas/rendering/icachedprimitive.hxx> -#include <canvas/rendering/isurfaceproxymanager.hxx> - -#include <memory> -#include <vector> - -namespace basegfx -{ - class B2IVector; - class B2DPoint; - class B2DHomMatrix; - class B2DPolyPolygon; -} - -namespace canvas -{ - class ImplBitmap; - - /** Bitmap class, with XCanvas-like render interface. - - This class provides a bitmap, that can be rendered into, - with an interface compatible to XCanvas. Furthermore, the - bitmaps held here can optionally be backed by (possibly - hw-accelerated) textures. - */ - class Bitmap - { - public: - /** Create bitmap with given size - - @param rSize - Size of the bitmap, in pixel - - @param rMgr - SurfaceProxyManager, to use for HW acceleration - - @param bWithAlpha - When true, the created bitmap will have an alpha channel, - false otherwise - */ - Bitmap( const ::basegfx::B2IVector& rSize, - const std::shared_ptr<ISurfaceProxyManager>& rMgr, - bool bWithAlpha ); - ~Bitmap(); - - /// Query whether this bitmap contains alpha channel information - bool hasAlpha() const; - - /// Query size of the bitmap in pixel - ::basegfx::B2IVector getSize() const; - - css::uno::Sequence< sal_Int8 > getData( - css::rendering::IntegerBitmapLayout& bitmapLayout, - const css::geometry::IntegerRectangle2D& rect ); - - void setData( - const css::uno::Sequence< sal_Int8 >& data, - const css::rendering::IntegerBitmapLayout& bitmapLayout, - const css::geometry::IntegerRectangle2D& rect ); - - void setPixel( - const css::uno::Sequence< sal_Int8 >& color, - const css::rendering::IntegerBitmapLayout& bitmapLayout, - const css::geometry::IntegerPoint2D& pos ); - - css::uno::Sequence< sal_Int8 > getPixel( - css::rendering::IntegerBitmapLayout& bitmapLayout, - const css::geometry::IntegerPoint2D& pos ); - - /** Render the bitmap content to associated - SurfaceProxyManager's screen. - - @param fAlpha - Overall alpha for content - - @param rPos - Output position - - @param rTransform - Output transformation (does not affect output position) - */ - bool draw( double fAlpha, - const ::basegfx::B2DPoint& rPos, - const ::basegfx::B2DHomMatrix& rTransform ); - - /** Render the bitmap content to associated - SurfaceProxyManager's screen. - - @param fAlpha - Overall alpha for content - - @param rPos - Output position - - @param rArea - Subset of the surface to render. Coordinate system are - surface area pixel, given area will be clipped to the - surface bounds. - - @param rTransform - Output transformation (does not affect output position) - */ - bool draw( double fAlpha, - const ::basegfx::B2DPoint& rPos, - const ::basegfx::B2DRange& rArea, - const ::basegfx::B2DHomMatrix& rTransform ); - - /** Render the bitmap content to associated - SurfaceProxyManager's screen. - - @param fAlpha - Overall alpha for content - - @param rPos - Output position - - @param rClipPoly - Clip polygon for the surface. The clip polygon is also - subject to the output transformation. - - @param rTransform - Output transformation (does not affect output position) - */ - bool draw( double fAlpha, - const ::basegfx::B2DPoint& rPos, - const ::basegfx::B2DPolyPolygon& rClipPoly, - const ::basegfx::B2DHomMatrix& rTransform ); - - /** Clear whole bitmap with given color. - - This method sets every single pixel of the bitmap to the - specified color value. - */ - void clear( const css::uno::Sequence< double >& color ); - - void fillB2DPolyPolygon( - const ::basegfx::B2DPolyPolygon& rPolyPolygon, - const css::rendering::ViewState& viewState, - const css::rendering::RenderState& renderState ); - - - // High-level drawing operations (from the XCanvas interface) - - - /// See XCanvas interface - void drawPoint( const css::geometry::RealPoint2D& aPoint, - const css::rendering::ViewState& viewState, - const css::rendering::RenderState& renderState ); - /// See XCanvas interface - void drawLine( const css::geometry::RealPoint2D& aStartPoint, - const css::geometry::RealPoint2D& aEndPoint, - const css::rendering::ViewState& viewState, - const css::rendering::RenderState& renderState ); - /// See XCanvas interface - void drawBezier( const css::geometry::RealBezierSegment2D& aBezierSegment, - const css::geometry::RealPoint2D& aEndPoint, - const css::rendering::ViewState& viewState, - const css::rendering::RenderState& renderState ); - /// See XCanvas interface - std::shared_ptr<ICachedPrimitive> drawPolyPolygon( - const css::uno::Reference< - css::rendering::XPolyPolygon2D >& xPolyPolygon, - const css::rendering::ViewState& viewState, - const css::rendering::RenderState& renderState ); - - /// See XCanvas interface - std::shared_ptr<ICachedPrimitive> strokePolyPolygon( - const css::uno::Reference< - css::rendering::XPolyPolygon2D >& xPolyPolygon, - const css::rendering::ViewState& viewState, - const css::rendering::RenderState& renderState, - const css::rendering::StrokeAttributes& strokeAttributes ); - /** See XCanvas interface - - @param textureAnnotations - Vector of shared pointers to bitmap textures, - <em>corresponding</em> in indices to the textures - sequence. This is to decouple this interface from the - client's XBitmap-implementation class. - */ - std::shared_ptr<ICachedPrimitive> strokeTexturedPolyPolygon( - const css::uno::Reference< css::rendering::XPolyPolygon2D >& xPolyPolygon, - const css::rendering::ViewState& viewState, - const css::rendering::RenderState& renderState, - const css::uno::Sequence< css::rendering::Texture >& textures, - const ::std::vector< std::shared_ptr<Bitmap> >& textureAnnotations, - const css::rendering::StrokeAttributes& strokeAttributes ); - /** See XCanvas interface - - @param textureAnnotations - Vector of shared pointers to bitmap textures, - <em>corresponding</em> in indices to the textures - sequence. This is to decouple this interface from the - client's XBitmap-implementation class. - */ - std::shared_ptr<ICachedPrimitive> strokeTextureMappedPolyPolygon( - const css::uno::Reference< css::rendering::XPolyPolygon2D >& xPolyPolygon, - const css::rendering::ViewState& viewState, - const css::rendering::RenderState& renderState, - const css::uno::Sequence< css::rendering::Texture >& textures, - const ::std::vector< std::shared_ptr<Bitmap> >& textureAnnotations, - const css::uno::Reference< css::geometry::XMapping2D >& xMapping, - const css::rendering::StrokeAttributes& strokeAttributes ); - /// See XCanvas interface - std::shared_ptr<ICachedPrimitive> fillPolyPolygon( - const css::uno::Reference< css::rendering::XPolyPolygon2D >& xPolyPolygon, - const css::rendering::ViewState& viewState, - const css::rendering::RenderState& renderState ); - /** See XCanvas interface - - @param textureAnnotations - Vector of shared pointers to bitmap textures, - <em>corresponding</em> in indices to the textures - sequence. This is to decouple this interface from the - client's XBitmap-implementation class. - */ - std::shared_ptr<ICachedPrimitive> fillTexturedPolyPolygon( - const css::uno::Reference< css::rendering::XPolyPolygon2D >& xPolyPolygon, - const css::rendering::ViewState& viewState, - const css::rendering::RenderState& renderState, - const css::uno::Sequence< css::rendering::Texture >& textures, - const ::std::vector< std::shared_ptr<Bitmap> >& textureAnnotations ); - /** See XCanvas interface - - @param textureAnnotations - Vector of shared pointers to bitmap textures, - <em>corresponding</em> in indices to the textures - sequence. This is to decouple this interface from the - client's XBitmap-implementation class. - */ - std::shared_ptr<ICachedPrimitive> fillTextureMappedPolyPolygon( - const css::uno::Reference< css::rendering::XPolyPolygon2D >& xPolyPolygon, - const css::rendering::ViewState& viewState, - const css::rendering::RenderState& renderState, - const css::uno::Sequence< css::rendering::Texture >& textures, - const ::std::vector< std::shared_ptr<Bitmap> >& textureAnnotations, - const css::uno::Reference< css::geometry::XMapping2D >& xMapping ); - - /// See XCanvas interface - std::shared_ptr<ICachedPrimitive> drawBitmap( - const css::uno::Reference< - css::rendering::XBitmap >& xBitmap, - const css::rendering::ViewState& viewState, - const css::rendering::RenderState& renderState ); - /// See XCanvas interface - std::shared_ptr<ICachedPrimitive> drawBitmap( - const std::shared_ptr<Bitmap>& rImage, - const css::rendering::ViewState& viewState, - const css::rendering::RenderState& renderState ); - - /// See XCanvas interface - std::shared_ptr<ICachedPrimitive> drawBitmapModulated( - const css::uno::Reference< - css::rendering::XBitmap >& xBitmap, - const css::rendering::ViewState& viewState, - const css::rendering::RenderState& renderState ); - /// See XCanvas interface - std::shared_ptr<ICachedPrimitive> drawBitmapModulated( - const std::shared_ptr<Bitmap>& rImage, - const css::rendering::ViewState& viewState, - const css::rendering::RenderState& renderState ); - - private: - friend class ImplBitmap; - - const std::unique_ptr< ImplBitmap > mxImpl; - }; - - typedef std::shared_ptr< Bitmap > BitmapSharedPtr; -} - -#endif // INCLUDED_CANVAS_RENDERING_BITMAP_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/canvas/rendering/icachedprimitive.hxx b/include/canvas/rendering/icachedprimitive.hxx deleted file mode 100644 index 2fd279476d3d..000000000000 --- a/include/canvas/rendering/icachedprimitive.hxx +++ /dev/null @@ -1,58 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_CANVAS_RENDERING_ICACHEDPRIMITIVE_HXX -#define INCLUDED_CANVAS_RENDERING_ICACHEDPRIMITIVE_HXX - -#include <com/sun/star/rendering/Viewstate.hpp> -#include <sal/types.h> - -#include <memory> - -namespace basegfx -{ - class B2IRange; - class B2IPoint; -} - -namespace canvas -{ - /** Objects with this interface are returned from every Bitmap - render operation. - - These objects can be used to implement the - rendering::XCachedPrimitive interface, which in turn caches - render state and objects to facilitate quick redraws. - */ - struct ICachedPrimitive - { - virtual ~ICachedPrimitive() {} - - /** Redraw the primitive with the given view state - - Note that the primitive will <em>always</em> be redrawn on - the bitmap it was created from. - */ - virtual sal_Int8 redraw( const css::rendering::ViewState& aState ) const = 0; - }; -} - -#endif // INCLUDED_CANVAS_RENDERING_ICACHEDPRIMITIVE_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |