From 844a46c83a6543604f9309c56a7b6fbc8abfa7ae Mon Sep 17 00:00:00 2001
From: jakcron <jkrcarr@gmail.com>
Date: Thu, 6 Jul 2017 20:56:52 +1000
Subject: [PATCH] [nx] AciHeader updated to inherit from ISerialisableBinary.

---
 lib/nx/AciHeader.cpp | 40 ++++++++++++++++++++++++++++++++++++++--
 lib/nx/AciHeader.h   |  5 ++++-
 2 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/lib/nx/AciHeader.cpp b/lib/nx/AciHeader.cpp
index 61b00fc..6acb027 100644
--- a/lib/nx/AciHeader.cpp
+++ b/lib/nx/AciHeader.cpp
@@ -19,6 +19,37 @@ void AciHeader::calculateSectionOffsets()
 	mKc.offset = mSac.offset + align(mSac.size, kAciAlignSize);
 }
 
+bool AciHeader::isEqual(const AciHeader & other) const
+{
+	return (mType == other.mType) \
+		&& (mProgramId == other.mProgramId) \
+		&& (mFac.offset == other.mFac.offset) \
+		&& (mFac.size == other.mFac.size) \
+		&& (mSac.offset == other.mSac.offset) \
+		&& (mSac.size == other.mSac.size) \
+		&& (mKc.offset == other.mKc.offset) \
+		&& (mKc.size == other.mKc.size);
+}
+
+void AciHeader::copyFrom(const AciHeader & other)
+{
+	if (other.getSize())
+	{
+		importBinary(other.getBytes(), other.getSize());
+	}
+	else
+	{
+		mType = other.mType;
+		mProgramId = other.mProgramId;
+		mFac.offset = other.mFac.offset;
+		mFac.size = other.mFac.size;
+		mSac.offset = other.mSac.offset;
+		mSac.size = other.mSac.size;
+		mKc.offset = other.mKc.offset;
+		mKc.size = other.mKc.size;
+	}
+}
+
 AciHeader::AciHeader()
 {
 	clearVariables();
@@ -34,9 +65,14 @@ AciHeader::AciHeader(const u8 * bytes)
 	importBinary(bytes);
 }
 
-bool AciHeader::operator==(const AciHeader & other)
+bool AciHeader::operator==(const AciHeader & other) const
 {
-	return memcmp(this->getBytes(), other.getBytes(), this->getSize());
+	return isEqual(other);
+}
+
+bool AciHeader::operator!=(const AciHeader & other) const
+{
+	return !isEqual(other);
 }
 
 void AciHeader::operator=(const AciHeader & other)
diff --git a/lib/nx/AciHeader.h b/lib/nx/AciHeader.h
index c1e0195..657b68e 100644
--- a/lib/nx/AciHeader.h
+++ b/lib/nx/AciHeader.h
@@ -23,7 +23,8 @@ public:
 	AciHeader(const AciHeader& other);
 	AciHeader(const u8* bytes);
 
-	bool operator==(const AciHeader& other);
+	bool operator==(const AciHeader& other) const;
+	bool operator!=(const AciHeader& other) const;
 	void operator=(const AciHeader& other);
 
 	// to be used after export
@@ -102,5 +103,7 @@ private:
 
 	void clearVariables();
 	void calculateSectionOffsets();
+	bool isEqual(const AciHeader& other) const;
+	void copyFrom(const AciHeader& other);
 };