diff options
Diffstat (limited to 'include/vcl')
-rw-r--r-- | include/vcl/salgtype.hxx | 9 | ||||
-rw-r--r-- | include/vcl/virdev.hxx | 35 |
2 files changed, 26 insertions, 18 deletions
diff --git a/include/vcl/salgtype.hxx b/include/vcl/salgtype.hxx index 59654f6595d5..a43a19db72b4 100644 --- a/include/vcl/salgtype.hxx +++ b/include/vcl/salgtype.hxx @@ -22,7 +22,14 @@ #include <sal/types.h> -enum class DeviceFormat { NONE = -1, FULLCOLOR = 0, BITMASK = 1, GRAYSCALE = 8 }; +enum class DeviceFormat { + NONE = -1, + DEFAULT = 0, + BITMASK = 1, +#ifdef IOS + GRAYSCALE = 8 +#endif + }; typedef sal_uInt32 SalColor; #define MAKE_SALCOLOR( r, g, b ) ((SalColor)(((sal_uInt32)((sal_uInt8)(b))))|(((sal_uInt32)((sal_uInt8)(g)))<<8)|(((sal_uInt32)((sal_uInt8)(r)))<<16)) diff --git a/include/vcl/virdev.hxx b/include/vcl/virdev.hxx index 76076ba657fd..cd6db85e9ab2 100644 --- a/include/vcl/virdev.hxx +++ b/include/vcl/virdev.hxx @@ -74,38 +74,39 @@ public: /** Create a virtual device of size 1x1 @param nBitCount - Bit depth of the generated virtual device. Use 0 here, to - indicate: take default screen depth. Only 0, 1 and 8 - are allowed here, with 1 denoting binary mask and 8 a graylevel mask. + Device format of the generated virtual device. Use DeviceFormat::DEFAULT here, to + indicate: take default screen depth. Only DeviceFormat::BITMASK + is the other possibility to denote a binary mask. */ - explicit VirtualDevice(DeviceFormat eFormat = DeviceFormat::FULLCOLOR); + explicit VirtualDevice(DeviceFormat eFormat = DeviceFormat::DEFAULT); /** Create a virtual device of size 1x1 @param rCompDev The generated vdev will be compatible to this device. - @param nBitCount - Bit depth of the generated virtual device. Use 0 here, to - indicate: take default screen depth. + @param eFormat + Device format of the generated virtual device. Use DeviceFormat::DEFAULT here, to + indicate: take default screen depth. Only DeviceFormat::BITMASK + is the other possibility to denote a binary mask. */ explicit VirtualDevice(const OutputDevice& rCompDev, - DeviceFormat eFormat = DeviceFormat::FULLCOLOR); + DeviceFormat eFormat = DeviceFormat::DEFAULT); /** Create a virtual device of size 1x1 with alpha channel @param rCompDev The generated vdev will be compatible to this device. - @param nBitCount - Bit depth of the generated virtual device. Use 0 here, to - indicate: take default screen depth. Only 0 and 1 - are allowed here, with 1 denoting binary mask. - - @param nAlphaBitCount - Bit depth of the generated virtual device. Use 0 here, to - indicate: take default screen depth. Only 0 and 1 - are allowed here, with 1 denoting binary mask. + @param eFormat + Device format of the generated virtual device. Use DeviceFormat::DEFAULT here, to + indicate: take default screen depth. Only DeviceFormat::BITMASK + is the other possibility to denote a binary mask. + + @param eAlphaFormat + Device format of the generated virtual device. Use DeviceFormat::DEFAULT here, to + indicate: take default screen depth. Only DeviceFormat::BITMASK + is the other possibility to denote a binary mask. */ explicit VirtualDevice( const OutputDevice& rCompDev, DeviceFormat eFormat, DeviceFormat eAlphaFormat); |