Resolves cpp-io2d/io2dts#118

Author: mikebmcl

P0267_RefImpl/P0267_RefImpl/image_surface.cpp

@@ -401,7 +401,7 @@ void image_surface::save(string f, image_file_format idf) {
 		const auto w = width();
 		const auto h = height();
 		const size_t sfcStride = w * 4;
-		const size_t mapStride = stride();
+		const size_t mapStride = cairo_image_surface_get_stride(_Surface.get());
 		auto sfcData = make_unique<unsigned char[]>(sfcStride * h);
 		switch (_Format)
 		{
@@ -555,7 +555,7 @@ void image_surface::save(string f, image_file_format idf) {
 		const auto w = width();
 		const auto h = height();
 		const size_t sfcStride = (_Format == format::a8 ? w : w * 4);
-		const size_t mapStride = stride();
+		const size_t mapStride = cairo_image_surface_get_stride(_Surface.get());
 		auto sfcData = make_unique<unsigned char[]>(sfcStride * h);
 
 		switch (_Format)
@@ -738,10 +738,6 @@ int image_surface::height() const noexcept {
 	return cairo_image_surface_get_height(_Surface.get());
 }
 
-int image_surface::stride() const noexcept {
-	return cairo_image_surface_get_stride(_Surface.get());
-}
-
 #ifdef __clang__
 #pragma clang diagnostic pop
 #endif

P0267_RefImpl/P0267_RefImpl/xsurfaces.h

@@ -254,9 +254,6 @@ namespace std::experimental::io2d {
 		class image_surface : public surface {
 			friend surface;
 		public:
-			// surplus to paper
-			_IO2D_API int stride() const noexcept;
-
 			_IO2D_API image_surface(io2d::format fmt, int width, int height);
 #ifdef _Filesystem_support_test
 			_IO2D_API image_surface(filesystem::path f, image_file_format i, io2d::format fmt);