diff options
| author | Thorsten Behrens <thb@openoffice.org> | 2006-07-21 19:57:06 +0000 |
|---|---|---|
| committer | Thorsten Behrens <thb@openoffice.org> | 2006-07-21 19:57:06 +0000 |
| commit | 9e67e628d6cd4b04d192ac5f0528eb3cb691b219 (patch) | |
| tree | 2f06f398d918f577c8ed61f22c8ffbbcfef14e0c /basebmp/source | |
| parent | ed20c63f1ae67bb14b99be34a4bcdf56a0317e0f (diff) | |
#i65904# Compiler compatibility changes: made the BOOST_NO_MEMBER_TEMPLATE_FRIENDS path actually work; added SunCC kludge for nested template as function template parameter problem; corrected blend_functor specialization to make msvc happy
Diffstat (limited to 'basebmp/source')
| -rw-r--r-- | basebmp/source/bitmapdevice.cxx | 24 | ||||
| -rw-r--r-- | basebmp/source/makefile.mk | 8 |
2 files changed, 28 insertions, 4 deletions
diff --git a/basebmp/source/bitmapdevice.cxx b/basebmp/source/bitmapdevice.cxx index d43056b7a6a1..324422c23ac2 100644 --- a/basebmp/source/bitmapdevice.cxx +++ b/basebmp/source/bitmapdevice.cxx @@ -4,9 +4,9 @@ * * $RCSfile: bitmapdevice.cxx,v $ * - * $Revision: 1.22 $ + * $Revision: 1.23 $ * - * last change: $Author: thb $ $Date: 2006-07-14 14:22:58 $ + * last change: $Author: thb $ $Date: 2006-07-21 20:57:06 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1760,6 +1760,11 @@ struct MaskTraitsGeneric //---------------------------------------------------------------------------------- +// 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( @@ -1772,6 +1777,21 @@ BitmapDeviceSharedPtr createRenderer( typename FormatTraits::raw_accessor_type>::type const& rAccessor, boost::shared_array< sal_uInt8 > pMem, const PaletteMemorySharedVector& pPal ) + +#else + +template< class FormatTraits, class MaskTraits, class Accessor > +BitmapDeviceSharedPtr createRenderer( + const basegfx::B2IRange& rBounds, + bool bTopDown, + sal_Int32 nScanlineFormat, + sal_Int32 nScanlineStride, + sal_uInt8* pFirstScanline, + Accessor const& rAccessor, + boost::shared_array< sal_uInt8 > pMem, + const PaletteMemorySharedVector& pPal ) + +#endif { typedef typename FormatTraits::iterator_type Iterator; typedef BitmapRenderer< Iterator, diff --git a/basebmp/source/makefile.mk b/basebmp/source/makefile.mk index 3fc5438ccb70..da5006e0c07e 100644 --- a/basebmp/source/makefile.mk +++ b/basebmp/source/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.3 $ +# $Revision: 1.4 $ # -# last change: $Author: thb $ $Date: 2006-07-11 11:38:56 $ +# last change: $Author: thb $ $Date: 2006-07-21 20:57:06 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -43,6 +43,10 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk +.IF "$(OS)"=="SOLARIS" && "$(COM)"!="GCC" +CDEFS+= -DBASEBMP_NO_NESTED_TEMPLATE_PARAMETER +.ENDIF + # --- Common ---------------------------------------------------------- SLOFILES = \ |