diff --git a/src/ImageSharp/Image/PixelAccessor{TColor}.cs b/src/ImageSharp/Image/PixelAccessor{TColor}.cs index f62e9a9c9b..f9867a9089 100644 --- a/src/ImageSharp/Image/PixelAccessor{TColor}.cs +++ b/src/ImageSharp/Image/PixelAccessor{TColor}.cs @@ -157,7 +157,7 @@ namespace ImageSharp { this.CheckCoordinates(area, targetX, targetY); - this.CopyFrom(area, targetY, targetX, area.Width, area.Height); + this.CopyFrom(area, targetX, targetY, area.Width, area.Height); } /// @@ -173,7 +173,7 @@ namespace ImageSharp { this.CheckCoordinates(area, sourceX, sourceY); - this.CopyTo(area, sourceY, sourceX, area.Width, area.Height); + this.CopyTo(area, sourceX, sourceY, area.Width, area.Height); } /// @@ -199,7 +199,7 @@ namespace ImageSharp return; } - this.CopyTo(area, sourceY, sourceX, width, height); + this.CopyTo(area, sourceX, sourceY, width, height); } /// @@ -254,11 +254,11 @@ namespace ImageSharp /// Copies from an area in format. /// /// The area. - /// The target row index. /// The target column index. + /// The target row index. /// The width. /// The height. - protected virtual void CopyFromZyx(PixelArea area, int targetY, int targetX, int width, int height) + protected virtual void CopyFromZyx(PixelArea area, int targetX, int targetY, int width, int height) { TColor packed = default(TColor); int size = Unsafe.SizeOf(); @@ -283,11 +283,11 @@ namespace ImageSharp /// Copies from an area in format. /// /// The area. - /// The target row index. /// The target column index. + /// The target row index. /// The width. /// The height. - protected virtual void CopyFromZyxw(PixelArea area, int targetY, int targetX, int width, int height) + protected virtual void CopyFromZyxw(PixelArea area, int targetX, int targetY, int width, int height) { TColor packed = default(TColor); int size = Unsafe.SizeOf(); @@ -312,11 +312,11 @@ namespace ImageSharp /// Copies from an area in format. /// /// The area. - /// The target row index. /// The target column index. + /// The target row index. /// The width. /// The height. - protected virtual void CopyFromXyz(PixelArea area, int targetY, int targetX, int width, int height) + protected virtual void CopyFromXyz(PixelArea area, int targetX, int targetY, int width, int height) { TColor packed = default(TColor); int size = Unsafe.SizeOf(); @@ -341,11 +341,11 @@ namespace ImageSharp /// Copies from an area in format. /// /// The area. - /// The target row index. /// The target column index. + /// The target row index. /// The width. /// The height. - protected virtual void CopyFromXyzw(PixelArea area, int targetY, int targetX, int width, int height) + protected virtual void CopyFromXyzw(PixelArea area, int targetX, int targetY, int width, int height) { TColor packed = default(TColor); int size = Unsafe.SizeOf(); @@ -370,11 +370,11 @@ namespace ImageSharp /// Copies to an area in format. /// /// The row. - /// The source row index. /// The source column index. + /// The source row index. /// The width. /// The height. - protected virtual void CopyToZyx(PixelArea area, int sourceY, int sourceX, int width, int height) + protected virtual void CopyToZyx(PixelArea area, int sourceX, int sourceY, int width, int height) { for (int y = 0; y < height; y++) { @@ -391,11 +391,11 @@ namespace ImageSharp /// Copies to an area in format. /// /// The row. - /// The source row index. /// The source column index. + /// The source row index. /// The width. /// The height. - protected virtual void CopyToZyxw(PixelArea area, int sourceY, int sourceX, int width, int height) + protected virtual void CopyToZyxw(PixelArea area, int sourceX, int sourceY, int width, int height) { for (int y = 0; y < height; y++) { @@ -412,11 +412,11 @@ namespace ImageSharp /// Copies to an area in format. /// /// The row. - /// The source row index. /// The source column index. + /// The source row index. /// The width. /// The height. - protected virtual void CopyToXyz(PixelArea area, int sourceY, int sourceX, int width, int height) + protected virtual void CopyToXyz(PixelArea area, int sourceX, int sourceY, int width, int height) { for (int y = 0; y < height; y++) { @@ -433,11 +433,11 @@ namespace ImageSharp /// Copies to an area in format. /// /// The row. - /// The source row index. /// The source column index. + /// The source row index. /// The width. /// The height. - protected virtual void CopyToXyzw(PixelArea area, int sourceY, int sourceX, int width, int height) + protected virtual void CopyToXyzw(PixelArea area, int sourceX, int sourceY, int width, int height) { for (int y = 0; y < height; y++) { @@ -467,28 +467,28 @@ namespace ImageSharp /// Copied a row of pixels from the image /// /// The area. - /// The target row index. /// The target column index. + /// The target row index. /// The width of the area to copy. /// The height of the area to copy. /// /// Thrown when an unsupported component order value is passed. /// - private void CopyFrom(PixelArea area, int targetY, int targetX, int width, int height) + private void CopyFrom(PixelArea area, int targetX, int targetY, int width, int height) { switch (area.ComponentOrder) { case ComponentOrder.Zyx: - this.CopyFromZyx(area, targetY, targetX, width, height); + this.CopyFromZyx(area, targetX, targetY, width, height); break; case ComponentOrder.Zyxw: - this.CopyFromZyxw(area, targetY, targetX, width, height); + this.CopyFromZyxw(area, targetX, targetY, width, height); break; case ComponentOrder.Xyz: - this.CopyFromXyz(area, targetY, targetX, width, height); + this.CopyFromXyz(area, targetX, targetY, width, height); break; case ComponentOrder.Xyzw: - this.CopyFromXyzw(area, targetY, targetX, width, height); + this.CopyFromXyzw(area, targetX, targetY, width, height); break; default: throw new NotSupportedException(); @@ -499,28 +499,28 @@ namespace ImageSharp /// Copied an area of pixels to the image. /// /// The area. - /// The source row index. /// The source column index. + /// The source row index. /// The width of the area to copy. /// The height of the area to copy. /// /// Thrown when an unsupported component order value is passed. /// - private void CopyTo(PixelArea area, int sourceY, int sourceX, int width, int height) + private void CopyTo(PixelArea area, int sourceX, int sourceY, int width, int height) { switch (area.ComponentOrder) { case ComponentOrder.Zyx: - this.CopyToZyx(area, sourceY, sourceX, width, height); + this.CopyToZyx(area, sourceX, sourceY, width, height); break; case ComponentOrder.Zyxw: - this.CopyToZyxw(area, sourceY, sourceX, width, height); + this.CopyToZyxw(area, sourceX, sourceY, width, height); break; case ComponentOrder.Xyz: - this.CopyToXyz(area, sourceY, sourceX, width, height); + this.CopyToXyz(area, sourceX, sourceY, width, height); break; case ComponentOrder.Xyzw: - this.CopyToXyzw(area, sourceY, sourceX, width, height); + this.CopyToXyzw(area, sourceX, sourceY, width, height); break; default: throw new NotSupportedException(); diff --git a/src/ImageSharp/PixelAccessor.cs b/src/ImageSharp/PixelAccessor.cs index e0f70926d0..7827e7b47b 100644 --- a/src/ImageSharp/PixelAccessor.cs +++ b/src/ImageSharp/PixelAccessor.cs @@ -22,7 +22,7 @@ namespace ImageSharp } /// - protected override void CopyFromXyzw(PixelArea area, int targetY, int targetX, int width, int height) + protected override void CopyFromXyzw(PixelArea area, int targetX, int targetY, int width, int height) { uint byteCount = (uint)width * 4; @@ -36,7 +36,7 @@ namespace ImageSharp } /// - protected override void CopyFromXyz(PixelArea area, int targetY, int targetX, int width, int height) + protected override void CopyFromXyz(PixelArea area, int targetX, int targetY, int width, int height) { for (int y = 0; y < height; y++) { @@ -54,7 +54,7 @@ namespace ImageSharp } /// - protected override void CopyFromZyx(PixelArea area, int targetY, int targetX, int width, int height) + protected override void CopyFromZyx(PixelArea area, int targetX, int targetY, int width, int height) { for (int y = 0; y < height; y++) { @@ -72,7 +72,7 @@ namespace ImageSharp } /// - protected override void CopyFromZyxw(PixelArea area, int targetY, int targetX, int width, int height) + protected override void CopyFromZyxw(PixelArea area, int targetX, int targetY, int width, int height) { for (int y = 0; y < height; y++) { @@ -90,7 +90,7 @@ namespace ImageSharp } /// - protected override void CopyToZyx(PixelArea area, int sourceY, int sourceX, int width, int height) + protected override void CopyToZyx(PixelArea area, int sourceX, int sourceY, int width, int height) { for (int y = 0; y < height; y++) { @@ -110,7 +110,7 @@ namespace ImageSharp } /// - protected override void CopyToXyz(PixelArea area, int sourceY, int sourceX, int width, int height) + protected override void CopyToXyz(PixelArea area, int sourceX, int sourceY, int width, int height) { for (int y = 0; y < height; y++) { @@ -130,7 +130,7 @@ namespace ImageSharp } /// - protected override void CopyToZyxw(PixelArea area, int sourceY, int sourceX, int width, int height) + protected override void CopyToZyxw(PixelArea area, int sourceX, int sourceY, int width, int height) { for (int y = 0; y < height; y++) {