Ensure R6 compliance

Chapter 12. Surfaces through to 12.14.5

Author: hatcat

N3888_RefImpl/src/display_surface-common.cpp

@@ -80,7 +80,7 @@ void display_surface::_Render_for_scaling_uniform_or_letterbox() {
 						cairo_pattern_set_extend(pttn, _Extend_to_cairo_extend_t(props.wrap_mode()));
 						cairo_pattern_set_filter(pttn, _Filter_to_cairo_filter_t(props.filter()));
 						cairo_matrix_t cPttnMatrix;
-						const auto& m = props.matrix();
+						const auto& m = props.brush_matrix();
 						cairo_matrix_init(&cPttnMatrix, m.m00, m.m01, m.m10, m.m11, m.m20, m.m21);
 						cairo_pattern_set_matrix(pttn, &cPttnMatrix);
 						cairo_set_source(_Native_context.get(), pttn);
@@ -139,7 +139,7 @@ void display_surface::_Render_for_scaling_uniform_or_letterbox() {
 						cairo_pattern_set_extend(pttn, _Extend_to_cairo_extend_t(props.wrap_mode()));
 						cairo_pattern_set_filter(pttn, _Filter_to_cairo_filter_t(props.filter()));
 						cairo_matrix_t cPttnMatrix;
-						const auto& m = props.matrix();
+						const auto& m = props.brush_matrix();
 						cairo_matrix_init(&cPttnMatrix, m.m00, m.m01, m.m10, m.m11, m.m20, m.m21);
 						cairo_pattern_set_matrix(pttn, &cPttnMatrix);
 						cairo_set_source(_Native_context.get(), pttn);
@@ -188,7 +188,7 @@ void display_surface::_Render_to_native_surface() {
 					cairo_pattern_set_extend(pttn, _Extend_to_cairo_extend_t(props.wrap_mode()));
 					cairo_pattern_set_filter(pttn, _Filter_to_cairo_filter_t(props.filter()));
 					cairo_matrix_t cPttnMatrix;
-					const auto& m = props.matrix();
+					const auto& m = props.brush_matrix();
 					cairo_matrix_init(&cPttnMatrix, m.m00, m.m01, m.m10, m.m11, m.m20, m.m21);
 					cairo_pattern_set_matrix(pttn, &cPttnMatrix);
 					cairo_set_source(_Native_context.get(), pttn);

N3888_RefImpl/src/image_surface.cpp

@@ -235,7 +235,7 @@ image_surface::image_surface(string f, experimental::io2d::format fmt, image_fil
 				memcpy(mapData + (i * mapStride), pixelData.get() + i * dataStride, mapStride);
 			}
 		} break;
-		case std::experimental::io2d::v1::format::xrgb32:
+		case std::experimental::io2d::v1::format::rgb24:
 		{
 			for (int i = 0; i < h; i++) {
 				memcpy(mapData + (i * mapStride), pixelData.get() + i * dataStride, mapStride);
@@ -326,7 +326,7 @@ image_surface::image_surface(string f, experimental::io2d::format fmt, image_fil
 				memcpy(mapData + (i * mapStride), pixelData.get() + i * pitch, mapStride);
 			}
 		} break;
-		case std::experimental::io2d::v1::format::xrgb32:
+		case std::experimental::io2d::v1::format::rgb24:
 		{
 			for (int i = 0; i < h; i++) {
 				memcpy(mapData + (i * mapStride), pixelData.get() + i * pitch, mapStride);
@@ -416,7 +416,7 @@ void image_surface::save(string f, image_file_format idf) {
 				memcpy(sfcData.get() + (i * sfcStride), mapData + (i * sfcStride), sfcStride);
 			}
 		} break;
-		case std::experimental::io2d::v1::format::xrgb32:
+		case std::experimental::io2d::v1::format::rgb24:
 		{
 			pngImg.format = PNG_FORMAT_BGRA; // We'll write the alpha as-is in case someone was storing some data in them.
 			for (int i = 0; i < h; i++) {
@@ -570,7 +570,7 @@ void image_surface::save(string f, image_file_format idf) {
 				memcpy(sfcData.get() + (i * sfcStride), mapData + (i * sfcStride), sfcStride);
 			}
 		} break;
-		case std::experimental::io2d::v1::format::xrgb32:
+		case std::experimental::io2d::v1::format::rgb24:
 		{
 			for (int i = 0; i < h; i++) {
 				memcpy(sfcData.get() + (i * sfcStride), mapData + (i * sfcStride), sfcStride);

N3888_RefImpl/src/surface.cpp

@@ -188,7 +188,7 @@ namespace {
 			auto p = b.native_handle();
 			cairo_pattern_set_extend(b.native_handle(), _Extend_to_cairo_extend_t(props.wrap_mode()));
 			cairo_pattern_set_filter(p, _Filter_to_cairo_filter_t(props.filter()));
-			const auto& m = props.matrix();
+			const auto& m = props.brush_matrix();
 			cairo_matrix_t cm{ m.m00, m.m01, m.m10, m.m11, m.m20, m.m21 };
 			cairo_pattern_set_matrix(p, &cm);
 			cairo_set_fill_rule(context, _Fill_rule_to_cairo_fill_rule_t(props.fill_rule()));
@@ -207,7 +207,7 @@ namespace {
 			auto p = b.native_handle();
 			cairo_pattern_set_extend(b.native_handle(), _Extend_to_cairo_extend_t(props.wrap_mode()));
 			cairo_pattern_set_filter(p, _Filter_to_cairo_filter_t(props.filter()));
-			const auto& m = props.matrix();
+			const auto& m = props.mask_matrix();
 			cairo_matrix_t cm{ m.m00, m.m01, m.m10, m.m11, m.m20, m.m21 };
 			cairo_pattern_set_matrix(p, &cm);
 		}

N3888_RefImpl/src/xio2d_impl.h

@@ -1222,8 +1222,6 @@ namespace std::experimental::io2d {
 				return CAIRO_LINE_JOIN_ROUND;
 			case ::std::experimental::io2d::line_join::bevel:
 				return CAIRO_LINE_JOIN_BEVEL;
-			case ::std::experimental::io2d::line_join::miter_or_bevel:
-				return CAIRO_LINE_JOIN_MITER;
 			default:
 				throw ::std::runtime_error("Unknown line_join value.");
 			}
@@ -1232,7 +1230,7 @@ namespace std::experimental::io2d {
 		inline ::std::experimental::io2d::line_join _Cairo_line_join_t_to_line_join(cairo_line_join_t clj) {
 			switch (clj) {
 			case CAIRO_LINE_JOIN_MITER:
-				return ::std::experimental::io2d::line_join::miter_or_bevel;
+				return ::std::experimental::io2d::line_join::miter;
 			case CAIRO_LINE_JOIN_ROUND:
 				return ::std::experimental::io2d::line_join::round;
 			case CAIRO_LINE_JOIN_BEVEL:
@@ -1380,7 +1378,7 @@ namespace std::experimental::io2d {
 				return CAIRO_FORMAT_INVALID;
 			case ::std::experimental::io2d::format::argb32:
 				return CAIRO_FORMAT_ARGB32;
-			case ::std::experimental::io2d::format::xrgb32:
+			case ::std::experimental::io2d::format::rgb24:
 				return CAIRO_FORMAT_RGB24;
 			case ::std::experimental::io2d::format::a8:
 				return CAIRO_FORMAT_A8;
@@ -1400,7 +1398,7 @@ namespace std::experimental::io2d {
 			case CAIRO_FORMAT_ARGB32:
 				return ::std::experimental::io2d::format::argb32;
 			case CAIRO_FORMAT_RGB24:
-				return ::std::experimental::io2d::format::xrgb32;
+				return ::std::experimental::io2d::format::rgb24;
 			case CAIRO_FORMAT_A8:
 				return ::std::experimental::io2d::format::a8;
 			case CAIRO_FORMAT_RGB16_565:
@@ -2356,7 +2354,7 @@ namespace std::experimental::io2d {
 			_Fill_rule = fr;
 		}
 
-		inline constexpr void brush_props::matrix(const matrix_2d& m) noexcept {
+		inline constexpr void brush_props::brush_matrix(const matrix_2d& m) noexcept {
 			_Matrix = m;
 		}
 
@@ -2372,7 +2370,7 @@ namespace std::experimental::io2d {
 			return _Fill_rule;
 		}
 
-		inline constexpr matrix_2d brush_props::matrix() const noexcept {
+		inline constexpr matrix_2d brush_props::brush_matrix() const noexcept {
 			return _Matrix;
 		}
 
@@ -2409,7 +2407,7 @@ namespace std::experimental::io2d {
 			_Clip = pg;
 		}
 
-		inline void clip_props::fill_rule(experimental::io2d::fill_rule fr) {
+		inline void clip_props::fill_rule(experimental::io2d::fill_rule fr) noexcept{
 			_Fill_rule = fr;
 		}
 
@@ -2471,7 +2469,7 @@ namespace std::experimental::io2d {
 		inline constexpr void mask_props::filter(experimental::io2d::filter fi) noexcept {
 			_Filter = fi;
 		}
-		inline constexpr void mask_props::matrix(const matrix_2d& m) noexcept {
+		inline constexpr void mask_props::mask_matrix(const matrix_2d& m) noexcept {
 			_Matrix = m;
 		}
 
@@ -2481,7 +2479,7 @@ namespace std::experimental::io2d {
 		inline constexpr experimental::io2d::filter mask_props::filter() const noexcept {
 			return _Filter;
 		}
-		inline constexpr matrix_2d mask_props::matrix() const noexcept {
+		inline constexpr matrix_2d mask_props::mask_matrix() const noexcept {
 			return _Matrix;
 		}
 

N3888_RefImpl/src/xsurfaces.h

@@ -34,8 +34,7 @@ namespace std::experimental::io2d {
 		enum class line_join {
 			miter,
 			round,
-			bevel,
-			miter_or_bevel
+			bevel
 		};
 
 		enum class compositing_op {
@@ -73,7 +72,7 @@ namespace std::experimental::io2d {
 		enum class format {
 			invalid,
 			argb32,
-			xrgb32,
+			rgb24,
 			a8,
 			rgb16_565,
 			rgb30
@@ -106,13 +105,10 @@ namespace std::experimental::io2d {
 			compositing_op _Compositing = compositing_op::over;
 		public:
 			constexpr render_props() noexcept;
-			constexpr explicit render_props(antialias a, const matrix_2d& m = matrix_2d{},
-				compositing_op co = compositing_op::over) noexcept;
-
+			constexpr explicit render_props(antialias a, const matrix_2d& m = matrix_2d{}, compositing_op co = compositing_op::over) noexcept;
 			constexpr void antialiasing(antialias a) noexcept;
 			constexpr void compositing(compositing_op co) noexcept;
 			constexpr void surface_matrix(const matrix_2d& m) noexcept;
-
 			constexpr antialias antialiasing() const noexcept;
 			constexpr compositing_op compositing() const noexcept;
 			constexpr matrix_2d surface_matrix() const noexcept;
@@ -125,47 +121,36 @@ namespace std::experimental::io2d {
 			matrix_2d _Matrix;
 
 		public:
+			// suprlus to paper
 			constexpr brush_props() noexcept;
-			constexpr brush_props(experimental::io2d::wrap_mode w,
-				experimental::io2d::filter fi = experimental::io2d::filter::bilinear,
-				experimental::io2d::fill_rule fr = experimental::io2d::fill_rule::winding,
-				matrix_2d m = matrix_2d{}) noexcept;
-
-			constexpr void filter(experimental::io2d::filter fi) noexcept;
-			constexpr void wrap_mode(experimental::io2d::wrap_mode w) noexcept;
-			constexpr void fill_rule(experimental::io2d::fill_rule fr) noexcept;
-			constexpr void matrix(const matrix_2d& m) noexcept;
 
-			constexpr experimental::io2d::filter filter() const noexcept;
-			constexpr experimental::io2d::wrap_mode wrap_mode() const noexcept;
-			constexpr experimental::io2d::fill_rule fill_rule() const noexcept;
-			constexpr matrix_2d matrix() const noexcept;
+			constexpr brush_props(io2d::wrap_mode w = io2d::wrap_mode::none, io2d::filter fi = io2d::filter::good, io2d::fill_rule fr = io2d::fill_rule::winding, matrix_2d m = matrix_2d{}) noexcept;
+			constexpr void filter(io2d::filter fi) noexcept;
+			constexpr void wrap_mode(io2d::wrap_mode w) noexcept;
+			constexpr void fill_rule(io2d::fill_rule fr) noexcept;
+			constexpr void brush_matrix(const matrix_2d& m) noexcept;
+			constexpr io2d::filter filter() const noexcept;
+			constexpr io2d::wrap_mode wrap_mode() const noexcept;
+			constexpr io2d::fill_rule fill_rule() const noexcept;
+			constexpr matrix_2d brush_matrix() const noexcept;
 		};
 
 		class clip_props {
 			interpreted_path _Clip;
 			experimental::io2d::fill_rule _Fill_rule = experimental::io2d::fill_rule::winding;
 		public:
+			// suprlus to paper
+			explicit clip_props(const bounding_box& r, experimental::io2d::fill_rule fr = experimental::io2d::fill_rule::winding);
+
 			clip_props() noexcept = default;
 			template <class Allocator>
-			explicit clip_props(const path_builder<Allocator> &pf,
-				experimental::io2d::fill_rule fr = experimental::io2d::fill_rule::winding);
-
-			explicit clip_props(const interpreted_path& pg,
-				experimental::io2d::fill_rule fr = experimental::io2d::fill_rule::winding) noexcept;
-
-			explicit clip_props(const bounding_box& r,
-				experimental::io2d::fill_rule fr = experimental::io2d::fill_rule::winding);
-
+			explicit clip_props(const path_builder<Allocator>& pb, experimental::io2d::fill_rule fr = experimental::io2d::fill_rule::winding);
+			explicit clip_props(const interpreted_path& pg, experimental::io2d::fill_rule fr = experimental::io2d::fill_rule::winding) noexcept;
 			template <class Allocator>
-			void clip(const path_builder<Allocator>& pf);
-
+			void clip(const path_builder<Allocator>& pb);
 			void clip(const interpreted_path& pg) noexcept;
-
-			void fill_rule(experimental::io2d::fill_rule fr);
-
+			void fill_rule(experimental::io2d::fill_rule fr) noexcept;
 			interpreted_path clip() const noexcept;
-
 			experimental::io2d::fill_rule fill_rule() const noexcept;
 		};
 
@@ -177,20 +162,16 @@ namespace std::experimental::io2d {
 			//optional<dashes> _Dashes;
 		public:
 			constexpr stroke_props() noexcept;
-			constexpr explicit stroke_props(float w,
-				experimental::io2d::line_cap lc = experimental::io2d::line_cap::none,
-				experimental::io2d::line_join lj = experimental::io2d::line_join::miter,
-				float ml = 10.0F) noexcept;
-
+			constexpr explicit stroke_props(float w, io2d::line_cap lc = io2d::line_cap::none, io2d::line_join lj = io2d::line_join::miter, float ml = 10.0f) noexcept;
 			constexpr void line_width(float w) noexcept;
 			constexpr void line_cap(experimental::io2d::line_cap lc) noexcept;
 			constexpr void line_join(experimental::io2d::line_join lj) noexcept;
 			constexpr void miter_limit(float ml) noexcept;
-
 			constexpr float line_width() const noexcept;
 			constexpr experimental::io2d::line_cap line_cap() const noexcept;
 			constexpr experimental::io2d::line_join line_join() const noexcept;
 			constexpr float miter_limit() const noexcept;
+			constexpr float max_miter_limit() const noexcept;
 		};
 
 		class mask_props {
@@ -199,21 +180,19 @@ namespace std::experimental::io2d {
 			matrix_2d _Matrix = matrix_2d{};
 
 		public:
-			constexpr mask_props(experimental::io2d::wrap_mode w = experimental::io2d::wrap_mode::repeat,
-				experimental::io2d::filter fi = experimental::io2d::filter::good,
-				matrix_2d m = matrix_2d{}) noexcept;
+			// suprlus to paper
 			constexpr mask_props(const mask_props&) noexcept = default;
 			constexpr mask_props& operator=(const mask_props&) noexcept = default;
 			mask_props(mask_props&&) noexcept = default;
 			mask_props& operator=(mask_props&&) noexcept = default;
 
+			constexpr mask_props(experimental::io2d::wrap_mode w = experimental::io2d::wrap_mode::repeat, experimental::io2d::filter fi = experimental::io2d::filter::good, matrix_2d m = matrix_2d{}) noexcept;
 			constexpr void wrap_mode(experimental::io2d::wrap_mode w) noexcept;
 			constexpr void filter(experimental::io2d::filter fi) noexcept;
-			constexpr void matrix(const matrix_2d& m) noexcept;
-
+			constexpr void mask_matrix(const matrix_2d& m) noexcept;
 			constexpr experimental::io2d::wrap_mode wrap_mode() const noexcept;
 			constexpr experimental::io2d::filter filter() const noexcept;
-			constexpr matrix_2d matrix() const noexcept;
+			constexpr matrix_2d mask_matrix() const noexcept;
 		};
 
 		struct _Surface_native_handles {