From 65c3c44ab58086a0b5737277a7747b342bb3747c Mon Sep 17 00:00:00 2001
From: Brian Popow <popow@gmx.de>
Date: Wed, 24 Aug 2022 06:17:12 +0200
Subject: [PATCH] Avoid code duplication

---
 .../Metadata/Profiles/IPTC/IptcProfile.cs     | 45 ++++++++++---------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/src/ImageSharp/Metadata/Profiles/IPTC/IptcProfile.cs b/src/ImageSharp/Metadata/Profiles/IPTC/IptcProfile.cs
index 07b6b73606..0a6831e9b4 100644
--- a/src/ImageSharp/Metadata/Profiles/IPTC/IptcProfile.cs
+++ b/src/ImageSharp/Metadata/Profiles/IPTC/IptcProfile.cs
@@ -256,27 +256,21 @@ namespace SixLabors.ImageSharp.Metadata.Profiles.Iptc
 
             if (hasValuesInUtf8)
             {
-                length += 5 + CodedCharacterSetUtf8Value.Length; // Additional length for UTF-8 Tag.
+                // Additional length for UTF-8 Tag.
+                length += 5 + CodedCharacterSetUtf8Value.Length;
             }
 
             this.Data = new byte[length];
-            int i = 0;
-
+            int offset = 0;
             if (hasValuesInUtf8)
             {
-                // Envelope Record.
-                this.Data[i++] = IptcTagMarkerByte;
-                this.Data[i++] = (byte)IptcRecordNumber.Envelope;
-                this.Data[i++] = IptcEnvelopeCodedCharacterSet;
-                this.Data[i++] = (byte)(CodedCharacterSetUtf8Value.Length >> 8);
-                this.Data[i++] = (byte)CodedCharacterSetUtf8Value.Length;
-                Buffer.BlockCopy(CodedCharacterSetUtf8Value, 0, this.Data, i, CodedCharacterSetUtf8Value.Length);
-                i += CodedCharacterSetUtf8Value.Length;
+                // Write Envelope Record.
+                offset = this.WriteRecord(offset, CodedCharacterSetUtf8Value, IptcRecordNumber.Envelope, IptcEnvelopeCodedCharacterSet);
             }
 
             foreach (IptcValue value in this.Values)
             {
-                // Application Record.
+                // Write Application Record.
                 // +-----------+----------------+---------------------------------------------------------------------------------+
                 // | Octet Pos | Name           | Description                                                                     |
                 // +==========-+================+=================================================================================+
@@ -293,17 +287,24 @@ namespace SixLabors.ImageSharp.Metadata.Profiles.Iptc
                 // |           | Octet Count    | the following data field(32767 or fewer octets). Note that the value of bit 7 of|
                 // |           |                | octet 4(most significant bit) always will be 0.                                 |
                 // +-----------+----------------+---------------------------------------------------------------------------------+
-                this.Data[i++] = IptcTagMarkerByte;
-                this.Data[i++] = (byte)IptcRecordNumber.Application;
-                this.Data[i++] = (byte)value.Tag;
-                this.Data[i++] = (byte)(value.Length >> 8);
-                this.Data[i++] = (byte)value.Length;
-                if (value.Length > 0)
-                {
-                    Buffer.BlockCopy(value.ToByteArray(), 0, this.Data, i, value.Length);
-                    i += value.Length;
-                }
+                offset = this.WriteRecord(offset, value.ToByteArray(), IptcRecordNumber.Application, (byte)value.Tag);
+            }
+        }
+
+        private int WriteRecord(int offset, byte[] recordData, IptcRecordNumber recordNumber, byte recordBinaryRepresentation)
+        {
+            this.Data[offset++] = IptcTagMarkerByte;
+            this.Data[offset++] = (byte)recordNumber;
+            this.Data[offset++] = recordBinaryRepresentation;
+            this.Data[offset++] = (byte)(recordData.Length >> 8);
+            this.Data[offset++] = (byte)recordData.Length;
+            if (recordData.Length > 0)
+            {
+                Buffer.BlockCopy(recordData, 0, this.Data, offset, recordData.Length);
+                offset += recordData.Length;
             }
+
+            return offset;
         }
 
         private void Initialize()