diff options
| author | Noel Grandin <noel@peralex.com> | 2016-05-23 10:17:16 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-05-24 06:53:12 +0000 |
| commit | 93e61f9663df7e3986d88d6cb7db795af96a11b4 (patch) | |
| tree | 7512f069c787b450c97cb4ad55a1d5a5ee0f9d42 /vcl/unx/generic | |
| parent | 0cd5d93c1e313d8d71f3338451c683c7aeef8f10 (diff) | |
Convert ImageType to scoped enum
Change-Id: I7928fe7f1d6e96dcf42b03bd04fa9499371bbd98
Reviewed-on: https://gerrit.libreoffice.org/25354
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'vcl/unx/generic')
| -rw-r--r-- | vcl/unx/generic/print/bitmap_gfx.cxx | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/vcl/unx/generic/print/bitmap_gfx.cxx b/vcl/unx/generic/print/bitmap_gfx.cxx index d89d190d60eb..93ed0ce1a25a 100644 --- a/vcl/unx/generic/print/bitmap_gfx.cxx +++ b/vcl/unx/generic/print/bitmap_gfx.cxx @@ -523,10 +523,10 @@ PrinterGfx::writePS2ImageHeader (const Rectangle& rArea, psp::ImageType nType) sal_Int32 nDictType = 0; switch (nType) { - case psp::TrueColorImage: nDictType = 0; break; - case psp::PaletteImage: nDictType = 1; break; - case psp::GrayScaleImage: nDictType = 2; break; - case psp::MonochromeImage: nDictType = 3; break; + case psp::ImageType::TrueColorImage: nDictType = 0; break; + case psp::ImageType::PaletteImage: nDictType = 1; break; + case psp::ImageType::GrayScaleImage: nDictType = 2; break; + case psp::ImageType::MonochromeImage: nDictType = 3; break; default: break; } sal_Int32 nCompressType = mbCompressBmp ? 1 : 0; @@ -548,18 +548,18 @@ PrinterGfx::writePS2Colorspace(const PrinterBmp& rBitmap, psp::ImageType nType) { switch (nType) { - case psp::GrayScaleImage: + case psp::ImageType::GrayScaleImage: WritePS (mpPageBody, "/DeviceGray setcolorspace\n"); break; - case psp::TrueColorImage: + case psp::ImageType::TrueColorImage: WritePS (mpPageBody, "/DeviceRGB setcolorspace\n"); break; - case psp::MonochromeImage: - case psp::PaletteImage: + case psp::ImageType::MonochromeImage: + case psp::ImageType::PaletteImage: { sal_Int32 nChar = 0; @@ -597,8 +597,8 @@ PrinterGfx::writePS2Colorspace(const PrinterBmp& rBitmap, psp::ImageType nType) void PrinterGfx::DrawPS2GrayImage (const PrinterBmp& rBitmap, const Rectangle& rArea) { - writePS2Colorspace(rBitmap, psp::GrayScaleImage); - writePS2ImageHeader(rArea, psp::GrayScaleImage); + writePS2Colorspace(rBitmap, psp::ImageType::GrayScaleImage); + writePS2ImageHeader(rArea, psp::ImageType::GrayScaleImage); std::unique_ptr<ByteEncoder> xEncoder(mbCompressBmp ? new LZWEncoder(mpPageBody) : new Ascii85Encoder(mpPageBody)); @@ -616,8 +616,8 @@ PrinterGfx::DrawPS2GrayImage (const PrinterBmp& rBitmap, const Rectangle& rArea) void PrinterGfx::DrawPS2MonoImage (const PrinterBmp& rBitmap, const Rectangle& rArea) { - writePS2Colorspace(rBitmap, psp::MonochromeImage); - writePS2ImageHeader(rArea, psp::MonochromeImage); + writePS2Colorspace(rBitmap, psp::ImageType::MonochromeImage); + writePS2ImageHeader(rArea, psp::ImageType::MonochromeImage); std::unique_ptr<ByteEncoder> xEncoder(mbCompressBmp ? new LZWEncoder(mpPageBody) : new Ascii85Encoder(mpPageBody)); @@ -648,8 +648,8 @@ PrinterGfx::DrawPS2MonoImage (const PrinterBmp& rBitmap, const Rectangle& rArea) void PrinterGfx::DrawPS2PaletteImage (const PrinterBmp& rBitmap, const Rectangle& rArea) { - writePS2Colorspace(rBitmap, psp::PaletteImage); - writePS2ImageHeader(rArea, psp::PaletteImage); + writePS2Colorspace(rBitmap, psp::ImageType::PaletteImage); + writePS2ImageHeader(rArea, psp::ImageType::PaletteImage); std::unique_ptr<ByteEncoder> xEncoder(mbCompressBmp ? new LZWEncoder(mpPageBody) : new Ascii85Encoder(mpPageBody)); @@ -667,8 +667,8 @@ PrinterGfx::DrawPS2PaletteImage (const PrinterBmp& rBitmap, const Rectangle& rAr void PrinterGfx::DrawPS2TrueColorImage (const PrinterBmp& rBitmap, const Rectangle& rArea) { - writePS2Colorspace(rBitmap, psp::TrueColorImage); - writePS2ImageHeader(rArea, psp::TrueColorImage); + writePS2Colorspace(rBitmap, psp::ImageType::TrueColorImage); + writePS2ImageHeader(rArea, psp::ImageType::TrueColorImage); std::unique_ptr<ByteEncoder> xEncoder(mbCompressBmp ? new LZWEncoder(mpPageBody) : new Ascii85Encoder(mpPageBody)); |