summaryrefslogtreecommitdiff
path: root/include/vcl/bitmap.hxx
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-05-06 11:45:37 +0200
committerNoel Grandin <noelgrandin@gmail.com>2015-05-07 09:19:16 +0000
commit220c9fc2e9fa8c83a1851e3f73682d8300f6dff1 (patch)
tree5d0eeba84bc1d69fb2bac1e9ce1cf8532d84a1fb /include/vcl/bitmap.hxx
parent08967d36ba0da5bf85e52ff64f41732a12b37a2e (diff)
convert BMP_VECTORIZE constants to scoped enum
Change-Id: Ifa6614f6a17356481a335a686e9ea0f9b983c5c5 Reviewed-on: https://gerrit.libreoffice.org/15647 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'include/vcl/bitmap.hxx')
-rw-r--r--include/vcl/bitmap.hxx19
1 files changed, 13 insertions, 6 deletions
diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx
index 8ee2c872fd7b..a9f2146280c7 100644
--- a/include/vcl/bitmap.hxx
+++ b/include/vcl/bitmap.hxx
@@ -71,10 +71,17 @@ namespace o3tl
template<> struct typed_flags<BmpDitherFlags> : is_typed_flags<BmpDitherFlags, 0x07> {};
}
-#define BMP_VECTORIZE_INNER 0x00000001UL
-#define BMP_VECTORIZE_OUTER 0x00000002UL
-#define BMP_VECTORIZE_BOUND_ONLY 0x00000004UL
-#define BMP_VECTORIZE_REDUCE_EDGES 0x00000008UL
+enum class BmpVectorizeFlags
+{
+ Inner = 0x0001,
+ Outer = 0x0002,
+ BoundOnly = 0x0004,
+ ReduceEdges = 0x0008,
+};
+namespace o3tl
+{
+ template<> struct typed_flags<BmpVectorizeFlags> : is_typed_flags<BmpVectorizeFlags, 0x0f> {};
+}
#define BMP_COL_TRANS Color( 252, 3, 251 )
@@ -721,7 +728,7 @@ public:
*/
bool Vectorize(
tools::PolyPolygon& rPolyPoly,
- sal_uLong nFlags = BMP_VECTORIZE_OUTER,
+ BmpVectorizeFlags nFlags = BmpVectorizeFlags::Outer,
const Link<>* pProgress = NULL );
/** Convert the bitmap to a meta file
@@ -748,7 +755,7 @@ public:
bool Vectorize(
GDIMetaFile& rMtf,
sal_uInt8 cReduce = 0,
- sal_uLong nFlags = BMP_VECTORIZE_INNER,
+ BmpVectorizeFlags nFlags = BmpVectorizeFlags::Inner,
const Link<>* pProgress = NULL );
/** Change various global color characteristics