more changes

1 files changed, 13 insertions, 17 deletions

diff --git a/CST 126/Homework2/Base64Conversion.hpp b/CST 126/Homework2/Base64Conversion.hpp
index 9559467..8081abd 100644
--- a/CST 126/Homework2/Base64Conversion.hpp
+++ b/CST 126/Homework2/Base64Conversion.hpp
@@ -4,6 +4,8 @@
 #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',
@@ -15,10 +17,10 @@ inline char* Base64Encode(char* buffer, const size_t& size)
 {
 	size_t firstvalue, secondvalue, thirdvalue, fourthvalue = 0;
 	
-	char* TempBuff = new char[size];
 	
+	std::vector<size_t>TempBuff = {};
 
-	for (auto i = 0; i < size; i+=3)
+	for (auto i = 0, j = 0; i < size; i+=3, j+=4)
 	{
 		
 		firstvalue = buffer[i] & 0x3f;
@@ -31,28 +33,22 @@ inline char* Base64Encode(char* buffer, const size_t& size)
 		fourthvalue &= 0x3f;
 
 
-	
-
-		TempBuff[i] = CharacterMapArray[firstvalue];
-		TempBuff[i + 1] = CharacterMapArray[secondvalue];
-		TempBuff[i + 2] = CharacterMapArray[thirdvalue];
-		TempBuff[i + 3] = CharacterMapArray[fourthvalue];
+		TempBuff.push_back(CharacterMapArray[firstvalue]);
+		TempBuff.push_back(CharacterMapArray[secondvalue]);
+		TempBuff.push_back(CharacterMapArray[thirdvalue]);
+		TempBuff.push_back(CharacterMapArray[fourthvalue]);
 	}
+	size_t NewSize = TempBuff.size();
+
 	delete[] buffer;
 	buffer = nullptr;
-
-	buffer = new char[size];
-	for (auto i = 0; i < size; i++)
+	
+	buffer = new char[NewSize];
+	for (auto i = 0; i < NewSize; i++)
 	{
 		buffer[i] = TempBuff[i];
 	}
 	
-
-	
-	//load the bytes into a block
-	//then and by 0x3f
-	//shift left by 6
-	//then again
 	
 	return buffer;