[Libreoffice-commits] core.git: basebmp/source

Noel Grandin noel at peralex.com
Mon Jun 1 06:00:06 PDT 2015


 basebmp/source/bitmapdevice.cxx |   21 ---------------------
 1 file changed, 21 deletions(-)

New commits:
commit 404943048e5bbed5fb19214a9594a91fa6d954bd
Author: Noel Grandin <noel at peralex.com>
Date:   Mon Jun 1 14:59:23 2015 +0200

    remove unused BASEBMP_NO_NESTED_TEMPLATE_PARAMETER
    
    Change-Id: I631b5fa984f5a59619aef62e38a503239989b253

diff --git a/basebmp/source/bitmapdevice.cxx b/basebmp/source/bitmapdevice.cxx
index 04d4892..500ef9d 100644
--- a/basebmp/source/bitmapdevice.cxx
+++ b/basebmp/source/bitmapdevice.cxx
@@ -1789,11 +1789,6 @@ struct StdMasks
 };
 
 
-// Some compilers don't like the nested template wrap_accessor
-// reference in the parameter list - being slightly less type safe,
-// then.
-#ifndef BASEBMP_NO_NESTED_TEMPLATE_PARAMETER
-
 /// Produces a specialized renderer for the given pixel format
 template< class FormatTraits, class MaskTraits >
 BitmapDeviceSharedPtr createRenderer(
@@ -1808,22 +1803,6 @@ BitmapDeviceSharedPtr createRenderer(
     boost::shared_array< sal_uInt8 >                             pMem,
     const PaletteMemorySharedVector&                             pPal,
     const IBitmapDeviceDamageTrackerSharedPtr&                   pDamage )
-#else
-
-template< class FormatTraits, class MaskTraits, class Accessor >
-BitmapDeviceSharedPtr createRenderer(
-    const basegfx::B2IBox&                                       rBounds,
-    const basegfx::B2IVector&                                    rBufferSize,
-    Format                                                       nScanlineFormat,
-    sal_Int32                                                    nScanlineStride,
-    sal_uInt8*                                                   pFirstScanline,
-    typename FormatTraits::raw_accessor_type const&              rRawAccessor,
-    Accessor const&                                              rAccessor,
-    boost::shared_array< sal_uInt8 >                             pMem,
-    const PaletteMemorySharedVector&                             pPal,
-    const IBitmapDeviceDamageTrackerSharedPtr&                   pDamage )
-
-#endif
 {
     typedef typename FormatTraits::iterator_type                Iterator;
     typedef BitmapRenderer< Iterator,


More information about the Libreoffice-commits mailing list