almost complete. decode and encode improvements

1 files changed, 45 insertions, 7 deletions

diff --git a/CST 126/Homework2/Base64Conversion.hpp b/CST 126/Homework2/Base64Conversion.hpp
index 8081abd..1458d29 100644
--- a/CST 126/Homework2/Base64Conversion.hpp
+++ b/CST 126/Homework2/Base64Conversion.hpp
@@ -4,8 +4,6 @@
 #include <bitset>
 #include <vector>
 
-
-
 char CharacterMapArray[] = { 'A', 'B','C', 'D',  'E', 'F','G', 'H' , 'I', 'J','K', 'L' ,
 'M', 'N','O', 'P',  'Q', 'R','S', 'T',  'U', 'V','W', 'X',  'Y', 'Z',
  'a', 'b', 'c', 'd','e', 'f', 'g', 'h', 'i', 'j', 'k', 'l',
@@ -18,8 +16,8 @@ inline char* Base64Encode(char* buffer, const size_t& size)
 	size_t firstvalue, secondvalue, thirdvalue, fourthvalue = 0;
 	
 	
-	std::vector<size_t>TempBuff = {};
-
+	std::vector<char>TempBuff = {};
+	
 	for (auto i = 0, j = 0; i < size; i+=3, j+=4)
 	{
 		
@@ -38,20 +36,60 @@ inline char* Base64Encode(char* buffer, const size_t& size)
 		TempBuff.push_back(CharacterMapArray[thirdvalue]);
 		TempBuff.push_back(CharacterMapArray[fourthvalue]);
 	}
+	
 	size_t NewSize = TempBuff.size();
 
-	delete[] buffer;
 	buffer = nullptr;
 	
 	buffer = new char[NewSize];
 	for (auto i = 0; i < NewSize; i++)
 	{
 		buffer[i] = TempBuff[i];
+		std::cout << buffer[i];
 	}
-	
-	
+
 	return buffer;
+}
+
+inline char* Base64Decode(char* buffer, const size_t size)
+{
+	std::vector<char> TempBuffer = {};
+	size_t firstvalue, secondvalue, thirdvalue = 0;
+
+	for (auto i = 0u; i < size; i++)
+	{
+		for (auto j = 0u; j < size; j++)
+		{
+			if (buffer[i] == CharacterMapArray[j])
+			{
+				buffer[i] = j;break;
+			}
+		}
+	}
 
+	for (auto i = 0u; i < size; i += 4)
+	{
+		firstvalue = buffer[i] ^ (buffer[i + 1] << 6);
+		secondvalue = (buffer[i + 1] >> 2) ^ (buffer[i + 2] << 4);
+		thirdvalue = (buffer[i + 2] >> 4) ^ (buffer[i + 3] << 2);
+		TempBuffer.push_back(firstvalue);
+		TempBuffer.push_back(secondvalue);
+		TempBuffer.push_back(thirdvalue);
+	}
+	size_t NewSize = TempBuffer.size();
+
+	buffer = nullptr;
+
+	buffer = new char[NewSize];
+
+	for (auto i = 0; i < NewSize; i++)
+	{
+		buffer[i] = TempBuffer[i];
+		std::cout << buffer[i];
+	}
+
+
+	return buffer;
 }
 
 #endif
\ No newline at end of file