From 1275d274db37fc333838321347e1887488f8f4c0 Mon Sep 17 00:00:00 2001 From: Petr Mladek Date: Tue, 5 Oct 2010 15:55:19 +0200 Subject: more removed include guards using fixguard.py --- basebmp/inc/basebmp/compositeiterator.hxx | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 basebmp/inc/basebmp/compositeiterator.hxx (limited to 'basebmp') diff --git a/basebmp/inc/basebmp/compositeiterator.hxx b/basebmp/inc/basebmp/compositeiterator.hxx old mode 100755 new mode 100644 -- cgit From ecadd96bccf9e535362ee49ac9019cb2eb69f3ae Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 6 Oct 2010 12:16:50 +0100 Subject: #i113503# cppunit stl wrapper headers --- basebmp/test/basictest.cxx | 2 ++ basebmp/test/bmpmasktest.cxx | 2 ++ basebmp/test/bmptest.cxx | 2 ++ basebmp/test/cliptest.cxx | 2 ++ basebmp/test/filltest.cxx | 2 ++ basebmp/test/linetest.cxx | 2 ++ basebmp/test/makefile.mk | 7 +++++++ basebmp/test/masktest.cxx | 2 ++ basebmp/test/polytest.cxx | 2 ++ 9 files changed, 23 insertions(+) (limited to 'basebmp') diff --git a/basebmp/test/basictest.cxx b/basebmp/test/basictest.cxx index 6f96cf56f492..a9c533a3a134 100644 --- a/basebmp/test/basictest.cxx +++ b/basebmp/test/basictest.cxx @@ -27,10 +27,12 @@ // autogenerated file with codegen.pl +#include "preextstl.h" #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" #include "cppunit/plugin/TestPlugIn.h" +#include "postextstl.h" #include #include diff --git a/basebmp/test/bmpmasktest.cxx b/basebmp/test/bmpmasktest.cxx index 9be504819fe8..29e261423a06 100644 --- a/basebmp/test/bmpmasktest.cxx +++ b/basebmp/test/bmpmasktest.cxx @@ -27,9 +27,11 @@ // autogenerated file with codegen.pl +#include "preextstl.h" #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" +#include "postextstl.h" #include #include diff --git a/basebmp/test/bmptest.cxx b/basebmp/test/bmptest.cxx index 9e33f0a8d713..9d083980790b 100644 --- a/basebmp/test/bmptest.cxx +++ b/basebmp/test/bmptest.cxx @@ -27,9 +27,11 @@ // autogenerated file with codegen.pl +#include "preextstl.h" #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" +#include "postextstl.h" #include #include diff --git a/basebmp/test/cliptest.cxx b/basebmp/test/cliptest.cxx index 875016d878cc..b0f0b72f07e0 100644 --- a/basebmp/test/cliptest.cxx +++ b/basebmp/test/cliptest.cxx @@ -27,9 +27,11 @@ // autogenerated file with codegen.pl +#include "preextstl.h" #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" +#include "postextstl.h" #include #include diff --git a/basebmp/test/filltest.cxx b/basebmp/test/filltest.cxx index 150fa11b3a72..d03e887dbcc5 100644 --- a/basebmp/test/filltest.cxx +++ b/basebmp/test/filltest.cxx @@ -27,9 +27,11 @@ // autogenerated file with codegen.pl +#include "preextstl.h" #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" +#include "postextstl.h" #include #include diff --git a/basebmp/test/linetest.cxx b/basebmp/test/linetest.cxx index fcd383fccdb0..dbdbe57de0a7 100644 --- a/basebmp/test/linetest.cxx +++ b/basebmp/test/linetest.cxx @@ -27,9 +27,11 @@ // autogenerated file with codegen.pl +#include "preextstl.h" #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" +#include "postextstl.h" #include #include diff --git a/basebmp/test/makefile.mk b/basebmp/test/makefile.mk index ca77721716f7..8dc95dcea0e5 100644 --- a/basebmp/test/makefile.mk +++ b/basebmp/test/makefile.mk @@ -60,6 +60,13 @@ CDEFS+=-xalias_level=compatible .ENDIF .ENDIF +#building with stlport, but cppunit was not built with stlport +.IF "$(USE_SYSTEM_STL)"!="YES" +.IF "$(SYSTEM_CPPUNIT)"=="YES" +CFLAGSCXX+=-DADAPT_EXT_STL +.ENDIF +.ENDIF + CFLAGSCXX += $(CPPUNIT_CFLAGS) # --- Common ---------------------------------------------------------- diff --git a/basebmp/test/masktest.cxx b/basebmp/test/masktest.cxx index 77cd05588d5a..63f357a314d0 100644 --- a/basebmp/test/masktest.cxx +++ b/basebmp/test/masktest.cxx @@ -27,9 +27,11 @@ // autogenerated file with codegen.pl +#include "preextstl.h" #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" +#include "postextstl.h" #include #include diff --git a/basebmp/test/polytest.cxx b/basebmp/test/polytest.cxx index f3b1f0018e17..2feef67774de 100644 --- a/basebmp/test/polytest.cxx +++ b/basebmp/test/polytest.cxx @@ -27,9 +27,11 @@ // autogenerated file with codegen.pl +#include "preextstl.h" #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" +#include "postextstl.h" #include #include -- cgit From 4905a190326a423b418a6b5531c5d990a5cc0082 Mon Sep 17 00:00:00 2001 From: Sebastian Spaeth Date: Thu, 14 Oct 2010 08:27:31 +0200 Subject: Add vim/emacs modelines to all source files Fixes #fdo30794 Based on bin/add-modelines script (originally posted in mail 1286706307.1871.1399280959@webmail.messagingengine.com) Signed-off-by: Sebastian Spaeth --- basebmp/inc/basebmp/accessor.hxx | 3 +++ basebmp/inc/basebmp/accessoradapters.hxx | 3 +++ basebmp/inc/basebmp/accessorfunctors.hxx | 3 +++ basebmp/inc/basebmp/accessortraits.hxx | 3 +++ basebmp/inc/basebmp/bitmapdevice.hxx | 3 +++ basebmp/inc/basebmp/clippedlinerenderer.hxx | 3 +++ basebmp/inc/basebmp/color.hxx | 3 +++ basebmp/inc/basebmp/colorblendaccessoradapter.hxx | 3 +++ basebmp/inc/basebmp/colormisc.hxx | 3 +++ basebmp/inc/basebmp/colortraits.hxx | 3 +++ basebmp/inc/basebmp/compositeiterator.hxx | 3 +++ basebmp/inc/basebmp/debug.hxx | 3 +++ basebmp/inc/basebmp/drawmodes.hxx | 3 +++ basebmp/inc/basebmp/endian.hxx | 3 +++ basebmp/inc/basebmp/fillimage.hxx | 3 +++ basebmp/inc/basebmp/genericcolorimageaccessor.hxx | 3 +++ basebmp/inc/basebmp/greylevelformats.hxx | 3 +++ basebmp/inc/basebmp/iteratortraits.hxx | 3 +++ basebmp/inc/basebmp/linerenderer.hxx | 3 +++ basebmp/inc/basebmp/metafunctions.hxx | 3 +++ basebmp/inc/basebmp/nonstandarditerator.hxx | 3 +++ basebmp/inc/basebmp/packedpixeliterator.hxx | 3 +++ basebmp/inc/basebmp/paletteformats.hxx | 3 +++ basebmp/inc/basebmp/paletteimageaccessor.hxx | 3 +++ basebmp/inc/basebmp/pixelformatadapters.hxx | 3 +++ basebmp/inc/basebmp/pixeliterator.hxx | 3 +++ basebmp/inc/basebmp/polypolygonrenderer.hxx | 3 +++ basebmp/inc/basebmp/rgb24pixelformats.hxx | 3 +++ basebmp/inc/basebmp/rgbmaskpixelformats.hxx | 3 +++ basebmp/inc/basebmp/scaleimage.hxx | 3 +++ basebmp/inc/basebmp/scanlineformats.hxx | 3 +++ basebmp/inc/basebmp/stridedarrayiterator.hxx | 3 +++ basebmp/inc/basebmp/tools.hxx | 3 +++ basebmp/inc/basebmp/truecolormaskaccessor.hxx | 3 +++ basebmp/source/bitmapdevice.cxx | 3 +++ basebmp/source/debug.cxx | 3 +++ basebmp/source/intconversion.hxx | 3 +++ basebmp/source/polypolygonrenderer.cxx | 3 +++ basebmp/test/basictest.cxx | 3 +++ basebmp/test/bmpdemo.cxx | 3 +++ basebmp/test/bmpmasktest.cxx | 2 ++ basebmp/test/bmptest.cxx | 2 ++ basebmp/test/cliptest.cxx | 2 ++ basebmp/test/filltest.cxx | 2 ++ basebmp/test/linetest.cxx | 2 ++ basebmp/test/masktest.cxx | 2 ++ basebmp/test/polytest.cxx | 2 ++ basebmp/test/tools.cxx | 3 +++ basebmp/test/tools.hxx | 3 +++ 49 files changed, 140 insertions(+) (limited to 'basebmp') diff --git a/basebmp/inc/basebmp/accessor.hxx b/basebmp/inc/basebmp/accessor.hxx index b98f05e78f6c..9bf2d1b6d140 100644 --- a/basebmp/inc/basebmp/accessor.hxx +++ b/basebmp/inc/basebmp/accessor.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -117,3 +118,5 @@ public: } // namespace basebmp #endif /* INCLUDED_BASEBMP_ACCESSOR_HXX */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basebmp/inc/basebmp/accessoradapters.hxx b/basebmp/inc/basebmp/accessoradapters.hxx index 40b4faed4bae..8fb801d7c8ca 100644 --- a/basebmp/inc/basebmp/accessoradapters.hxx +++ b/basebmp/inc/basebmp/accessoradapters.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -524,3 +525,5 @@ public: } // namespace basebmp #endif /* INCLUDED_BASEBMP_ACCESSORADAPTERS_HXX */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basebmp/inc/basebmp/accessorfunctors.hxx b/basebmp/inc/basebmp/accessorfunctors.hxx index fdb9b75aa64f..1d5464ac0c2f 100644 --- a/basebmp/inc/basebmp/accessorfunctors.hxx +++ b/basebmp/inc/basebmp/accessorfunctors.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -185,3 +186,5 @@ public: } // namespace basebmp #endif /* INCLUDED_BASEBMP_ACCESSORFUNCTORS_HXX */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basebmp/inc/basebmp/accessortraits.hxx b/basebmp/inc/basebmp/accessortraits.hxx index 0cb0d1f8d37d..e54da3f3b5ea 100644 --- a/basebmp/inc/basebmp/accessortraits.hxx +++ b/basebmp/inc/basebmp/accessortraits.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -128,3 +129,5 @@ template< class Accessor > struct AccessorTraits } // namespace basebmp #endif /* INCLUDED_BASEBMP_ACCESSORTRAITS_HXX */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basebmp/inc/basebmp/bitmapdevice.hxx b/basebmp/inc/basebmp/bitmapdevice.hxx index b1c513444fe6..e026f3165fbb 100644 --- a/basebmp/inc/basebmp/bitmapdevice.hxx +++ b/basebmp/inc/basebmp/bitmapdevice.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -690,3 +691,5 @@ BitmapDeviceSharedPtr cloneBitmapDevice( const basegfx::B2IVector& rSize, } #endif /* INCLUDED_BASEBMP_BITMAPDEVICE_HXX */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basebmp/inc/basebmp/clippedlinerenderer.hxx b/basebmp/inc/basebmp/clippedlinerenderer.hxx index 03b2bc860cbd..e023581416d6 100644 --- a/basebmp/inc/basebmp/clippedlinerenderer.hxx +++ b/basebmp/inc/basebmp/clippedlinerenderer.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -410,3 +411,5 @@ void renderClippedLine( basegfx::B2IPoint aPt1, } // namespace basebmp #endif /* INCLUDED_BASEBMP_CLIPPEDLINERENDERER_HXX */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basebmp/inc/basebmp/color.hxx b/basebmp/inc/basebmp/color.hxx index e9aab93a715c..1bd70198a280 100644 --- a/basebmp/inc/basebmp/color.hxx +++ b/basebmp/inc/basebmp/color.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -97,3 +98,5 @@ public: } // namespace vigra #endif /* INCLUDED_BASEBMP_COLOR_HXX */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basebmp/inc/basebmp/colorblendaccessoradapter.hxx b/basebmp/inc/basebmp/colorblendaccessoradapter.hxx index 03263c2c6062..4bb913500bd9 100644 --- a/basebmp/inc/basebmp/colorblendaccessoradapter.hxx +++ b/basebmp/inc/basebmp/colorblendaccessoradapter.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -146,3 +147,5 @@ public: } // namespace basebmp #endif /* INCLUDED_BASEBMP_COLORBLENDACCESSORADAPTER_HXX */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basebmp/inc/basebmp/colormisc.hxx b/basebmp/inc/basebmp/colormisc.hxx index 0974ebaa44a4..96a312c251ae 100644 --- a/basebmp/inc/basebmp/colormisc.hxx +++ b/basebmp/inc/basebmp/colormisc.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -189,3 +190,5 @@ struct NumericTraits } // namespace vigra #endif /* INCLUDED_BASEBMP_COLORMISC_HXX */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basebmp/inc/basebmp/colortraits.hxx b/basebmp/inc/basebmp/colortraits.hxx index 9c30b8f082c0..ba6a4cfeee27 100644 --- a/basebmp/inc/basebmp/colortraits.hxx +++ b/basebmp/inc/basebmp/colortraits.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -148,3 +149,5 @@ template< typename ColorType > struct ColorTraits } // namespace basebmp #endif /* INCLUDED_BASEBMP_COLORTRAITS_HXX */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basebmp/inc/basebmp/compositeiterator.hxx b/basebmp/inc/basebmp/compositeiterator.hxx index 70f2acebb043..e64cf0d8c093 100644 --- a/basebmp/inc/basebmp/compositeiterator.hxx +++ b/basebmp/inc/basebmp/compositeiterator.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -365,3 +366,5 @@ public: } // namespace basebmp #endif /* INCLUDED_BASEBMP_COMPOSITEITERATOR_HXX */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basebmp/inc/basebmp/debug.hxx b/basebmp/inc/basebmp/debug.hxx index a01d69326307..c5660b9a6a74 100644 --- a/basebmp/inc/basebmp/debug.hxx +++ b/basebmp/inc/basebmp/debug.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -48,3 +49,5 @@ namespace basebmp } #endif /* INCLUDED_BASEBMP_DEBUG_HXX */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basebmp/inc/basebmp/drawmodes.hxx b/basebmp/inc/basebmp/drawmodes.hxx index 6cdf34fd808a..7e59f81b6140 100644 --- a/basebmp/inc/basebmp/drawmodes.hxx +++ b/basebmp/inc/basebmp/drawmodes.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -53,3 +54,5 @@ namespace basebmp } #endif /* INCLUDED_BASEBMP_DRAWMODES_HXX */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basebmp/inc/basebmp/endian.hxx b/basebmp/inc/basebmp/endian.hxx index fb76ad1b306e..03a0dbeb9fbf 100644 --- a/basebmp/inc/basebmp/endian.hxx +++ b/basebmp/inc/basebmp/endian.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -55,3 +56,5 @@ BASEBMP_BYTE_SWAP(sal_uInt32,OSL_SWAPDWORD) } // namespace basebmp #endif /* INCLUDED_BASEBMP_ENDIAN_HXX */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basebmp/inc/basebmp/fillimage.hxx b/basebmp/inc/basebmp/fillimage.hxx index 344ee20e6ce5..d3809ecc0b6e 100644 --- a/basebmp/inc/basebmp/fillimage.hxx +++ b/basebmp/inc/basebmp/fillimage.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -67,3 +68,5 @@ inline void fillImage( vigra::triple con } // namespace basebmp #endif /* INCLUDED_BASEBMP_FILLIMAGE_HXX */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basebmp/inc/basebmp/genericcolorimageaccessor.hxx b/basebmp/inc/basebmp/genericcolorimageaccessor.hxx index eaf8e2b34bfa..2fada3948faf 100644 --- a/basebmp/inc/basebmp/genericcolorimageaccessor.hxx +++ b/basebmp/inc/basebmp/genericcolorimageaccessor.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -80,3 +81,5 @@ namespace basebmp } #endif /* INCLUDED_BASEBMP_GENERICCOLORIMAGEACCESSOR_HXX */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basebmp/inc/basebmp/greylevelformats.hxx b/basebmp/inc/basebmp/greylevelformats.hxx index 0adbcbb53c30..111fcc7e12fd 100644 --- a/basebmp/inc/basebmp/greylevelformats.hxx +++ b/basebmp/inc/basebmp/greylevelformats.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -133,3 +134,5 @@ BASEBMP_SPECIALIZE_ACCESSORTRAITS(PixelFormatTraits_GREY8::getter_type, } // namespace basebmp #endif /* INCLUDED_BASEBMP_GREYLEVELFORMATS_HXX */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basebmp/inc/basebmp/iteratortraits.hxx b/basebmp/inc/basebmp/iteratortraits.hxx index 716081f62c53..ac76a3ebf783 100644 --- a/basebmp/inc/basebmp/iteratortraits.hxx +++ b/basebmp/inc/basebmp/iteratortraits.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -53,3 +54,5 @@ template< class Iterator > struct IteratorTraits } // namespace basebmp #endif /* INCLUDED_BASEBMP_ITERATORTRAITS_HXX */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basebmp/inc/basebmp/linerenderer.hxx b/basebmp/inc/basebmp/linerenderer.hxx index 7c5f09dbb2d1..5e3d4df30b88 100644 --- a/basebmp/inc/basebmp/linerenderer.hxx +++ b/basebmp/inc/basebmp/linerenderer.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -179,3 +180,5 @@ void renderLine( const basegfx::B2IPoint& rPt1, } // namespace basebmp #endif /* INCLUDED_BASEBMP_LINERENDERER_HXX */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basebmp/inc/basebmp/metafunctions.hxx b/basebmp/inc/basebmp/metafunctions.hxx index 7eafac284f56..642a98a70680 100644 --- a/basebmp/inc/basebmp/metafunctions.hxx +++ b/basebmp/inc/basebmp/metafunctions.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -220,3 +221,5 @@ template< typename T > inline T shiftRight( T v, int shift ) } // namespace basebmp #endif /* INCLUDED_BASEBMP_METAFUNCTIONS_HXX */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basebmp/inc/basebmp/nonstandarditerator.hxx b/basebmp/inc/basebmp/nonstandarditerator.hxx index c9069da18826..090d15d41025 100644 --- a/basebmp/inc/basebmp/nonstandarditerator.hxx +++ b/basebmp/inc/basebmp/nonstandarditerator.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -43,3 +44,5 @@ namespace basebmp } // namespace basebmp #endif /* INCLUDED_BASEBMP_NONSTANDARDITERATOR_HXX */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basebmp/inc/basebmp/packedpixeliterator.hxx b/basebmp/inc/basebmp/packedpixeliterator.hxx index 0a48ce2024ff..b98c8c8f9670 100644 --- a/basebmp/inc/basebmp/packedpixeliterator.hxx +++ b/basebmp/inc/basebmp/packedpixeliterator.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -675,3 +676,5 @@ template< class Accessor, } // namespace basebmp #endif /* INCLUDED_BASEBMP_PACKEDPIXELITERATOR_HXX */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basebmp/inc/basebmp/paletteformats.hxx b/basebmp/inc/basebmp/paletteformats.hxx index d3de0ea18dd7..f138549462fe 100644 --- a/basebmp/inc/basebmp/paletteformats.hxx +++ b/basebmp/inc/basebmp/paletteformats.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -145,3 +146,5 @@ typedef PixelFormatTraitsTemplate_Palette< } // namespace basebmp #endif /* INCLUDED_BASEBMP_PACKEDPIXELFORMATS_HXX */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basebmp/inc/basebmp/paletteimageaccessor.hxx b/basebmp/inc/basebmp/paletteimageaccessor.hxx index 79bbb9aae9b7..35a14d16dd36 100644 --- a/basebmp/inc/basebmp/paletteimageaccessor.hxx +++ b/basebmp/inc/basebmp/paletteimageaccessor.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -166,3 +167,5 @@ public: } // namespace basebmp #endif /* INCLUDED_BASEBMP_PALETTEIMAGEACCESSOR_HXX */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basebmp/inc/basebmp/pixelformatadapters.hxx b/basebmp/inc/basebmp/pixelformatadapters.hxx index 2acd90b5bea8..6ebf531fbbb4 100644 --- a/basebmp/inc/basebmp/pixelformatadapters.hxx +++ b/basebmp/inc/basebmp/pixelformatadapters.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -106,3 +107,5 @@ template< class Accessor > struct AccessorTraits< \ } // namespace basebmp #endif /* INCLUDED_BASEBMP_PIXELFORMATADAPTERS_HXX */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basebmp/inc/basebmp/pixeliterator.hxx b/basebmp/inc/basebmp/pixeliterator.hxx index 84b99942927b..6e5ca4394a01 100644 --- a/basebmp/inc/basebmp/pixeliterator.hxx +++ b/basebmp/inc/basebmp/pixeliterator.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -353,3 +354,5 @@ public: } // namespace basebmp #endif /* INCLUDED_BASEBMP_PIXELITERATOR_HXX */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basebmp/inc/basebmp/polypolygonrenderer.hxx b/basebmp/inc/basebmp/polypolygonrenderer.hxx index 7cfacad510e5..6a7c391f31d0 100644 --- a/basebmp/inc/basebmp/polypolygonrenderer.hxx +++ b/basebmp/inc/basebmp/polypolygonrenderer.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -364,3 +365,5 @@ namespace basebmp } // namespace basebmp #endif /* INCLUDED_BASEBMP_POLYPOLYGONRENDERER_HXX */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basebmp/inc/basebmp/rgb24pixelformats.hxx b/basebmp/inc/basebmp/rgb24pixelformats.hxx index 788144a50b8d..91d374efd7e9 100644 --- a/basebmp/inc/basebmp/rgb24pixelformats.hxx +++ b/basebmp/inc/basebmp/rgb24pixelformats.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -96,3 +97,5 @@ BASEBMP_SPECIALIZE_ACCESSORTRAITS(PixelFormatTraits_BGR24::getter_type, } // namespace basebmp #endif /* INCLUDED_BASEBMP_RGB24PIXELFORMATS_HXX */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basebmp/inc/basebmp/rgbmaskpixelformats.hxx b/basebmp/inc/basebmp/rgbmaskpixelformats.hxx index d42125239529..47f7c2bf6199 100644 --- a/basebmp/inc/basebmp/rgbmaskpixelformats.hxx +++ b/basebmp/inc/basebmp/rgbmaskpixelformats.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -287,3 +288,5 @@ BASEBMP_SPECIALIZE_ACCESSORTRAITS(PixelFormatTraits_BGR32_888::getter_type, } // namespace basebmp #endif /* INCLUDED_BASEBMP_RGBMASKPIXELFORMATS_HXX */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basebmp/inc/basebmp/scaleimage.hxx b/basebmp/inc/basebmp/scaleimage.hxx index cb83e1353d5c..a8fd83e2cd94 100644 --- a/basebmp/inc/basebmp/scaleimage.hxx +++ b/basebmp/inc/basebmp/scaleimage.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -193,3 +194,5 @@ inline void scaleImage( vigra::triple const& sr } #endif /* INCLUDED_BASEBMP_SCALEIMAGE_HXX */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basebmp/inc/basebmp/scanlineformats.hxx b/basebmp/inc/basebmp/scanlineformats.hxx index d83aea688a37..ee466f21b5c9 100644 --- a/basebmp/inc/basebmp/scanlineformats.hxx +++ b/basebmp/inc/basebmp/scanlineformats.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -54,3 +55,5 @@ namespace basebmp { namespace Format } } #endif /* INCLUDED_BASEBMP_SCANLINEFORMATS_HXX */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basebmp/inc/basebmp/stridedarrayiterator.hxx b/basebmp/inc/basebmp/stridedarrayiterator.hxx index 8139cc8a8bc9..422269cb70e4 100644 --- a/basebmp/inc/basebmp/stridedarrayiterator.hxx +++ b/basebmp/inc/basebmp/stridedarrayiterator.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -112,3 +113,5 @@ private: } // namespace basebmp #endif /* INCLUDED_BASEBMP_STRIDEDARRAYITERATOR_HXX */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basebmp/inc/basebmp/tools.hxx b/basebmp/inc/basebmp/tools.hxx index d7ca0423ac1f..0b5fcb87a693 100644 --- a/basebmp/inc/basebmp/tools.hxx +++ b/basebmp/inc/basebmp/tools.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -89,3 +90,5 @@ namespace basebmp } #endif /* INCLUDED_BASEBMP_TOOLS_HXX */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basebmp/inc/basebmp/truecolormaskaccessor.hxx b/basebmp/inc/basebmp/truecolormaskaccessor.hxx index d4e3ff33f30e..79693a7b0ebb 100644 --- a/basebmp/inc/basebmp/truecolormaskaccessor.hxx +++ b/basebmp/inc/basebmp/truecolormaskaccessor.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -288,3 +289,5 @@ template< class Accessor, } // namespace basebmp #endif /* INCLUDED_BASEBMP_TRUECOLORMASKACCESSOR_HXX */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basebmp/source/bitmapdevice.cxx b/basebmp/source/bitmapdevice.cxx index 4e179c3a0ce0..118536dca663 100644 --- a/basebmp/source/bitmapdevice.cxx +++ b/basebmp/source/bitmapdevice.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -2062,3 +2063,5 @@ BitmapDeviceSharedPtr BitmapDevice::getGenericRenderer() const } } // namespace basebmp + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basebmp/source/debug.cxx b/basebmp/source/debug.cxx index 7781e43c19bc..4e7abb0d613b 100644 --- a/basebmp/source/debug.cxx +++ b/basebmp/source/debug.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -104,3 +105,5 @@ namespace basebmp } } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basebmp/source/intconversion.hxx b/basebmp/source/intconversion.hxx index 0fb7a0bf684a..d18a88cfe912 100644 --- a/basebmp/source/intconversion.hxx +++ b/basebmp/source/intconversion.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -86,3 +87,5 @@ namespace basebmp } #endif /* INCLUDED_BASEBMP_INTCONVERSION_HXX */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basebmp/source/polypolygonrenderer.cxx b/basebmp/source/polypolygonrenderer.cxx index 79453402ef4c..ea561533f2de 100644 --- a/basebmp/source/polypolygonrenderer.cxx +++ b/basebmp/source/polypolygonrenderer.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -125,3 +126,5 @@ namespace detail } // namespace detail } // namespace basebmp + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basebmp/test/basictest.cxx b/basebmp/test/basictest.cxx index a9c533a3a134..5b88c4a3bf40 100644 --- a/basebmp/test/basictest.cxx +++ b/basebmp/test/basictest.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -300,3 +301,5 @@ CPPUNIT_TEST_SUITE_REGISTRATION(BasicTest); } CPPUNIT_PLUGIN_IMPLEMENT(); + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basebmp/test/bmpdemo.cxx b/basebmp/test/bmpdemo.cxx index 99aa1bac2c5c..76d1ac6df17c 100644 --- a/basebmp/test/bmpdemo.cxx +++ b/basebmp/test/bmpdemo.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -1254,3 +1255,5 @@ void TestApp::Main() } TestApp aDemoApp; + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basebmp/test/bmpmasktest.cxx b/basebmp/test/bmpmasktest.cxx index 29e261423a06..0d4fa01b3301 100644 --- a/basebmp/test/bmpmasktest.cxx +++ b/basebmp/test/bmpmasktest.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -191,3 +192,4 @@ CPPUNIT_TEST_SUITE_REGISTRATION(BmpMaskTest); // to let the user the possibility to also register some functions by hand. //NOADDITIONAL; +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basebmp/test/bmptest.cxx b/basebmp/test/bmptest.cxx index 9d083980790b..f52a0567f271 100644 --- a/basebmp/test/bmptest.cxx +++ b/basebmp/test/bmptest.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -218,3 +219,4 @@ CPPUNIT_TEST_SUITE_REGISTRATION(BmpTest); // to let the user the possibility to also register some functions by hand. //NOADDITIONAL; +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basebmp/test/cliptest.cxx b/basebmp/test/cliptest.cxx index b0f0b72f07e0..31af87140682 100644 --- a/basebmp/test/cliptest.cxx +++ b/basebmp/test/cliptest.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -285,3 +286,4 @@ CPPUNIT_TEST_SUITE_REGISTRATION(ClipTest); // to let the user the possibility to also register some functions by hand. //NOADDITIONAL; +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basebmp/test/filltest.cxx b/basebmp/test/filltest.cxx index d03e887dbcc5..469b984b6ca6 100644 --- a/basebmp/test/filltest.cxx +++ b/basebmp/test/filltest.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -279,3 +280,4 @@ CPPUNIT_TEST_SUITE_REGISTRATION(FillTest); // to let the user the possibility to also register some functions by hand. //NOADDITIONAL; +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basebmp/test/linetest.cxx b/basebmp/test/linetest.cxx index dbdbe57de0a7..68633e8935d0 100644 --- a/basebmp/test/linetest.cxx +++ b/basebmp/test/linetest.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -227,3 +228,4 @@ CPPUNIT_TEST_SUITE_REGISTRATION(LineTest); // to let the user the possibility to also register some functions by hand. //NOADDITIONAL; +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basebmp/test/masktest.cxx b/basebmp/test/masktest.cxx index 63f357a314d0..b7097518f64a 100644 --- a/basebmp/test/masktest.cxx +++ b/basebmp/test/masktest.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -179,3 +180,4 @@ CPPUNIT_TEST_SUITE_REGISTRATION(MaskTest); // to let the user the possibility to also register some functions by hand. //NOADDITIONAL; +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basebmp/test/polytest.cxx b/basebmp/test/polytest.cxx index 2feef67774de..0f0faab77552 100644 --- a/basebmp/test/polytest.cxx +++ b/basebmp/test/polytest.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -299,3 +300,4 @@ CPPUNIT_TEST_SUITE_REGISTRATION(PolyTest); // to let the user the possibility to also register some functions by hand. //NOADDITIONAL; +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basebmp/test/tools.cxx b/basebmp/test/tools.cxx index dbc11395d715..ab7219ec32af 100644 --- a/basebmp/test/tools.cxx +++ b/basebmp/test/tools.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -47,3 +48,5 @@ int countPixel( const BitmapDeviceSharedPtr& rDevice, return count; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basebmp/test/tools.hxx b/basebmp/test/tools.hxx index 254a988fc1bb..57668e55a741 100644 --- a/basebmp/test/tools.hxx +++ b/basebmp/test/tools.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,3 +30,5 @@ int countPixel( const basebmp::BitmapDeviceSharedPtr& rDevice, basebmp::Color checkColor ); + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit From c300e27f5ca40ce87f91663d1c6fbf193727570a Mon Sep 17 00:00:00 2001 From: Povilas Kanapickas Date: Tue, 19 Oct 2010 01:57:34 +0200 Subject: Cleanse non-compiled code Removed if-deffed code from LibO libs, enabled if-deffed code again in test/playground files --- basebmp/source/bitmapdevice.cxx | 38 -------------------------------------- basebmp/test/bmpdemo.cxx | 11 +++++------ 2 files changed, 5 insertions(+), 44 deletions(-) (limited to 'basebmp') diff --git a/basebmp/source/bitmapdevice.cxx b/basebmp/source/bitmapdevice.cxx index 118536dca663..bf4cafd16cb2 100644 --- a/basebmp/source/bitmapdevice.cxx +++ b/basebmp/source/bitmapdevice.cxx @@ -1623,17 +1623,6 @@ struct StdMasks static const bool alphamask_polarity = true; }; -#if 0 -/** Clip and alpha masks for the generic renderer (of course, those - need to be generic, too) - */ -struct MaskTraitsGeneric -{ - typedef PixelFormatTraits_GenericInteger clipmask_format_traits; - typedef PixelFormatTraits_GenericInteger alphamask_format_traits; -}; -#endif - //---------------------------------------------------------------------------------- // Some compilers don't like the nested template wrap_accessor @@ -2032,33 +2021,6 @@ BitmapDeviceSharedPtr cloneBitmapDevice( const basegfx::B2IVector& rSize, /// Clone our device, with GenericImageAccessor to handle all formats BitmapDeviceSharedPtr BitmapDevice::getGenericRenderer() const { -#if 0 - // xxx TODO - typedef BitmapRenderer< PixelFormatTraits_GenericInteger::iterator_type, - PixelFormatTraits_GenericInteger::raw_accessor_type, - PixelFormatTraits_GenericInteger::accessor_selector, - MaskTraitsGeneric > - Renderer; - - if( !mpImpl->mpGenericRenderer ) - { - mpImpl->mpGenericRenderer.reset( - new Renderer( - mpImpl->maBounds, - isTopDown(), - getScanlineFormat(), - getScanlineStride(), - mpImpl->mpFirstScanline, - PixelFormatTraits_GenericInteger::iterator_type(), - GenericIntegerImageRawAccessor( - const_cast(this)->shared_from_this()), - GenericIntegerImageAccessor( - const_cast(this)->shared_from_this()), - getBuffer(), - getPalette() )); - } -#endif - return mpImpl->mpGenericRenderer; } diff --git a/basebmp/test/bmpdemo.cxx b/basebmp/test/bmpdemo.cxx index 76d1ac6df17c..043d165c14d6 100644 --- a/basebmp/test/bmpdemo.cxx +++ b/basebmp/test/bmpdemo.cxx @@ -58,6 +58,7 @@ #include #include #include +#include #include #include @@ -1090,7 +1091,6 @@ void TestWindow::Paint( const Rectangle& /*rRect*/ ) basebmp::DrawMode_PAINT ); } -#if 0 { basebmp::BitmapDeviceSharedPtr pMask( basebmp::createBitmapDevice( aTestSize, false, @@ -1135,7 +1135,6 @@ void TestWindow::Paint( const Rectangle& /*rRect*/ ) const basegfx::B2IPoint aPt3(0,1001); pDevice->drawLine( aPt1, aPt3, aCol, basebmp::DrawMode_PAINT ); } -#endif { pDevice->clear(basebmp::Color(0)); @@ -1172,12 +1171,12 @@ void TestWindow::Paint( const Rectangle& /*rRect*/ ) aPoly.append( basegfx::B2DPoint(project( aP1 ) + aCenter) ); aPoly.append( basegfx::B2DPoint(project( aP2 ) + aCenter) ); pDevice->fillPolyPolygon( - basegfx::tools::createAreaGeometryForPolygon( + basegfx::tools::createAreaGeometry( aPoly, // std::max(1,n/30), // std::max(1,n/60), std::max(1,n/30), - basegfx::tools::B2DLINEJOIN_NONE), + basegfx::B2DLINEJOIN_NONE), aLineColor, basebmp::DrawMode_PAINT); @@ -1245,13 +1244,13 @@ void TestApp::Main() uno::Sequence< uno::Any > aArgs( 2 ); aArgs[ 0 ] <<= rtl::OUString::createFromAscii( UCB_CONFIGURATION_KEY1_LOCAL ); aArgs[ 1 ] <<= rtl::OUString::createFromAscii( UCB_CONFIGURATION_KEY2_OFFICE ); - ::ucb::ContentBroker::initialize( xFactory, aArgs ); + ::ucbhelper::ContentBroker::initialize( xFactory, aArgs ); TestWindow pWindow; pWindow.Execute(); // clean up UCB - ::ucb::ContentBroker::deinitialize(); + ::ucbhelper::ContentBroker::deinitialize(); } TestApp aDemoApp; -- cgit From 10bfc7d833b174c83aa97a32e6cd738490c82b20 Mon Sep 17 00:00:00 2001 From: Kevin Hunter Date: Tue, 9 Nov 2010 10:55:03 +0000 Subject: EasyHack: RTL conversion from createFromAscii --- basebmp/test/bmpdemo.cxx | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'basebmp') diff --git a/basebmp/test/bmpdemo.cxx b/basebmp/test/bmpdemo.cxx index 043d165c14d6..160d69ecd532 100644 --- a/basebmp/test/bmpdemo.cxx +++ b/basebmp/test/bmpdemo.cxx @@ -975,7 +975,7 @@ class TestWindow : public Dialog public: TestWindow() : Dialog( (Window *) NULL ) { - SetText( rtl::OUString::createFromAscii( "VIGRA test" ) ); + SetText( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "VIGRA test" )) ); SetSizePixel( Size( 1024, 1024 ) ); EnablePaint( true ); Show(); @@ -1079,11 +1079,9 @@ void TestWindow::Paint( const Rectangle& /*rRect*/ ) basegfx::B2DPolyPolygon aPoly; basegfx::tools::importFromSvgD( aPoly, - ::rtl::OUString::createFromAscii( - "m0 0 h7 v7 h-7 z" ) ); + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "m0 0 h7 v7 h-7 z" )) ); basegfx::tools::importFromSvgD( aPoly, - ::rtl::OUString::createFromAscii( - "m2 2 h3 v3 h-3 z" ) ); + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "m2 2 h3 v3 h-3 z" )) ); pDevice->fillPolyPolygon( aPoly, @@ -1102,8 +1100,7 @@ void TestWindow::Paint( const Rectangle& /*rRect*/ ) pMask->drawLine( aPt111, aPt222, aCol333, basebmp::DrawMode_PAINT ); - ::rtl::OUString aSvg = ::rtl::OUString::createFromAscii( - "m 0 0 h5 l5 5 v5 h-5 l-5-5 z" ); + ::rtl::OUString aSvg( RTL_CONSTASCII_USTRINGPARAM( "m 0 0 h5 l5 5 v5 h-5 l-5-5 z" )); basegfx::B2DPolyPolygon aPoly; basegfx::tools::importFromSvgD( aPoly, aSvg ); pMask->clear(basebmp::Color(0xFFFFFFFF)); -- cgit From aadfc4e784fb448066cd44322000062d685dcde1 Mon Sep 17 00:00:00 2001 From: Kevin Hunter Date: Tue, 9 Nov 2010 14:58:54 -0500 Subject: EasyHack: RTL conversion from createFromAscii --- basebmp/test/bmpmasktest.cxx | 3 +-- basebmp/test/bmptest.cxx | 3 +-- basebmp/test/cliptest.cxx | 6 ++---- basebmp/test/filltest.cxx | 3 +-- basebmp/test/masktest.cxx | 3 +-- 5 files changed, 6 insertions(+), 12 deletions(-) (limited to 'basebmp') diff --git a/basebmp/test/bmpmasktest.cxx b/basebmp/test/bmpmasktest.cxx index 0d4fa01b3301..18db80442707 100644 --- a/basebmp/test/bmpmasktest.cxx +++ b/basebmp/test/bmpmasktest.cxx @@ -131,8 +131,7 @@ public: true, Format::THIRTYTWO_BIT_TC_MASK ); - ::rtl::OUString aSvg = ::rtl::OUString::createFromAscii( - "m 0 0h5v10h5v-5h-10z" ); + ::rtl::OUString aSvg( RTL_CONSTASCII_USTRINGPARAM( "m 0 0h5v10h5v-5h-10z" )); basegfx::B2DPolyPolygon aPoly; basegfx::tools::importFromSvgD( aPoly, aSvg ); diff --git a/basebmp/test/bmptest.cxx b/basebmp/test/bmptest.cxx index f52a0567f271..e6119a10c0eb 100644 --- a/basebmp/test/bmptest.cxx +++ b/basebmp/test/bmptest.cxx @@ -170,8 +170,7 @@ public: true, Format::THIRTYTWO_BIT_TC_MASK ); - ::rtl::OUString aSvg = ::rtl::OUString::createFromAscii( - "m 0 0h5v10h5v-5h-10z" ); + ::rtl::OUString aSvg( RTL_CONSTASCII_USTRINGPARAM( "m 0 0h5v10h5v-5h-10z" )); basegfx::B2DPolyPolygon aPoly; basegfx::tools::importFromSvgD( aPoly, aSvg ); diff --git a/basebmp/test/cliptest.cxx b/basebmp/test/cliptest.cxx index 31af87140682..ff9d2d435ebf 100644 --- a/basebmp/test/cliptest.cxx +++ b/basebmp/test/cliptest.cxx @@ -180,8 +180,7 @@ private: true, Format::EIGHT_BIT_GREY )); - ::rtl::OUString aSvg = ::rtl::OUString::createFromAscii( - "m 0 0h5v10h5v-5h-10z" ); + ::rtl::OUString aSvg( RTL_CONSTASCII_USTRINGPARAM( "m 0 0h5v10h5v-5h-10z" )); basegfx::B2DPolyPolygon aPoly; basegfx::tools::importFromSvgD( aPoly, aSvg ); @@ -221,8 +220,7 @@ public: true, Format::THIRTYTWO_BIT_TC_MASK ); - ::rtl::OUString aSvg = ::rtl::OUString::createFromAscii( - "m 0 0 h5 l5 5 v5 h-5 l-5-5 z" ); + ::rtl::OUString aSvg( RTL_CONSTASCII_USTRINGPARAM( "m 0 0 h5 l5 5 v5 h-5 l-5-5 z" )); basegfx::B2DPolyPolygon aPoly; basegfx::tools::importFromSvgD( aPoly, aSvg ); mpClipMask->clear(Color(0)); diff --git a/basebmp/test/filltest.cxx b/basebmp/test/filltest.cxx index 469b984b6ca6..bf7bbe808049 100644 --- a/basebmp/test/filltest.cxx +++ b/basebmp/test/filltest.cxx @@ -168,8 +168,7 @@ private: CPPUNIT_ASSERT_MESSAGE("bottom-middle pixel set", rDevice->getPixel(aPt4) == aCol); - ::rtl::OUString aSvg = ::rtl::OUString::createFromAscii( - "m 0 0l7 7h-1z" ); + ::rtl::OUString aSvg( RTL_CONSTASCII_USTRINGPARAM( "m 0 0l7 7h-1z" )); basegfx::B2DPolyPolygon aPoly; basegfx::tools::importFromSvgD( aPoly, aSvg ); diff --git a/basebmp/test/masktest.cxx b/basebmp/test/masktest.cxx index b7097518f64a..74b393ebad36 100644 --- a/basebmp/test/masktest.cxx +++ b/basebmp/test/masktest.cxx @@ -137,8 +137,7 @@ public: true, Format::EIGHT_BIT_GREY ); - ::rtl::OUString aSvg = ::rtl::OUString::createFromAscii( - "m 0 0h5v10h5v-5h-10z" ); + ::rtl::OUString aSvg( RTL_CONSTASCII_USTRINGPARAM( "m 0 0h5v10h5v-5h-10z" )); basegfx::B2DPolyPolygon aPoly; basegfx::tools::importFromSvgD( aPoly, aSvg ); -- cgit From 5cc959c4241982f47ca155f0070fdd15a65b6b53 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Wed, 10 Nov 2010 08:23:49 +0100 Subject: remove commented-out leftovers from testshl2 --- basebmp/test/bmpmasktest.cxx | 7 ------- basebmp/test/bmptest.cxx | 7 ------- basebmp/test/cliptest.cxx | 7 ------- basebmp/test/filltest.cxx | 7 ------- basebmp/test/linetest.cxx | 7 ------- basebmp/test/masktest.cxx | 7 ------- basebmp/test/polytest.cxx | 7 ------- 7 files changed, 49 deletions(-) (limited to 'basebmp') diff --git a/basebmp/test/bmpmasktest.cxx b/basebmp/test/bmpmasktest.cxx index 18db80442707..6c6b0661db3a 100644 --- a/basebmp/test/bmpmasktest.cxx +++ b/basebmp/test/bmpmasktest.cxx @@ -184,11 +184,4 @@ public: CPPUNIT_TEST_SUITE_REGISTRATION(BmpMaskTest); } - -// ----------------------------------------------------------------------------- - -// this macro creates an empty function, which will called by the RegisterAllFunctions() -// to let the user the possibility to also register some functions by hand. -//NOADDITIONAL; - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basebmp/test/bmptest.cxx b/basebmp/test/bmptest.cxx index e6119a10c0eb..65b9d82ec22a 100644 --- a/basebmp/test/bmptest.cxx +++ b/basebmp/test/bmptest.cxx @@ -211,11 +211,4 @@ public: CPPUNIT_TEST_SUITE_REGISTRATION(BmpTest); } - -// ----------------------------------------------------------------------------- - -// this macro creates an empty function, which will called by the RegisterAllFunctions() -// to let the user the possibility to also register some functions by hand. -//NOADDITIONAL; - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basebmp/test/cliptest.cxx b/basebmp/test/cliptest.cxx index ff9d2d435ebf..aae5ff12ed8f 100644 --- a/basebmp/test/cliptest.cxx +++ b/basebmp/test/cliptest.cxx @@ -277,11 +277,4 @@ public: CPPUNIT_TEST_SUITE_REGISTRATION(ClipTest); } - -// ----------------------------------------------------------------------------- - -// this macro creates an empty function, which will called by the RegisterAllFunctions() -// to let the user the possibility to also register some functions by hand. -//NOADDITIONAL; - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basebmp/test/filltest.cxx b/basebmp/test/filltest.cxx index bf7bbe808049..a5634c9bb695 100644 --- a/basebmp/test/filltest.cxx +++ b/basebmp/test/filltest.cxx @@ -272,11 +272,4 @@ public: CPPUNIT_TEST_SUITE_REGISTRATION(FillTest); } - -// ----------------------------------------------------------------------------- - -// this macro creates an empty function, which will called by the RegisterAllFunctions() -// to let the user the possibility to also register some functions by hand. -//NOADDITIONAL; - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basebmp/test/linetest.cxx b/basebmp/test/linetest.cxx index 68633e8935d0..652892aa2755 100644 --- a/basebmp/test/linetest.cxx +++ b/basebmp/test/linetest.cxx @@ -221,11 +221,4 @@ public: CPPUNIT_TEST_SUITE_REGISTRATION(LineTest); } - -// ----------------------------------------------------------------------------- - -// this macro creates an empty function, which will called by the RegisterAllFunctions() -// to let the user the possibility to also register some functions by hand. -//NOADDITIONAL; - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basebmp/test/masktest.cxx b/basebmp/test/masktest.cxx index 74b393ebad36..7a1b697a8eca 100644 --- a/basebmp/test/masktest.cxx +++ b/basebmp/test/masktest.cxx @@ -172,11 +172,4 @@ public: CPPUNIT_TEST_SUITE_REGISTRATION(MaskTest); } - -// ----------------------------------------------------------------------------- - -// this macro creates an empty function, which will called by the RegisterAllFunctions() -// to let the user the possibility to also register some functions by hand. -//NOADDITIONAL; - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basebmp/test/polytest.cxx b/basebmp/test/polytest.cxx index 0f0faab77552..fa4534988ba9 100644 --- a/basebmp/test/polytest.cxx +++ b/basebmp/test/polytest.cxx @@ -293,11 +293,4 @@ public: CPPUNIT_TEST_SUITE_REGISTRATION(PolyTest); } - -// ----------------------------------------------------------------------------- - -// this macro creates an empty function, which will called by the RegisterAllFunctions() -// to let the user the possibility to also register some functions by hand. -//NOADDITIONAL; - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit From 5455fee0cc7921f2f8706ac73bca533cc2895954 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Wed, 10 Nov 2010 08:55:47 +0100 Subject: remove unused includes --- basebmp/test/basictest.cxx | 10 ---------- basebmp/test/bmpdemo.cxx | 2 -- basebmp/test/bmpmasktest.cxx | 12 ------------ basebmp/test/bmptest.cxx | 12 ------------ basebmp/test/cliptest.cxx | 10 ---------- basebmp/test/filltest.cxx | 10 ---------- basebmp/test/linetest.cxx | 10 ---------- basebmp/test/masktest.cxx | 12 ------------ basebmp/test/polytest.cxx | 10 ---------- 9 files changed, 88 deletions(-) (limited to 'basebmp') diff --git a/basebmp/test/basictest.cxx b/basebmp/test/basictest.cxx index 5b88c4a3bf40..70218b085059 100644 --- a/basebmp/test/basictest.cxx +++ b/basebmp/test/basictest.cxx @@ -41,21 +41,12 @@ #include #include #include -#include #include "tools.hxx" -#include -#include - using namespace ::basebmp; namespace { -/* - std::ofstream output("32bpp_test.dump"); - debugDump( mpDevice32bpp, output ); -*/ - class BasicTest : public CppUnit::TestFixture { public: @@ -296,7 +287,6 @@ public: CPPUNIT_TEST_SUITE_END(); }; -// ----------------------------------------------------------------------------- CPPUNIT_TEST_SUITE_REGISTRATION(BasicTest); } diff --git a/basebmp/test/bmpdemo.cxx b/basebmp/test/bmpdemo.cxx index 160d69ecd532..74cda664ee34 100644 --- a/basebmp/test/bmpdemo.cxx +++ b/basebmp/test/bmpdemo.cxx @@ -74,8 +74,6 @@ #include #include -#include -#include using namespace ::com::sun::star; diff --git a/basebmp/test/bmpmasktest.cxx b/basebmp/test/bmpmasktest.cxx index 6c6b0661db3a..45bbceea767d 100644 --- a/basebmp/test/bmpmasktest.cxx +++ b/basebmp/test/bmpmasktest.cxx @@ -45,23 +45,12 @@ #include #include #include -#include #include "tools.hxx" -#include -#include - using namespace ::basebmp; namespace { -/* - std::ofstream output("32bpp_test.dump"); - debugDump( rDevice, output ); - std::ofstream output2("32bpp_bmp.dump"); - debugDump( rBmp, output2 ); -*/ - class BmpMaskTest : public CppUnit::TestFixture { private: @@ -180,7 +169,6 @@ public: CPPUNIT_TEST_SUITE_END(); }; -// ----------------------------------------------------------------------------- CPPUNIT_TEST_SUITE_REGISTRATION(BmpMaskTest); } diff --git a/basebmp/test/bmptest.cxx b/basebmp/test/bmptest.cxx index 65b9d82ec22a..5732e4527562 100644 --- a/basebmp/test/bmptest.cxx +++ b/basebmp/test/bmptest.cxx @@ -45,23 +45,12 @@ #include #include #include -#include #include "tools.hxx" -#include -#include - using namespace ::basebmp; namespace { -/* - std::ofstream output("32bpp_test.dump"); - debugDump( rDevice, output ); - std::ofstream output2("32bpp_bmp.dump"); - debugDump( rBmp, output2 ); -*/ - class BmpTest : public CppUnit::TestFixture { private: @@ -207,7 +196,6 @@ public: CPPUNIT_TEST_SUITE_END(); }; -// ----------------------------------------------------------------------------- CPPUNIT_TEST_SUITE_REGISTRATION(BmpTest); } diff --git a/basebmp/test/cliptest.cxx b/basebmp/test/cliptest.cxx index aae5ff12ed8f..3071cde74d57 100644 --- a/basebmp/test/cliptest.cxx +++ b/basebmp/test/cliptest.cxx @@ -46,21 +46,12 @@ #include #include #include -#include #include "tools.hxx" -#include -#include - using namespace ::basebmp; namespace { -/* - std::ofstream output("32bpp_test.dump"); - debugDump( mpDevice32bpp, output ); -*/ - class ClipTest : public CppUnit::TestFixture { private: @@ -273,7 +264,6 @@ public: CPPUNIT_TEST_SUITE_END(); }; -// ----------------------------------------------------------------------------- CPPUNIT_TEST_SUITE_REGISTRATION(ClipTest); } diff --git a/basebmp/test/filltest.cxx b/basebmp/test/filltest.cxx index a5634c9bb695..f36d95e6be72 100644 --- a/basebmp/test/filltest.cxx +++ b/basebmp/test/filltest.cxx @@ -45,21 +45,12 @@ #include #include #include -#include #include "tools.hxx" -#include -#include - using namespace ::basebmp; namespace { -/* - std::ofstream output("32bpp_test.dump"); - debugDump( mpDevice32bpp, output ); -*/ - class FillTest : public CppUnit::TestFixture { private: @@ -268,7 +259,6 @@ public: CPPUNIT_TEST_SUITE_END(); }; -// ----------------------------------------------------------------------------- CPPUNIT_TEST_SUITE_REGISTRATION(FillTest); } diff --git a/basebmp/test/linetest.cxx b/basebmp/test/linetest.cxx index 652892aa2755..f7894357c6cf 100644 --- a/basebmp/test/linetest.cxx +++ b/basebmp/test/linetest.cxx @@ -40,21 +40,12 @@ #include #include #include -#include #include "tools.hxx" -#include -#include - using namespace ::basebmp; namespace { -/* - std::ofstream output("32bpp_test.dump"); - debugDump( mpDevice32bpp, output ); -*/ - class LineTest : public CppUnit::TestFixture { private: @@ -217,7 +208,6 @@ public: CPPUNIT_TEST_SUITE_END(); }; -// ----------------------------------------------------------------------------- CPPUNIT_TEST_SUITE_REGISTRATION(LineTest); } diff --git a/basebmp/test/masktest.cxx b/basebmp/test/masktest.cxx index 7a1b697a8eca..e39f118753ba 100644 --- a/basebmp/test/masktest.cxx +++ b/basebmp/test/masktest.cxx @@ -45,23 +45,12 @@ #include #include #include -#include #include "tools.hxx" -#include -#include - using namespace ::basebmp; namespace { -/* - std::ofstream output("32bpp_test.dump"); - debugDump( rDevice, output ); - std::ofstream output2("32bpp_bmp.dump"); - debugDump( rBmp, output2 ); -*/ - class MaskTest : public CppUnit::TestFixture { private: @@ -168,7 +157,6 @@ public: CPPUNIT_TEST_SUITE_END(); }; -// ----------------------------------------------------------------------------- CPPUNIT_TEST_SUITE_REGISTRATION(MaskTest); } diff --git a/basebmp/test/polytest.cxx b/basebmp/test/polytest.cxx index fa4534988ba9..0f22f4c498b5 100644 --- a/basebmp/test/polytest.cxx +++ b/basebmp/test/polytest.cxx @@ -46,21 +46,12 @@ #include #include #include -#include #include "tools.hxx" -#include -#include - using namespace ::basebmp; namespace { -/* - std::ofstream output("32bpp_test.dump"); - debugDump( rDevice, output ); -*/ - class PolyTest : public CppUnit::TestFixture { private: @@ -289,7 +280,6 @@ public: CPPUNIT_TEST_SUITE_END(); }; -// ----------------------------------------------------------------------------- CPPUNIT_TEST_SUITE_REGISTRATION(PolyTest); } -- cgit From 43bc8a784e706149fc7736fd8b4c440c464c49c4 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Tue, 23 Nov 2010 15:47:07 +0000 Subject: make possible to build with c++0x --- basebmp/source/intconversion.hxx | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'basebmp') diff --git a/basebmp/source/intconversion.hxx b/basebmp/source/intconversion.hxx index d18a88cfe912..407948e80c28 100644 --- a/basebmp/source/intconversion.hxx +++ b/basebmp/source/intconversion.hxx @@ -57,11 +57,18 @@ namespace basebmp } }; + //Current c++0x draft (apparently) has std::identity, but not operator() + template struct SGI_identity : public std::unary_function + { + T& operator()(T& x) const { return x; } + const T& operator()(const T& x) const { return x; } + }; + /// Get converter from given data type to sal_uInt32 template< typename DataType > struct uInt32Converter { - typedef std::identity to; - typedef std::identity from; + typedef SGI_identity to; + typedef SGI_identity from; }; template< unsigned int RedIndex, unsigned int GreenIndex, -- cgit From 36ba6d664a6cc219d84d22dc74a562603d7fcdc5 Mon Sep 17 00:00:00 2001 From: Gert Faller Date: Tue, 23 Nov 2010 18:43:37 +0100 Subject: RTL_CONSTASCII_USTRINGPARAM in libs-gui 11 --- basebmp/test/bmpdemo.cxx | 4 ++-- basebmp/test/bmpmasktest.cxx | 4 ++-- basebmp/test/polytest.cxx | 32 ++++++++++++++++---------------- 3 files changed, 20 insertions(+), 20 deletions(-) (limited to 'basebmp') diff --git a/basebmp/test/bmpdemo.cxx b/basebmp/test/bmpdemo.cxx index 74cda664ee34..ab260655d968 100644 --- a/basebmp/test/bmpdemo.cxx +++ b/basebmp/test/bmpdemo.cxx @@ -1237,8 +1237,8 @@ void TestApp::Main() // Create UCB. uno::Sequence< uno::Any > aArgs( 2 ); - aArgs[ 0 ] <<= rtl::OUString::createFromAscii( UCB_CONFIGURATION_KEY1_LOCAL ); - aArgs[ 1 ] <<= rtl::OUString::createFromAscii( UCB_CONFIGURATION_KEY2_OFFICE ); + aArgs[ 0 ] <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UCB_CONFIGURATION_KEY1_LOCAL )); + aArgs[ 1 ] <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UCB_CONFIGURATION_KEY2_OFFICE )); ::ucbhelper::ContentBroker::initialize( xFactory, aArgs ); TestWindow pWindow; diff --git a/basebmp/test/bmpmasktest.cxx b/basebmp/test/bmpmasktest.cxx index 45bbceea767d..79e9b8fd3909 100644 --- a/basebmp/test/bmpmasktest.cxx +++ b/basebmp/test/bmpmasktest.cxx @@ -135,8 +135,8 @@ public: aColWhite, DrawMode_PAINT ); - aSvg = ::rtl::OUString::createFromAscii( - "m 0 0 h6 v10 h-6z" ); + aSvg = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "m 0 0 h6 v10 h-6z" )); aPoly.clear(); basegfx::tools::importFromSvgD( aPoly, aSvg ); diff --git a/basebmp/test/polytest.cxx b/basebmp/test/polytest.cxx index 0f22f4c498b5..4fe18ee1101a 100644 --- a/basebmp/test/polytest.cxx +++ b/basebmp/test/polytest.cxx @@ -68,8 +68,8 @@ private: basegfx::tools::importFromSvgD( aPoly, - rtl::OUString::createFromAscii( - "M2 2 l7 7 z" ) ); + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "M2 2 l7 7 z" )) ); rDevice->fillPolyPolygon( aPoly, aCol, @@ -83,8 +83,8 @@ private: aPoly.clear(); basegfx::tools::importFromSvgD( aPoly, - rtl::OUString::createFromAscii( - "M7 2 l-6 6 z" ) ); + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "M7 2 l-6 6 z" )) ); rDevice->fillPolyPolygon( aPoly, aCol, @@ -103,8 +103,8 @@ private: basegfx::tools::importFromSvgD( aPoly, - rtl::OUString::createFromAscii( - "M2 2 h1 l7 7 h-1 z" ) ); + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "M2 2 h1 l7 7 h-1 z" )) ); rDevice->fillPolyPolygon( aPoly, aCol, @@ -118,8 +118,8 @@ private: aPoly.clear(); basegfx::tools::importFromSvgD( aPoly, - rtl::OUString::createFromAscii( - "M7 2 h-1 l-6 6 h1 z" ) ); + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "M7 2 h-1 l-6 6 h1 z" )) ); rDevice->fillPolyPolygon( aPoly, aCol, @@ -133,8 +133,8 @@ private: aPoly.clear(); basegfx::tools::importFromSvgD( aPoly, - rtl::OUString::createFromAscii( - "M0 0 l7 7 h-1 l-5-7 z" ) ); + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "M0 0 l7 7 h-1 l-5-7 z" )) ); rDevice->fillPolyPolygon( aPoly, aCol, @@ -152,8 +152,8 @@ private: ::rtl::OUString aSvg; basegfx::tools::importFromSvgD( aPoly, - ::rtl::OUString::createFromAscii( - "M0 0 h7 v7 h-7 z M2 2 v3 h3 v-3 z" ) ); + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "M0 0 h7 v7 h-7 z M2 2 v3 h3 v-3 z" )) ); rDevice->fillPolyPolygon( aPoly, @@ -172,8 +172,8 @@ private: ::rtl::OUString aSvg; basegfx::tools::importFromSvgD( aPoly, - ::rtl::OUString::createFromAscii( - "M0 0 h7 v7 h-7 z M2 2 v3 h3 v-3 z" ) ); + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "M0 0 h7 v7 h-7 z M2 2 v3 h3 v-3 z" )) ); basegfx::B2DHomMatrix aMat; aMat.translate(-3,-3); aMat.rotate( 1.7 ); @@ -210,12 +210,12 @@ private: ::rtl::OUString aSvg; basegfx::tools::importFromSvgD( aPoly, - ::rtl::OUString::createFromAscii( + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "M0 0 v2 l10 2 v-2 z" "M10 6 v-2 l-10 2 v2 z" "M1 0 h1 v10 h-1 z" "M4 0 h1 v10 h-1 z" - "M8 0 h1 v10 h-1 z" ) ); + "M8 0 h1 v10 h-1 z" )) ); rDevice->fillPolyPolygon( aPoly, aCol, -- cgit From 931d9ef98d5bc94d975094bbe9bb4c4c923b4c64 Mon Sep 17 00:00:00 2001 From: Thomas Arnhold Date: Wed, 2 Feb 2011 11:51:34 +0100 Subject: Clean up makefiles --- basebmp/test/makefile.mk | 19 ------------------- 1 file changed, 19 deletions(-) (limited to 'basebmp') diff --git a/basebmp/test/makefile.mk b/basebmp/test/makefile.mk index 8dc95dcea0e5..4fdc39bb6fd4 100644 --- a/basebmp/test/makefile.mk +++ b/basebmp/test/makefile.mk @@ -99,25 +99,6 @@ SHL1RPATH = NONE .ENDIF # END ------------------------------------------------------------------ -#APP2TARGET= bmpdemo - -#APP2OBJS= \ -# $(OBJ)$/bmpdemo.obj - -#APP2STDLIBS=$(TOOLSLIB) \ -# $(COMPHELPERLIB) \ -# $(BASEGFXLIB) \ -# $(BASEBMPLIB) \ -# $(CPPULIB) \ -# $(CPPUHELPERLIB) \ -# $(UCBHELPERLIB) \ -# $(SALLIB) \ -# $(VCLLIB) -# -#.IF "$(GUI)"!="UNX" -#APP2DEF= $(MISC)$/$(TARGET).def -#.ENDIF - #------------------------------- All object files ------------------------------- # do this here, so we get right dependencies SLOFILES=$(SHL1OBJS) -- cgit From 294c191f6f80e2c7e1e6ed17683c23c3d3b7e9e3 Mon Sep 17 00:00:00 2001 From: Thorsten Behrens Date: Tue, 8 Feb 2011 11:28:22 +0100 Subject: Remove last remaining SGI-ism from basebmp Get rid of std::project2nd, which is an SGI extension to STL. Permits build against compiler-provided stl, no need for stlport anymore. --- basebmp/inc/basebmp/accessortraits.hxx | 2 +- basebmp/inc/basebmp/metafunctions.hxx | 10 ++++++++++ basebmp/inc/basebmp/paletteformats.hxx | 2 -- 3 files changed, 11 insertions(+), 3 deletions(-) (limited to 'basebmp') diff --git a/basebmp/inc/basebmp/accessortraits.hxx b/basebmp/inc/basebmp/accessortraits.hxx index e54da3f3b5ea..30bdcd59c4ee 100644 --- a/basebmp/inc/basebmp/accessortraits.hxx +++ b/basebmp/inc/basebmp/accessortraits.hxx @@ -91,7 +91,7 @@ template< class Accessor > struct AccessorTraits typedef typename Accessor::value_type value_type; /// Retrieve stand-alone color lookup function for given Accessor type - typedef std::project2nd< Accessor, value_type > color_lookup; + typedef project2nd< Accessor, value_type > color_lookup; /// Retrieve raw pixel data accessor for given Accessor type typedef Accessor raw_accessor; diff --git a/basebmp/inc/basebmp/metafunctions.hxx b/basebmp/inc/basebmp/metafunctions.hxx index 642a98a70680..5f9f8a7ebf31 100644 --- a/basebmp/inc/basebmp/metafunctions.hxx +++ b/basebmp/inc/basebmp/metafunctions.hxx @@ -33,6 +33,8 @@ #include #include +#include + namespace basebmp { @@ -217,6 +219,14 @@ template< typename T > inline T shiftRight( T v, int shift ) return shift > 0 ? v >> shift : v << (-shift); } +//-------------------------------------------------------------- + +/// Replace non-std project2nd from SGI extensions +template< typename T1, typename T2 > +struct project2nd : public std::binary_function +{ + T2 operator() (const T1&, const T2& v) const { return v; } +}; } // namespace basebmp diff --git a/basebmp/inc/basebmp/paletteformats.hxx b/basebmp/inc/basebmp/paletteformats.hxx index f138549462fe..1cdfe30181d1 100644 --- a/basebmp/inc/basebmp/paletteformats.hxx +++ b/basebmp/inc/basebmp/paletteformats.hxx @@ -41,8 +41,6 @@ #include #include -#include - namespace basebmp { -- cgit From e5e3ba75ecf716ad6760d8b74d095729306e1219 Mon Sep 17 00:00:00 2001 From: Fridrich Štrba Date: Wed, 9 Feb 2011 10:51:01 +0100 Subject: Removing the ext_std masterpiece --- basebmp/test/basictest.cxx | 2 -- basebmp/test/bmpmasktest.cxx | 2 -- basebmp/test/bmptest.cxx | 2 -- basebmp/test/cliptest.cxx | 2 -- basebmp/test/filltest.cxx | 2 -- basebmp/test/linetest.cxx | 2 -- basebmp/test/masktest.cxx | 2 -- basebmp/test/polytest.cxx | 2 -- 8 files changed, 16 deletions(-) (limited to 'basebmp') diff --git a/basebmp/test/basictest.cxx b/basebmp/test/basictest.cxx index 70218b085059..d953095585fa 100644 --- a/basebmp/test/basictest.cxx +++ b/basebmp/test/basictest.cxx @@ -28,12 +28,10 @@ // autogenerated file with codegen.pl -#include "preextstl.h" #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" #include "cppunit/plugin/TestPlugIn.h" -#include "postextstl.h" #include #include diff --git a/basebmp/test/bmpmasktest.cxx b/basebmp/test/bmpmasktest.cxx index 79e9b8fd3909..5ba477484903 100644 --- a/basebmp/test/bmpmasktest.cxx +++ b/basebmp/test/bmpmasktest.cxx @@ -28,11 +28,9 @@ // autogenerated file with codegen.pl -#include "preextstl.h" #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" -#include "postextstl.h" #include #include diff --git a/basebmp/test/bmptest.cxx b/basebmp/test/bmptest.cxx index 5732e4527562..7b3a2cbcb18f 100644 --- a/basebmp/test/bmptest.cxx +++ b/basebmp/test/bmptest.cxx @@ -28,11 +28,9 @@ // autogenerated file with codegen.pl -#include "preextstl.h" #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" -#include "postextstl.h" #include #include diff --git a/basebmp/test/cliptest.cxx b/basebmp/test/cliptest.cxx index 3071cde74d57..c41edf3e28a8 100644 --- a/basebmp/test/cliptest.cxx +++ b/basebmp/test/cliptest.cxx @@ -28,11 +28,9 @@ // autogenerated file with codegen.pl -#include "preextstl.h" #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" -#include "postextstl.h" #include #include diff --git a/basebmp/test/filltest.cxx b/basebmp/test/filltest.cxx index f36d95e6be72..d15fa1010050 100644 --- a/basebmp/test/filltest.cxx +++ b/basebmp/test/filltest.cxx @@ -28,11 +28,9 @@ // autogenerated file with codegen.pl -#include "preextstl.h" #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" -#include "postextstl.h" #include #include diff --git a/basebmp/test/linetest.cxx b/basebmp/test/linetest.cxx index f7894357c6cf..cee66f4d709b 100644 --- a/basebmp/test/linetest.cxx +++ b/basebmp/test/linetest.cxx @@ -28,11 +28,9 @@ // autogenerated file with codegen.pl -#include "preextstl.h" #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" -#include "postextstl.h" #include #include diff --git a/basebmp/test/masktest.cxx b/basebmp/test/masktest.cxx index e39f118753ba..239a069bf564 100644 --- a/basebmp/test/masktest.cxx +++ b/basebmp/test/masktest.cxx @@ -28,11 +28,9 @@ // autogenerated file with codegen.pl -#include "preextstl.h" #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" -#include "postextstl.h" #include #include diff --git a/basebmp/test/polytest.cxx b/basebmp/test/polytest.cxx index 4fe18ee1101a..99aba1a06fc4 100644 --- a/basebmp/test/polytest.cxx +++ b/basebmp/test/polytest.cxx @@ -28,11 +28,9 @@ // autogenerated file with codegen.pl -#include "preextstl.h" #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" -#include "postextstl.h" #include #include -- cgit From e30c7d6b9938e129c4e0d7577f3132fc01b9e581 Mon Sep 17 00:00:00 2001 From: Fridrich Štrba Date: Wed, 9 Feb 2011 16:20:22 +0100 Subject: Trying to remove the stlport mention from the code --- basebmp/test/makefile.mk | 7 ------- 1 file changed, 7 deletions(-) (limited to 'basebmp') diff --git a/basebmp/test/makefile.mk b/basebmp/test/makefile.mk index 4fdc39bb6fd4..cdb4ccef5d52 100644 --- a/basebmp/test/makefile.mk +++ b/basebmp/test/makefile.mk @@ -60,13 +60,6 @@ CDEFS+=-xalias_level=compatible .ENDIF .ENDIF -#building with stlport, but cppunit was not built with stlport -.IF "$(USE_SYSTEM_STL)"!="YES" -.IF "$(SYSTEM_CPPUNIT)"=="YES" -CFLAGSCXX+=-DADAPT_EXT_STL -.ENDIF -.ENDIF - CFLAGSCXX += $(CPPUNIT_CFLAGS) # --- Common ---------------------------------------------------------- -- cgit From 7de8f26207d44a34f71cf8297ae68831c92c118e Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Tue, 5 Apr 2011 11:54:35 +0100 Subject: remove ADAPT_EXT_STL --- basebmp/test/makefile.mk | 7 ------- 1 file changed, 7 deletions(-) (limited to 'basebmp') diff --git a/basebmp/test/makefile.mk b/basebmp/test/makefile.mk index 4fdc39bb6fd4..cdb4ccef5d52 100644 --- a/basebmp/test/makefile.mk +++ b/basebmp/test/makefile.mk @@ -60,13 +60,6 @@ CDEFS+=-xalias_level=compatible .ENDIF .ENDIF -#building with stlport, but cppunit was not built with stlport -.IF "$(USE_SYSTEM_STL)"!="YES" -.IF "$(SYSTEM_CPPUNIT)"=="YES" -CFLAGSCXX+=-DADAPT_EXT_STL -.ENDIF -.ENDIF - CFLAGSCXX += $(CPPUNIT_CFLAGS) # --- Common ---------------------------------------------------------- -- cgit From 87fbe86b7140a77cc6e38f063b08af9213078ca3 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Tue, 17 May 2011 10:03:46 +0200 Subject: generalize ScopedBitmapAccess and simplify usage It can be used for AlphaMask too now. --- basebmp/test/bmpdemo.cxx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'basebmp') diff --git a/basebmp/test/bmpdemo.cxx b/basebmp/test/bmpdemo.cxx index ab260655d968..effce214bb2f 100644 --- a/basebmp/test/bmpdemo.cxx +++ b/basebmp/test/bmpdemo.cxx @@ -1189,8 +1189,7 @@ void TestWindow::Paint( const Rectangle& /*rRect*/ ) // Fill bitmap with generated content { - ScopedBitmapWriteAccess pWriteAccess( aBitmap.AcquireWriteAccess(), - aBitmap ); + Bitmap::ScopedWriteAccess pWriteAccess( aBitmap ); for( int y=0; ySetPixel(y,x, -- cgit From 4fa3eefdb356be5492af028b7127400c859b674a Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Fri, 3 Jun 2011 13:27:47 +0300 Subject: Drop %_EXT% which was always empty --- basebmp/prj/d.lst | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'basebmp') diff --git a/basebmp/prj/d.lst b/basebmp/prj/d.lst index e94118c72b9d..2dd75fa5b1c5 100644 --- a/basebmp/prj/d.lst +++ b/basebmp/prj/d.lst @@ -1,9 +1,9 @@ -..\%__SRC%\lib\ibasebmp.lib %_DEST%\lib%_EXT%\ibasebmp.lib +..\%__SRC%\lib\ibasebmp.lib %_DEST%\lib\ibasebmp.lib -..\%__SRC%\bin\basebmp?????.dll %_DEST%\bin%_EXT%\basebmp?????.dll +..\%__SRC%\bin\basebmp?????.dll %_DEST%\bin\basebmp?????.dll -..\%__SRC%\lib\libbasebmp*.* %_DEST%\lib%_EXT%\libbasebmp*.* -..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a +..\%__SRC%\lib\libbasebmp*.* %_DEST%\lib\libbasebmp*.* +..\%__SRC%\lib\*.a %_DEST%\lib\*.a -mkdir: %_DEST%\inc%_EXT%\basebmp -..\inc\basebmp\*.hxx %_DEST%\inc%_EXT%\basebmp\*.hxx +mkdir: %_DEST%\inc\basebmp +..\inc\basebmp\*.hxx %_DEST%\inc\basebmp\*.hxx -- cgit From 1a632cd63faa5b688499ae3be3cc3282dd7ce262 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Tue, 7 Jun 2011 00:45:42 +0300 Subject: No testing, sorry, when cross-compiling --- basebmp/test/makefile.mk | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'basebmp') diff --git a/basebmp/test/makefile.mk b/basebmp/test/makefile.mk index cdb4ccef5d52..6941ed963b75 100644 --- a/basebmp/test/makefile.mk +++ b/basebmp/test/makefile.mk @@ -37,6 +37,11 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk +.IF "$(CROSS_COMPILING)"=="YES" +all: + @echo Nothing done when cross-compiling +.ENDIF + .IF "$(debug)"!="" || "$(DEBUG)"!="" .IF "$(COM)"=="MSC" -- cgit