R6 - Resolved remaining issues with surface (modulo bugs in R6 that require the implementation to diverge).

Author: mikebmcl

N3888_RefImpl/src/surface.cpp

@@ -47,9 +47,20 @@ void surface::mark_dirty() {
 	cairo_surface_mark_dirty(_Surface.get());
 }
 
-void surface::mark_dirty(const bounding_box& rect) {
-	_Dirty_rect = rect;
-	cairo_surface_mark_dirty_rectangle(_Surface.get(), _Double_to_int(rect.x()), _Double_to_int(rect.y()), _Double_to_int(rect.width()), _Double_to_int(rect.height()));
+void surface::mark_dirty(error_code& ec) noexcept {
+	cairo_surface_mark_dirty(_Surface.get());
+	ec.clear();
+}
+
+void surface::mark_dirty(const bounding_box& extents) {
+	_Dirty_rect = extents;
+	cairo_surface_mark_dirty_rectangle(_Surface.get(), _Float_to_int(extents.x()), _Float_to_int(extents.y()), _Float_to_int(extents.width()), _Float_to_int(extents.height()));
+}
+
+void surface::mark_dirty(const bounding_box& extents, error_code& ec) noexcept {
+	_Dirty_rect = extents;
+	cairo_surface_mark_dirty_rectangle(_Surface.get(), _Float_to_int(extents.x()), _Float_to_int(extents.y()), _Float_to_int(extents.width()), _Float_to_int(extents.height()));
+	ec.clear();
 }
 
 void surface::clear() {
@@ -198,14 +209,13 @@ void surface::stroke(const brush& b, const interpreted_path& pg, const optional<
 	cairo_stroke(context);
 }
 
-/*void surface::mask(const brush& b, const brush& mb, const interpreted_path& pg, const optional<brush_props>& bp, const optional<mask_props>& mp, const optional<render_props>& rp, const optional<clip_props>& cl) {
+void surface::mask(const brush& b, const brush& mb, const optional<brush_props>& bp, const optional<mask_props>& mp, const optional<render_props>& rp, const optional<clip_props>& cl) {
 	auto context = _Context.get();
 	_Set_render_props(context, rp);
 	_Set_clip_props(context, cl);
 	_Set_brush_props(context, bp, b);
 	_Set_mask_props(mp, mb);
 	cairo_set_source(context, b.native_handle());
 	cairo_new_path(context);
-	cairo_append_path(context, pg._Native_handle());
 	cairo_mask(context, mb.native_handle());
-}*/
+}

N3888_RefImpl/src/xio2d_impl.h

@@ -39,7 +39,7 @@ namespace std::experimental::io2d {
 		}
 
 		// Converts 'value' to an int and returns it. If nearestNeighbor is true, the return value is the result of calling 'static_cast<int>(round(value))'; if false, the return value is the result of calling 'static_cast<int>(trunc(value))'.
-		inline int _Double_to_int(float value, bool nearestNeighbor = true) {
+		inline int _Float_to_int(float value, bool nearestNeighbor = true) {
 			if (nearestNeighbor) {
 				// Round to the nearest neighbor.
 				return static_cast<int>(::std::round(value));
@@ -2483,26 +2483,19 @@ namespace std::experimental::io2d {
 			return _Matrix;
 		}
 
-		// divergent from paper
-/*		template <class Allocator>
+		// divergent from paper ?
+		template <class Allocator>
 		inline void surface::fill(const brush& b, const path_builder<Allocator>& pf, const optional<brush_props>& bp, const optional<render_props>& rp, const optional<clip_props>& cl) {
 			interpreted_path pg(pf);
 			fill(b, pg, bp, rp, cl);
-		}*/
+		}
 
 		template <class Allocator>
 		inline void surface::stroke(const brush& b, const path_builder<Allocator>& pf, const optional<brush_props>& bp, const optional<stroke_props>& sp, const optional<dashes>& d, const optional<render_props>& rp, const optional<clip_props>& cl) {
 			interpreted_path pg(pf);
 			stroke(b, pg, bp, sp, d, rp, cl);
 		}
 
-		// divergent from paper
-/*		template <class Allocator>
-		inline void surface::mask(const brush& b, const brush& mb, const path_builder<Allocator>& pf, const optional<brush_props>& bp, const optional<mask_props>& mp, const optional<render_props>&rp, const optional<clip_props>& cl) {
-			interpreted_path pg(pf);
-			mask(b, mb, pg, bp, mp, rp, cl);
-		}*/
-
 		inline mapped_surface::mapped_surface(surface::native_handle_type nh, surface::native_handle_type map_of)
 			: _Mapped_surface(nh)
 			, _Map_of(map_of) {

N3888_RefImpl/src/xsurfaces.h

@@ -241,10 +241,13 @@ namespace std::experimental::io2d {
 			void stroke(const brush& b, const path_builder<Allocator>& pb, const optional<brush_props>& bp = nullopt, const optional<stroke_props>& sp = nullopt, const optional<dashes>& d = nullopt, const optional<render_props>& rp = nullopt, const optional<clip_props>& cl = nullopt);
 			_IO2D_API void stroke(const brush& b, const interpreted_path& pg, const optional<brush_props>& bp = nullopt, const optional<stroke_props>& sp = nullopt, const optional<dashes>& d = nullopt, const optional<render_props>& rp = nullopt, const optional<clip_props>& cl = nullopt);
 			template <class Allocator>
-			void fill(const brush& b, const path_builder<Allocator>& pb, const optional<render_props>& rp = nullopt, const optional<clip_props>& cl = nullopt);
+			void fill(const brush& b, const path_builder<Allocator>& pb, const optional<brush_props>& bp = nullopt, const optional<render_props>& rp = nullopt, const optional<clip_props>& cl = nullopt);
 			_IO2D_API void fill(const brush& b, const interpreted_path& pg, const optional<brush_props>& bp = nullopt, const optional<render_props>& rp = nullopt, const optional<clip_props>& cl = nullopt);
-			template <class Allocator>
-			void mask(const brush& b, const brush& mb, const optional<brush_props>& bp = nullopt, const optional<mask_props>& mp = nullopt, const optional<render_props>& rp = nullopt, const optional<clip_props>& cl = nullopt);
+
+			// Broken R6 - removed unused path from mask but forgot to eliminate this overload:
+			//template <class Allocator>
+			//void mask(const brush& b, const brush& mb, const optional<brush_props>& bp = nullopt, const optional<mask_props>& mp = nullopt, const optional<render_props>& rp = nullopt, const optional<clip_props>& cl = nullopt);
+
 			_IO2D_API void mask(const brush& b, const brush& mb, const optional<brush_props>& bp = nullopt, const optional<mask_props>& mp = nullopt, const optional<render_props>& rp = nullopt, const optional<clip_props>& cl = nullopt);
 		};