From f1b9f2a6b9753b7e911bc8042fc0cdef5e04db87 Mon Sep 17 00:00:00 2001
From: Michael Becker <alcexhim@gmail.com>
Date: Fri, 15 Nov 2019 22:13:10 -0500
Subject: [PATCH] move common Align() functionality into ReaderWriterBase

---
 .../UniversalEditor.Core/IO/Reader.cs         | 15 -----------
 .../IO/ReaderWriterBase.cs                    | 27 +++++++++++++++++--
 .../UniversalEditor.Core/IO/Writer.cs         | 15 -----------
 3 files changed, 25 insertions(+), 32 deletions(-)

diff --git a/CSharp/Libraries/UniversalEditor.Core/IO/Reader.cs b/CSharp/Libraries/UniversalEditor.Core/IO/Reader.cs
index 8fef0fdd..317f1246 100644
--- a/CSharp/Libraries/UniversalEditor.Core/IO/Reader.cs
+++ b/CSharp/Libraries/UniversalEditor.Core/IO/Reader.cs
@@ -1506,21 +1506,6 @@ namespace UniversalEditor.IO
 			return buffer2;
 		}
 
-		/// <summary>
-		/// Aligns the <see cref="Reader" /> to the specified number of bytes. If the current
-		/// position of the <see cref="Reader" /> is not a multiple of the specified number of bytes,
-		/// the position will be increased by the amount of bytes necessary to bring it to the
-		/// aligned position.
-		/// </summary>
-		/// <param name="alignTo">The number of bytes on which to align the <see cref="Reader"/>.</param>
-		/// <param name="extraPadding">Any additional padding bytes that should be included after aligning to the specified boundary.</param>
-		public void Align(int alignTo, int extraPadding = 0)
-		{
-			long paddingCount = ((alignTo - (base.Accessor.Position % alignTo)) % alignTo);
-			paddingCount += extraPadding;
-			base.Accessor.Position += paddingCount;
-		}
-
 		public string PeekFixedLengthString(int count)
 		{
 			return PeekFixedLengthString(count, base.Accessor.DefaultEncoding);
diff --git a/CSharp/Libraries/UniversalEditor.Core/IO/ReaderWriterBase.cs b/CSharp/Libraries/UniversalEditor.Core/IO/ReaderWriterBase.cs
index bf15593b..6920ee4e 100644
--- a/CSharp/Libraries/UniversalEditor.Core/IO/ReaderWriterBase.cs
+++ b/CSharp/Libraries/UniversalEditor.Core/IO/ReaderWriterBase.cs
@@ -85,6 +85,29 @@ namespace UniversalEditor.IO
             this.mvarAccessor = accessor;
             this.mvarEndianness = Endianness.LittleEndian;
             this.mvarReverse = false;
-        }
-    }
+		}
+
+		/// <summary>
+		/// Aligns the <see cref="Reader" /> to the specified number of bytes. If the current
+		/// position of the <see cref="Reader" /> is not a multiple of the specified number of bytes,
+		/// the position will be increased by the amount of bytes necessary to bring it to the
+		/// aligned position.
+		/// </summary>
+		/// <param name="alignTo">The number of bytes on which to align the <see cref="Reader"/>.</param>
+		/// <param name="extraPadding">Any additional padding bytes that should be included after aligning to the specified boundary.</param>
+		public void Align(int alignTo, int extraPadding = 0)
+		{
+			long paddingCount = ((alignTo - (Accessor.Position % alignTo)) % alignTo);
+			paddingCount += extraPadding;
+
+			if (Accessor.Position == Accessor.Length)
+			{
+				Accessor.Writer.WriteBytes(new byte[paddingCount]);
+			}
+			else
+			{
+				Accessor.Position += paddingCount;
+			}
+		}
+	}
 }
diff --git a/CSharp/Libraries/UniversalEditor.Core/IO/Writer.cs b/CSharp/Libraries/UniversalEditor.Core/IO/Writer.cs
index 345541ef..2c6291fc 100644
--- a/CSharp/Libraries/UniversalEditor.Core/IO/Writer.cs
+++ b/CSharp/Libraries/UniversalEditor.Core/IO/Writer.cs
@@ -845,21 +845,6 @@ namespace UniversalEditor.IO
 			return num;
 		}
 
-		/// <summary>
-		/// Aligns the <see cref="Writer" /> to the specified number of bytes. If the current
-		/// position of the <see cref="Writer" /> is not a multiple of the specified number of bytes,
-		/// the position will be increased by the amount of bytes necessary to bring it to the
-		/// aligned position.
-		/// </summary>
-		/// <param name="alignTo">The number of bytes on which to align the <see cref="Writer"/>.</param>
-		/// <param name="extraPadding">Any additional padding bytes that should be included after aligning to the specified boundary.</param>
-		public void Align(int alignTo, int extraPadding = 0)
-		{
-			long paddingCount = ((alignTo - (base.Accessor.Position % alignTo)) % alignTo);
-			paddingCount += extraPadding;
-			base.Accessor.Position += paddingCount;
-		}
-
 		public void WriteDoubleEndianInt16(short value)
 		{
 			WriteInt16(value);