diff options
| author | Noel Grandin <noel@peralex.com> | 2016-02-23 10:06:19 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-02-23 11:23:11 +0000 |
| commit | 02a320777f5b91f33aee364bb29ecc0151aac3e0 (patch) | |
| tree | 26ba87d2e8a0f9f3469831f302df5f05c8726845 | |
| parent | b2bb094f6ba3d2c23573ea9a66d7cc67c2a3ea1a (diff) | |
convert canvas::IColorBuffer::Format to scoped enum
Change-Id: I0013c0b14992062be97977bf00f4af89fb2766f5
Reviewed-on: https://gerrit.libreoffice.org/22633
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
| -rw-r--r-- | canvas/source/directx/dx_9rm.cxx | 4 | ||||
| -rw-r--r-- | canvas/source/directx/dx_surfacebitmap.cxx | 4 | ||||
| -rw-r--r-- | include/canvas/rendering/icolorbuffer.hxx | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/canvas/source/directx/dx_9rm.cxx b/canvas/source/directx/dx_9rm.cxx index 8a909bbc11d0..633e5a972e7e 100644 --- a/canvas/source/directx/dx_9rm.cxx +++ b/canvas/source/directx/dx_9rm.cxx @@ -381,7 +381,7 @@ namespace dxcanvas { switch( rSource.getFormat() ) { - case ::canvas::IColorBuffer::FMT_A8R8G8B8: + case ::canvas::IColorBuffer::Format::A8R8G8B8: { const std::size_t nSourceBytesPerPixel(4); const std::size_t nSourcePitchInBytes(rSource.getStride()); @@ -422,7 +422,7 @@ namespace dxcanvas } break; - case ::canvas::IColorBuffer::FMT_X8R8G8B8: + case ::canvas::IColorBuffer::Format::X8R8G8B8: { const std::size_t nSourceBytesPerPixel(4); const std::size_t nSourcePitchInBytes(rSource.getStride()); diff --git a/canvas/source/directx/dx_surfacebitmap.cxx b/canvas/source/directx/dx_surfacebitmap.cxx index 6509a6837804..f7a3dde7dd9f 100644 --- a/canvas/source/directx/dx_surfacebitmap.cxx +++ b/canvas/source/directx/dx_surfacebitmap.cxx @@ -98,7 +98,7 @@ namespace dxcanvas canvas::IColorBuffer::Format DXColorBuffer::getFormat() const { - return canvas::IColorBuffer::FMT_X8R8G8B8; + return canvas::IColorBuffer::Format::X8R8G8B8; } @@ -174,7 +174,7 @@ namespace dxcanvas canvas::IColorBuffer::Format GDIColorBuffer::getFormat() const { - return canvas::IColorBuffer::FMT_A8R8G8B8; + return canvas::IColorBuffer::Format::A8R8G8B8; } } diff --git a/include/canvas/rendering/icolorbuffer.hxx b/include/canvas/rendering/icolorbuffer.hxx index 5402f795b243..b85ca18a72c8 100644 --- a/include/canvas/rendering/icolorbuffer.hxx +++ b/include/canvas/rendering/icolorbuffer.hxx @@ -33,13 +33,13 @@ namespace canvas struct IColorBuffer { /// The underlying pixel format for this buffer - enum Format + enum class Format { // 32-bit ARGB pixel format with alpha, 8 bits per channel. - FMT_A8R8G8B8, + A8R8G8B8, // 32-bit RGB pixel format, 8 bits per channel. - FMT_X8R8G8B8 + X8R8G8B8 }; virtual ~IColorBuffer() {} |