[Libreoffice-commits] core.git: compilerplugins/clang Repository.mk solenv/clang-format vcl/Executable_outdevgrind.mk vcl/Module_vcl.mk vcl/workben
Caolán McNamara (via logerrit)
logerrit at kemper.freedesktop.org
Thu Feb 13 15:51:14 UTC 2020
Repository.mk | 3
compilerplugins/clang/unusedvariablemore.cxx | 2
solenv/clang-format/blacklist | 1
vcl/Executable_outdevgrind.mk | 39 -
vcl/Module_vcl.mk | 1
vcl/workben/outdevgrind.cxx | 749 ---------------------------
6 files changed, 1 insertion(+), 794 deletions(-)
New commits:
commit 119044e8c9e13dcdc0d5d1e080c8f168446c48f4
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Feb 13 12:10:33 2020 +0000
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Feb 13 16:50:38 2020 +0100
drop workben outdevgrind
Change-Id: I94978f84b45daec9ba7e782087e45182def234d6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88601
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/Repository.mk b/Repository.mk
index 864438ed63d2..cf905c970723 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -69,8 +69,7 @@ $(eval $(call gb_Helper_register_executables,NONE, \
svptest \
svpclient ) \
$(if $(filter LINUX %BSD SOLARIS,$(OS)), tilebench) \
- $(if $(filter LINUX MACOSX SOLARIS WNT %BSD,$(OS)),icontest \
- outdevgrind) \
+ $(if $(filter LINUX MACOSX SOLARIS WNT %BSD,$(OS)),icontest) \
vcldemo \
tiledrendering \
mtfdemo \
diff --git a/compilerplugins/clang/unusedvariablemore.cxx b/compilerplugins/clang/unusedvariablemore.cxx
index d4b5e40c3e1f..ba137199ef4c 100644
--- a/compilerplugins/clang/unusedvariablemore.cxx
+++ b/compilerplugins/clang/unusedvariablemore.cxx
@@ -79,8 +79,6 @@ void UnusedVariableMore::run()
return;
if (fn == SRCDIR "/i18nlangtag/source/languagetag/languagetag.cxx")
return;
- if (fn == SRCDIR "/vcl/workben/outdevgrind.cxx")
- return;
// unordered_set of Reference to delay destruction
if (fn == SRCDIR "/stoc/source/servicemanager/servicemanager.cxx")
return;
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index ac29126124f2..6c5b5e257384 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -17755,7 +17755,6 @@ vcl/workben/lwpfuzzer.cxx
vcl/workben/metfuzzer.cxx
vcl/workben/mtfdemo.cxx
vcl/workben/olefuzzer.cxx
-vcl/workben/outdevgrind.cxx
vcl/workben/pcdfuzzer.cxx
vcl/workben/pctfuzzer.cxx
vcl/workben/pcxfuzzer.cxx
diff --git a/vcl/Executable_outdevgrind.mk b/vcl/Executable_outdevgrind.mk
deleted file mode 100644
index 7c12e24ac327..000000000000
--- a/vcl/Executable_outdevgrind.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-#
-# 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/.
-#
-
-$(eval $(call gb_Executable_Executable,outdevgrind))
-
-$(eval $(call gb_Executable_use_api,outdevgrind,\
- offapi \
- udkapi \
-))
-
-$(eval $(call gb_Executable_use_external,outdevgrind,boost_headers))
-
-$(eval $(call gb_Executable_set_include,outdevgrind,\
- $$(INCLUDE) \
- -I$(SRCDIR)/vcl/inc \
-))
-
-$(eval $(call gb_Executable_use_libraries,outdevgrind,\
- tl \
- sal \
- vcl \
- cppu \
- cppuhelper \
- comphelper \
- salhelper \
-))
-
-$(eval $(call gb_Executable_add_exception_objects,outdevgrind,\
- vcl/workben/outdevgrind \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index 9736be35fedf..83c493a5afa2 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -35,7 +35,6 @@ $(eval $(call gb_Module_add_targets,vcl,\
$(if $(DISABLE_GUI),, \
Executable_ui-previewer)) \
$(if $(filter LINUX MACOSX SOLARIS WNT %BSD,$(OS)), \
- Executable_outdevgrind \
$(if $(DISABLE_GUI),, \
Executable_vcldemo \
Executable_icontest \
diff --git a/vcl/workben/outdevgrind.cxx b/vcl/workben/outdevgrind.cxx
deleted file mode 100644
index 8283a5e59da2..000000000000
--- a/vcl/workben/outdevgrind.cxx
+++ /dev/null
@@ -1,749 +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 .
- */
-
-#include <sal/main.h>
-#include <sal/log.hxx>
-#include <tools/diagnose_ex.h>
-#include <tools/extendapplicationenvironment.hxx>
-
-#include <cppuhelper/bootstrap.hxx>
-#include <comphelper/processfactory.hxx>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
-
-#include <vcl/svapp.hxx>
-#include <vcl/window.hxx>
-#include <vcl/dialog.hxx>
-#include <vcl/outdev.hxx>
-#include <vcl/virdev.hxx>
-#include <vcl/hatch.hxx>
-#include <vcl/bitmap.hxx>
-#include <vcl/BitmapEmbossGreyFilter.hxx>
-#include <vcl/wall.hxx>
-#include <vcl/image.hxx>
-#include <vcl/gdimtf.hxx>
-#include <vcl/metaact.hxx>
-#include <vcl/bitmapex.hxx>
-#include <vcl/gradient.hxx>
-#include <vcl/lineinfo.hxx>
-
-#include <rtl/bootstrap.hxx>
-
-#include <osl/time.h>
-
-#include <functional>
-
-#include <stdio.h>
-
-using namespace ::com::sun::star;
-
-namespace
-{
-
-class GrindApp : public Application
-{
-public:
- virtual int Main() override;
- virtual void Exception( ExceptionCategory nCategory ) override;
-};
-
-class TestWindow : public Dialog
-{
- public:
- TestWindow() : Dialog( nullptr )
- {
- SetText( "OutDev grinding" );
- SetSizePixel( Size( 1024, 1024 ) );
- EnablePaint( true );
- Show();
- }
-
- virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) override;
-};
-
-typedef std::function<void (OutputDevice*)> functor_type;
-typedef std::vector< std::pair<const char*,
- functor_type> > functor_vector_type;
-
-template< typename Functor > void add( functor_vector_type& res,
- const char* pStr,
- const Functor& func )
-{
- res.emplace_back(pStr,functor_type(func) );
-}
-
-void setupMethodStubs( functor_vector_type& res )
-{
- const Color aWhiteColor( COL_WHITE );
- const Color aBlackColor( COL_BLACK );
-
- const Point aPt1(10,10);
- const Point aPt2(500,500);
- const Point aPt3(0,0);
- const Point aPt4(450,450);
-
- const tools::Rectangle aRect(aPt1,aPt2);
- const tools::Rectangle aRect2(aPt3,aPt4);
- const tools::Polygon aPoly(aRect);
- const tools::Polygon aPoly2(aRect2);
- tools::PolyPolygon aPolyPoly(aPoly);
- aPolyPoly.Insert( aPoly2 );
- tools::Polygon aPoly3(aPoly2);
- aPoly3.Rotate( aPoly3.GetBoundRect().Center(), 900 );
- const LineInfo aLineInfo(LineStyle::Solid,5);
-
-#ifdef FIXME_VDEV
- const OUString aString("This is a test");
-
- // unfortunately, VDevs have inaccessible copy constructors
- static VirtualDevice aVDev;
- static VirtualDevice aVDevBW(1);
-
- const Size aVDevSize;
- aVDev.SetOutputSizePixel(aVDevSize);
- aVDevBW.SetOutputSizePixel(aVDevSize);
-
- const Bitmap aBitmap( aVDev.GetBitmap(aPt1,aVDevSize) );
- const Bitmap aBitmapBW( aVDevBW.GetBitmap(aPt1,aVDevSize) );
- const Bitmap aBitmapAlien( aVDevSize, 8 );
-#else
- BitmapEx aIntro;
- rtl::Bootstrap::set("BRAND_BASE_DIR", ".");
- if (Application::LoadBrandBitmap ("intro", aIntro))
- Application::Abort( "Failed to load intro image, run inside program/" );
-
- const Bitmap aBitmap( aIntro.GetBitmap() );
- Bitmap aBitmapBW( aBitmap );
-
- BitmapEx aTmpBmpEx(aBitmapBW);
- BitmapFilter::Filter(aTmpBmpEx, BitmapEmbossGreyFilter(0, 0));
- aBitmapBW = aTmpBmpEx.GetBitmap();
-
- Bitmap aBitmapAlien( Size( 100, 100 ), 8 );
- aBitmapAlien.Erase( COL_RED );
-#endif
-
- const BitmapEx aBitmapEx( aBitmap, aBitmapBW );
- (void)aBitmapEx;
- const BitmapEx aBitmapExBW( aBitmapBW, aBitmapBW );
- (void)aBitmapExBW;
- const BitmapEx aBitmapExAlien( aBitmapAlien, aBitmapBW );
- (void)aBitmapExAlien;
- const BitmapEx aBitmapExAlpha( aBitmap, aBitmapAlien );
- (void)aBitmapExAlpha;
- const BitmapEx aBitmapExAlphaAlien( aBitmapAlien, aBitmapAlien );
- (void)aBitmapExAlphaAlien;
-
-#ifdef NEEDS_QUALITY_PARAMETER
- const Image aImage( aBitmapEx );
-#endif
- const Gradient aGradient(GradientStyle::Elliptical,aBlackColor,aWhiteColor);
- const Hatch aHatch(HatchStyle::Triple,aBlackColor,4,450);
- const Wallpaper aWallpaper( aWhiteColor );
-
- GDIMetaFile aMtf;
- aMtf.AddAction( new MetaFillColorAction(COL_RED,true) );
- aMtf.AddAction( new MetaRectAction(aRect) );
-
-#ifdef FIXME_NEEDS_LOVE
- add(res,
- "DrawTextArray",
- [&] (OutputDevice * pDev) {
- return pDev->DrawTextArray(aPt1, aString, (const sal_Int32*)0, (sal_uInt16)0, aString.getLength());
- });
-#endif
-
- /* void DrawPixel( const Point& rPt, const Color& rColor ); */
- add(res,
- "DrawPixel",
- [aPt1, aBlackColor](OutputDevice *pOutDev) { return pOutDev->DrawPixel(aPt1, aBlackColor); });
-
- /* void DrawLine( const Point& rStartPt, const Point& rEndPt ); */
- add(res,
- "DrawLine",
- [aPt1, aPt2] (OutputDevice *pOutDev) { return pOutDev->DrawLine(aPt1, aPt2); });
-
- /* void DrawLine( const Point& rStartPt, const Point& rEndPt,
- const LineInfo& rLineInfo );
- */
- add(res,
- "DrawLine(LineInfo)",
- [aPt1, aPt2, aLineInfo] (OutputDevice *pOutDev) { return pOutDev->DrawLine(aPt1, aPt2, aLineInfo); });
-
- /* void DrawPolyLine( const Polygon& rPoly ); */
- add(res,
- "DrawPolyLine",
- [aPoly] (OutputDevice *pOutDev) {return pOutDev->DrawPolyLine(aPoly); });
-
- /* void DrawPolyLine( const Polygon& rPoly,
- const LineInfo& rLineInfo );
- */
- add(res,
- "DrawPolyLine(LineInfo)",
- [aPoly, aLineInfo] (OutputDevice *pOutDev) { return pOutDev->DrawPolyLine(aPoly, aLineInfo); });
-
- /* void DrawPolygon( const Polygon& rPoly ); */
- add(res,
- "DrawPolygon",
- [aPoly] (OutputDevice *pOutDev) { return pOutDev->DrawPolygon(aPoly); });
-
- /* void DrawPolyPolygon( const tools::PolyPolygon& rPolyPoly ); */
- add(res,
- "DrawPolyPolygon",
- [aPolyPoly] (OutputDevice *pOutDev) { return pOutDev->DrawPolyPolygon(aPolyPoly); });
-
- /* void DrawRect( const Rectangle& rRect ); */
- add(res,
- "DrawRect",
- [aRect] (OutputDevice *pOutDev) { return pOutDev->DrawRect(aRect); });
-
- /* void DrawRect( const Rectangle& rRect,
- sal_uLong nHorzRount, sal_uLong nVertRound );
- */
- add(res,
- "DrawRect(round corners)",
- [aRect2] (OutputDevice *pOutDev) { return pOutDev->DrawRect(aRect2,4,4); });
-
- /* void DrawEllipse( const Rectangle& rRect ); */
- add(res,
- "DrawEllipse",
- [aRect] (OutputDevice *pOutDev) { return pOutDev->DrawEllipse(aRect); });
-
- /* void DrawArc( const Rectangle& rRect,
- const Point& rStartPt, const Point& rEndPt );
- */
- add(res,
- "DrawArc",
- [aRect,aPt1,aPt2] (OutputDevice *pOutDev) { return pOutDev->DrawArc(aRect,aPt1,aPt2); });
-
- /* void DrawPie( const Rectangle& rRect,
- const Point& rStartPt, const Point& rEndPt );
- */
- add(res,
- "DrawPie",
- [aRect2,aPt3,aPt4] (OutputDevice *pOutDev) { return pOutDev->DrawPie(aRect2,aPt3,aPt4); });
-
- /* void DrawChord( const Rectangle& rRect,
- const Point& rStartPt, const Point& rEndPt );
- */
- add(res,
- "DrawChord",
- [aRect2,aPt3,aPt4] (OutputDevice *pOutDev) { return pOutDev->DrawChord(aRect2,aPt3,aPt4); });
-
- /* void DrawOutDev( const Point& rDestPt, const Size& rDestSize,
- const Point& rSrcPt, const Size& rSrcSize );
- */
- add(res,
- "DrawOutDev",
- [aRect,aRect2] (OutputDevice *pOutDev) { return pOutDev->DrawOutDev(aRect2.TopLeft(), aRect2.GetSize(),
- aRect.TopLeft(), aRect.GetSize()); });
-
-#ifdef FIXME_VDEV
- /* void DrawOutDev( const Point& rDestPt, const Size& rDestSize,
- const Point& rSrcPt, const Size& rSrcSize,
- const OutputDevice& rOutDev );
- */
- add(res,
- "DrawOutDev(foreign source)",
- [&] (OutputDevice * pDev) {
- return pDev->DrawOutDev(aRect2.TopLeft(), aRect2.GetSize(),
- aRect.TopLeft(), aRect.GetSize(), aVDevBW);
- });
-
- /* void DrawOutDev( const Point& rDestPt, const Size& rDestSize,
- const Point& rSrcPt, const Size& rSrcSize,
- const OutputDevice& rOutDev );
- */
- add(res,
- "DrawOutDev(foreign source, scaled)",
- [&] (OutputDevice * pDev) {
- return pDev->DrawOutDev(aRect2.TopLeft(), aRect2.GetSize(),
- aRect.TopLeft(), aRect.GetSize(), aVDev);
- });
-#endif
-
- /* void CopyArea( const Point& rDestPt,
- const Point& rSrcPt, const Size& rSrcSize,
- sal_uInt16 nFlags = 0 );
- */
- add(res,
- "CopyArea",
- [&] (OutputDevice * pDev) { return pDev->CopyArea(aPt1, aPt3, aRect2.GetSize()); } );
-
-#ifdef NEEDS_QUALITY_PARAMETER
- /* void DrawBitmap( const Point& rDestPt,
- const Bitmap& rBitmap );
- */
- add(res,
- "DrawBitmap(alien source)",
- [&] (OutputDevice * pDev) { return pDev->DrawBitmap(aPt1, aBitmapAlien); });
-
- /* void DrawBitmap( const Point& rDestPt,
- const Bitmap& rBitmap );
- */
- add(res,
- "DrawBitmap",
- [&] (OutputDevice * pDev) { return pDev->DrawBitmap(aPt1, aBitmap); });
-
- /* void DrawBitmap( const Point& rDestPt, const Size& rDestSize,
- const Bitmap& rBitmap );
- */
- add(res,
- "DrawBitmap(scaled,alien source)",
- [&] (OutputDevice * pDev) {
- return pDev->DrawBitmap(aPt1, aRect.GetSize(), aBitmapAlien);
- });
-
- /* void DrawBitmap( const Point& rDestPt, const Size& rDestSize,
- const Bitmap& rBitmap );
- */
- add(res,
- "DrawBitmap(scaled)",
- [&] (OutputDevice * pDev) {
- return pDev->DrawBitmap(aPt1, aRect.GetSize(), aBitmap);
- });
-
-#if 0
- /* void DrawBitmap( const Point& rDestPt, const Size& rDestSize,
- const Point& rSrcPtPixel, const Size& rSrcSizePixel,
- const Bitmap& rBitmap );
- */
- add(res,
- "DrawBitmap(scaled subset,alien source)",
- [&] (OutputDevice * pDev) {
- return pDev->DrawBitmap(aPt1, aRect.GetSize(), aPt3,
- aRect2.GetSize(), aBitmapAlien);
- });
-#endif
-
- /* void DrawBitmap( const Point& rDestPt, const Size& rDestSize,
- const Point& rSrcPtPixel, const Size& rSrcSizePixel,
- const Bitmap& rBitmap );
- */
- add(res,
- "DrawBitmap(scaled subset)",
- [&] (OutputDevice * pDev) {
- return pDev->DrawBitmap(aPt1, aRect.GetSize(), aPt3, aRect2.GetSize(), aBitmap);
- });
-
- /* void DrawBitmapEx( const Point& rDestPt,
- const BitmapEx& rBitmapEx );
- */
- add(res,
- "DrawBitmapEx(alien source)",
- [&] (OutputDevice * pDev) { return pDev->DrawBitmapEx(aPt1, aBitmapExAlien); });
-
- /* void DrawBitmapEx( const Point& rDestPt,
- const BitmapEx& rBitmapEx );
- */
- add(res,
- "DrawBitmapEx",
- [&] (OutputDevice * pDev) { return pDev->DrawBitmapEx(aPt1, aBitmapEx); });
-
- /* void DrawBitmapEx( const Point& rDestPt,
- const BitmapEx& rBitmapEx );
- */
- add(res,
- "DrawBitmapEx(alpha)",
- [&] (OutputDevice * pDev) { return pDev->DrawBitmapEx(aPt1, aBitmapExAlpha); });
-
- /* void DrawBitmapEx( const Point& rDestPt,
- const BitmapEx& rBitmapEx );
- */
- add(res,
- "DrawBitmapEx(alpha, alien source)",
- [&] (OutputDevice * pDev) { return pDev->DrawBitmapEx(aPt1, aBitmapExAlphaAlien); });
-
- /* void DrawBitmapEx( const Point& rDestPt, const Size& rDestSize,
- const BitmapEx& rBitmapEx );
- */
- add(res,
- "DrawBitmapEx(scaled,alien source)",
- [&] (OutputDevice * pDev) {
- return pDev->DrawBitmapEx(aPt1, aRect.GetSize(), aBitmapExAlien);
- });
-
- /* void DrawBitmapEx( const Point& rDestPt, const Size& rDestSize,
- const BitmapEx& rBitmapEx );
- */
- add(res,
- "DrawBitmapEx(scaled)",
- [&] (OutputDevice * pDev) {
- return pDev->DrawBitmapEx(aPt1, aRect.GetSize(), aBitmapEx);
- });
-
- /* void DrawBitmapEx( const Point& rDestPt, const Size& rDestSize,
- const BitmapEx& rBitmapEx );
- */
- add(res,
- "DrawBitmapEx(scaled alpha)",
- [&] (OutputDevice * pDev) {
- return pDev->DrawBitmapEx(aPt1, aRect.GetSize(), aBitmapExAlpha);
- });
-
- /* void DrawBitmapEx( const Point& rDestPt, const Size& rDestSize,
- const BitmapEx& rBitmapEx );
- */
- add(res,
- "DrawBitmapEx(scaled alpha, alien source)",
- [&] (OutputDevice * pDev) {
- return pDev->DrawBitmapEx(aPt1, aRect.GetSize(), aBitmapExAlphaAlien);
- });
-
- /* void DrawBitmapEx( const Point& rDestPt, const Size& rDestSize,
- const Point& rSrcPtPixel, const Size& rSrcSizePixel,
- const BitmapEx& rBitmapEx );
- */
- add(res,
- "DrawBitmapEx(scaled subset,alien source)",
- [&] (OutputDevice * pDev) {
- return pDev->DrawBitmapEx(aPt1, aRect.GetSize(), aPt3, aRect2.GetSize(), aBitmapExAlien);
- });
-
- /* void DrawBitmapEx( const Point& rDestPt, const Size& rDestSize,
- const Point& rSrcPtPixel, const Size& rSrcSizePixel,
- const BitmapEx& rBitmapEx );
- */
- add(res,
- "DrawBitmapEx(scaled subset)",
- [&] (OutputDevice * pDev) {
- return pDev->DrawBitmapEx(aPt1, aRect.GetSize(), aPt3, aRect2.GetSize(), aBitmapEx);
- });
-
- /* void DrawBitmapEx( const Point& rDestPt, const Size& rDestSize,
- const Point& rSrcPtPixel, const Size& rSrcSizePixel,
- const BitmapEx& rBitmapEx );
- */
- add(res,
- "DrawBitmapEx(scaled subset, alpha)",
- [&] (OutputDevice * pDev) {
- return pDev->DrawBitmapEx(aPt1, aRect.GetSize(), aPt3, aRect2.GetSize(), aBitmapExAlpha);
- });
-
- /* void DrawBitmapEx( const Point& rDestPt, const Size& rDestSize,
- const Point& rSrcPtPixel, const Size& rSrcSizePixel,
- const BitmapEx& rBitmapEx );
- */
- add(res,
- "DrawBitmapEx(scaled subset, alpha alien source)",
- [&] (OutputDevice * pDev) {
- return pDev->DrawBitmapEx(aPt1, aRect.GetSize(), aPt3, aRect2.GetSize(), aBitmapExAlphaAlien);
- });
-
- /* void DrawMask( const Point& rDestPt,
- const Bitmap& rBitmap, const Color& rMaskColor );
- */
- add(res,
- "DrawMask(alien source)",
- [&] (OutputDevice * pDev) {
- return pDev->DrawMask(aPt1, aBitmapAlien, aBlackColor);
- });
-
- /* void DrawMask( const Point& rDestPt,
- const Bitmap& rBitmap, const Color& rMaskColor );
- */
- add(res,
- "DrawMask",
- [&] (OutputDevice * pDev) {
- return pDev->DrawMask(aPt1, aBitmap, aBlackColor);
- });
-
- /* void DrawMask( const Point& rDestPt, const Size& rDestSize,
- const Bitmap& rBitmap, const Color& rMaskColor );
- */
- add(res,
- "DrawMask(scaled,alien source)",
- [&] (OutputDevice * pDev) {
- return pDev->DrawMask(aPt1, aRect.GetSize(), aBitmapAlien, aBlackColor);
- });
-
- /* void DrawMask( const Point& rDestPt, const Size& rDestSize,
- const Bitmap& rBitmap, const Color& rMaskColor );
- */
- add(res,
- "DrawMask(scaled)",
- [&] (OutputDevice * pDev) {
- return pDev->DrawMask(aPt1, aRect.GetSize(), aBitmap, aBlackColor);
- });
-
- /* void DrawMask( const Point& rDestPt, const Size& rDestSize,
- const Point& rSrcPtPixel, const Size& rSrcSizePixel,
- const Bitmap& rBitmap, const Color& rMaskColor );
- */
- add(res,
- "DrawMask(scaled subset,alien source)",
- [&] (OutputDevice * pDev) {
- return pDev->DrawMask(aPt1, aRect.GetSize(), aPt3, aRect2.GetSize(),
- aBitmapAlien, aBlackColor);
- });
-
- /* void DrawMask( const Point& rDestPt, const Size& rDestSize,
- const Point& rSrcPtPixel, const Size& rSrcSizePixel,
- const Bitmap& rBitmap, const Color& rMaskColor );
- */
- add(res,
- "DrawMask(scaled subset)",
- [&] (OutputDevice * pDev) {
- return pDev->DrawMask(aPt1, aRect.GetSize(), aPt3, aRect2.GetSize(), aBitmap, aBlackColor);
- });
-
- /* void DrawImage( const Point& rPos,
- const Image& rImage, sal_uInt16 nStyle = 0 );
- */
- add(res,
- "DrawImage",
- [&] (OutputDevice * pDev) {
- return pDev->DrawImage(aPt1, aImage, static_cast<sal_uInt16>(0));
- });
-
- /* void DrawImage( const Point& rPos, const Size& rSize,
- const Image& rImage, sal_uInt16 nStyle = 0 );
- */
- add(res,
- "DrawImage(scaled)",
- [&] (OutputDevice * pDev) {
- return pDev->DrawImage(aPt1, aRect.GetSize(), aImage, static_cast<sal_uInt16>(0)));
- });
-
-#endif // NEEDS_QUALITY_PARAMETER
-
- /* void DrawGradient( const Rectangle& rRect, const Gradient& rGradient ); */
- add(res,
- "DrawGradient",
- [&] (OutputDevice * pDev) {
- return pDev->DrawGradient(aRect, aGradient);
- });
-
- /* void DrawGradient( const tools::PolyPolygon& rPolyPoly, const Gradient& rGradient ); */
- add(res,
- "DrawGradient(polygon)",
- [&] (OutputDevice * pDev) {
- return pDev->DrawGradient(aPoly3, aGradient);
- });
-
- /* void DrawHatch( const tools::PolyPolygon& rPolyPoly, const Hatch& rHatch ); */
- add(res,
- "DrawHatch",
- [&] (OutputDevice * pDev) {
- return pDev->DrawHatch(aPoly3, aHatch);
- });
-
- /* void DrawWallpaper( const Rectangle& rRect, const Wallpaper& rWallpaper ); */
- add(res,
- "DrawWallpaper",
- [&] (OutputDevice * pDev) {
- return pDev->DrawWallpaper(aRect2, aWallpaper);
- });
-
- /* void DrawGrid( const Rectangle& rRect, const Size& rDist, sal_uLong nFlags ); */
- add(res,
- "DrawGrid",
- [&] (OutputDevice * pDev) {
- return pDev->DrawGrid(aRect, Size(10,20), DrawGridFlags::HorzLines|DrawGridFlags::VertLines);
- });
-
- /* void DrawTransparent( const tools::PolyPolygon& rPolyPoly,
- sal_uInt16 nTransparencePercent );
- */
- add(res,
- "DrawTransparent",
- [&] (OutputDevice * pDev) {
- return pDev->DrawTransparent(aPoly3, sal_uInt16(50));
- });
-
- /* void DrawTransparent( const GDIMetaFile& rMtf,
- const Point& rPos, const Size& rSize,
- const Gradient& rTransparenceGradient );
- */
- add(res,
- "DrawTransparent(metafile)",
- [&] (OutputDevice * pDev) {
- return pDev->DrawTransparent(aMtf, aPt1, aRect.GetSize(), aGradient);
- });
-
- /* void Erase(); */
- add(res,
- "Erase",
- [] (OutputDevice * pDev) { return pDev->Erase(); } );
-
-}
-
-void grindFunc( OutputDevice& rTarget,
- functor_vector_type::const_iterator const & iter,
- sal_Int32 nTurns,
- const char* pMsg )
-{
- const sal_uInt32 nStartTime( osl_getGlobalTimer() );
-
- for( sal_Int32 i=0; i<nTurns; ++i )
- iter->second(&rTarget);
-
- if( rTarget.GetOutDevType() == OUTDEV_WINDOW )
- static_cast< vcl::Window & >( rTarget ).Flush();
-
- fprintf( stdout,
- "Duration: %d ms (%d repetitions)\tOperation: %s\tSetup: %s\n",
- static_cast<int>(osl_getGlobalTimer() - nStartTime),
- static_cast<int>(nTurns),
- iter->first,
- pMsg );
-}
-
-/** Call OutputDevice render methods repeatedly, and output elapsed
- time to stdout
- */
-void outDevGrind(vcl::RenderContext& rTarget)
-{
- sal_Int32 nTurns = 100;
- // TODO(F1): also profile pure complex clip setup times!
-
- // State: fill/line color, draw mode, w/o clip, rect clip, complex clip
- functor_vector_type aMethods;
- setupMethodStubs( aMethods );
-
- const tools::Rectangle aClipRect(10,10,1000,1000);
- const tools::Polygon aPoly1( aClipRect );
- tools::Polygon aPoly2( aClipRect );
- aPoly2.Rotate(aClipRect.Center(),450);
- tools::PolyPolygon aClipPoly(aPoly1);
- aClipPoly.Insert(aPoly2);
-
- functor_vector_type::const_iterator iter = aMethods.begin();
- const functor_vector_type::const_iterator end = aMethods.end();
- while( iter != end )
- {
- rTarget.SetLineColor( COL_BLACK );
- rTarget.SetFillColor( COL_GREEN );
- rTarget.SetRasterOp( RasterOp::OverPaint );
- rTarget.SetClipRegion();
- grindFunc( rTarget, iter, nTurns, "w/o clip, w/o xor" );
-
- rTarget.SetLineColor( COL_BLACK );
- rTarget.SetFillColor( COL_GREEN );
- rTarget.SetRasterOp( RasterOp::OverPaint );
- rTarget.SetClipRegion( vcl::Region( aClipRect ) );
- grindFunc( rTarget, iter, nTurns, "with rect clip, w/o xor" );
-
- rTarget.SetLineColor( COL_BLACK );
- rTarget.SetFillColor( COL_GREEN );
- rTarget.SetRasterOp( RasterOp::OverPaint );
- rTarget.SetClipRegion( vcl::Region( aClipPoly ) );
- grindFunc( rTarget, iter, nTurns, "with complex clip, w/o xor" );
-
- rTarget.SetLineColor( COL_BLACK );
- rTarget.SetFillColor( COL_GREEN );
- rTarget.SetRasterOp( RasterOp::Xor );
- rTarget.SetClipRegion();
- grindFunc( rTarget, iter, nTurns, "w/o clip, with xor" );
-
- rTarget.SetLineColor( COL_BLACK );
- rTarget.SetFillColor( COL_GREEN );
- rTarget.SetRasterOp( RasterOp::Xor );
- rTarget.SetClipRegion( vcl::Region( aClipRect ) );
- grindFunc( rTarget, iter, nTurns, "with rect clip, with xor" );
-
- rTarget.SetLineColor( COL_BLACK );
- rTarget.SetFillColor( COL_GREEN );
- rTarget.SetRasterOp( RasterOp::Xor );
- rTarget.SetClipRegion( vcl::Region( aClipPoly ) );
- grindFunc( rTarget, iter, nTurns, "with complex clip, with xor" );
-
- ++iter;
- }
-}
-
-void TestWindow::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&)
-{
- outDevGrind(rRenderContext);
- fflush(stdout);
-}
-
-void GrindApp::Exception( ExceptionCategory nCategory )
-{
- switch( nCategory )
- {
- case ExceptionCategory::ResourceNotLoaded:
- Abort( "Error: could not load language resources.\nPlease check your installation.\n" );
- break;
- default: break;
- }
-}
-
-int GrindApp::Main()
-{
- ScopedVclPtrInstance<TestWindow> aWindow;
- aWindow->Execute();
- return 0;
-}
-
-} // namespace
-
-
-SAL_IMPLEMENT_MAIN()
-{
- try
- {
- bool bHelp = false;
-
- for( sal_uInt16 i = 0; i < Application::GetCommandLineParamCount(); i++ )
- {
- OUString aParam = Application::GetCommandLineParam( i );
-
- if( aParam == "--help" || aParam == "-h" )
- bHelp = true;
- }
-
- if( bHelp )
- {
- printf( "outdevgrind - Profile OutputDevice\n" );
- return EXIT_SUCCESS;
- }
-
- tools::extendApplicationEnvironment();
-
- uno::Reference< uno::XComponentContext > xContext = cppu::defaultBootstrap_InitialComponentContext();
- uno::Reference< lang::XMultiServiceFactory > xServiceManager( xContext->getServiceManager(), uno::UNO_QUERY );
-
- if( !xServiceManager.is() )
- Application::Abort( "Failed to bootstrap" );
-
- comphelper::setProcessServiceFactory( xServiceManager );
-
- InitVCL();
-
- GrindApp aGrindApp;
- aGrindApp.Main();
-
- DeInitVCL();
- }
- catch (const css::uno::Exception&)
- {
- TOOLS_WARN_EXCEPTION("vcl.app", "Fatal");
- return EXIT_FAILURE;
- }
- catch (const std::exception& e)
- {
- SAL_WARN("vcl.app", "Fatal: " << e.what());
- return EXIT_FAILURE;
- }
-
- return EXIT_SUCCESS;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list