more changes to encode/decode

1 files changed, 17 insertions, 32 deletions

diff --git a/CST 126/Homework2/Base64Conversion.hpp b/CST 126/Homework2/Base64Conversion.hpp
index 1458d29..16e414f 100644
--- a/CST 126/Homework2/Base64Conversion.hpp
+++ b/CST 126/Homework2/Base64Conversion.hpp
@@ -3,28 +3,26 @@
 #include "Base64Helper.hpp"
 #include <bitset>
 #include <vector>
-
+#include <string>
 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',
 	'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x','y', 'z',
 	'0', '1', '2', '3','4', '5', '6', '7','8', '9', '/', '+'};
 
-
-inline char* Base64Encode(char* buffer, const size_t& size)
+std::string Base64Encode(char* buffer, const size_t& size)
 {
-	size_t firstvalue, secondvalue, thirdvalue, fourthvalue = 0;
-	
+	uint8_t firstvalue, secondvalue, thirdvalue, fourthvalue = 0;
 	
-	std::vector<char>TempBuff = {};
-	
-	for (auto i = 0, j = 0; i < size; i+=3, j+=4)
+	std::string TempBuff = {};
+
+	for (auto i = 0, j = 0; i < size; i += 3, j += 4)
 	{
-		
+
 		firstvalue = buffer[i] & 0x3f;
 		secondvalue = ((buffer[i] >> 6) ^ (buffer[i + 1] << 2));
 		secondvalue &= 0x3f;
-	
+
 		thirdvalue = ((buffer[i + 1] >> 4) ^ (buffer[i + 2] << 4));
 		thirdvalue &= 0x3f;
 		fourthvalue = (buffer[i + 2] >> 2);
@@ -36,25 +34,14 @@ inline char* Base64Encode(char* buffer, const size_t& size)
 		TempBuff.push_back(CharacterMapArray[thirdvalue]);
 		TempBuff.push_back(CharacterMapArray[fourthvalue]);
 	}
-	
-	size_t NewSize = TempBuff.size();
 
-	buffer = nullptr;
-	
-	buffer = new char[NewSize];
-	for (auto i = 0; i < NewSize; i++)
-	{
-		buffer[i] = TempBuff[i];
-		std::cout << buffer[i];
-	}
-
-	return buffer;
+	return TempBuff;
 }
 
-inline char* Base64Decode(char* buffer, const size_t size)
+std::string Base64Decode(char* buffer, const size_t size)
 {
-	std::vector<char> TempBuffer = {};
-	size_t firstvalue, secondvalue, thirdvalue = 0;
+	std::string TempBuffer = {};
+	uint8_t firstvalue, secondvalue, thirdvalue = 0;
 
 	for (auto i = 0u; i < size; i++)
 	{
@@ -76,20 +63,18 @@ inline char* Base64Decode(char* buffer, const size_t size)
 		TempBuffer.push_back(secondvalue);
 		TempBuffer.push_back(thirdvalue);
 	}
-	size_t NewSize = TempBuffer.size();
-
-	buffer = nullptr;
-
-	buffer = new char[NewSize];
+	//size_t NewSize = TempBuffer.size();
 
+	/*buffer = new char[NewSize];
+	
 	for (auto i = 0; i < NewSize; i++)
 	{
 		buffer[i] = TempBuffer[i];
 		std::cout << buffer[i];
-	}
+	}*/
 
 
-	return buffer;
+	return TempBuffer;
 }
 
 #endif
\ No newline at end of file