Translated C code into C++

Author: gage-lodba

CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.11)
-project(FileToByte CXX)
+project(FileToByte)
 
 set(CMAKE_CXX_STANDARD 23)
 set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
@@ -15,7 +15,6 @@ include_directories(imgui/ imgui/backends imgui/misc/cpp)
 file(GLOB sources 
   source/*.cpp 
   source/*.hpp
-  source/fonts/*.cpp
   source/fonts/*.hpp
   imgui/imgui.cpp
   imgui/imgui.h

source/FTB.cpp

@@ -6,53 +6,48 @@
 #include "FTB.hpp"
 
 #include <assert.h>
-#include <sstream>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 
+#include <fstream>
 #include <iomanip>
+#include <ios>
+#include <sstream>
+#include <string>
+#include <vector>
 
 typedef unsigned int stb_uint;
 typedef unsigned char stb_uchar;
 stb_uint stb_compress(stb_uchar *out, stb_uchar *in, stb_uint len);
 
-std::string Convert(const char *filename, const char *symbol) {
-  FILE *f;
-  errno_t err;
-  err = fopen_s(&f, filename, "rb");
+std::string Convert(std::string file_path, std::string array_name) {
+  std::ifstream file(file_path, std::ios::in | std::ios::binary);
 
-  if (!f)
-    return "";
+  if (!file.is_open())
+    return "File failed to open";
 
-  if (err != 0)
-    return "";
+  file.seekg(0, std::ios::end);
+  std::streamsize data_sz = file.tellg();
+  file.seekg(0, std::ios::beg);
 
-  int data_sz;
-
-  if (fseek(f, 0, SEEK_END) || (data_sz = (int)ftell(f)) == -1 ||
-      fseek(f, 0, SEEK_SET)) {
-    fclose(f);
+  if (data_sz == -1) {
     return "";
   }
 
-  char *data = new char[data_sz + 4];
-
-  if (fread(data, 1, data_sz, f) != (size_t)data_sz) {
-    fclose(f);
-    delete[] data;
+  std::vector<char> data(data_sz + 4);
+  if (!file.read(data.data(), data_sz)) {
     return "";
   }
 
-  memset((void *)(((char *)data) + data_sz), 0, 4);
-  fclose(f);
+  memset(data.data() + data_sz, 0, 4);
 
   int maxlen = data_sz + 512 + (data_sz >> 2) + sizeof(int);
-  char *compressed = new char[maxlen];
-  int compressed_sz =
-      stb_compress((stb_uchar *)compressed, (stb_uchar *)data, data_sz);
+  std::vector<char> compressed(maxlen);
+  int compressed_sz = stb_compress(
+      reinterpret_cast<stb_uchar *>(compressed.data()),
+      reinterpret_cast<stb_uchar *>(data.data()), static_cast<int>(data_sz));
 
-  memset(compressed + compressed_sz, 0, maxlen - compressed_sz);
+  memset(compressed.data() + compressed_sz, 0, maxlen - compressed_sz);
 
   std::ostringstream stream;
 
@@ -61,15 +56,15 @@ std::string Convert(const char *filename, const char *symbol) {
   stream << " *\tGenerated by File To Byte\n";
   stream << " *\thttps://github.com/JerimiahOfficial/FileToByte\n";
   stream << " */\n\n";
-  stream << "static const unsigned int " << symbol
+  stream << "static const unsigned int " << array_name
          << "_compressed_size = " << (int)compressed_sz << ";\n";
-  stream << "static const unsigned int " << symbol << "_compressed_data["
+  stream << "static const unsigned int " << array_name << "_compressed_data["
          << (int)((compressed_sz + 3) / 4) * 4 << " / 4] = {";
 
   int column = 0;
   for (int i = 0; i < compressed_sz; i += 4) {
-    unsigned int d = *(unsigned int *)(compressed + i);
-    if ((column++ % 12) == 0)
+    unsigned int d = *reinterpret_cast<unsigned int *>(compressed.data() + i);
+    if ((column++ % 8) == 0)
       stream << "\n\t0x" << std::hex << std::setw(8) << std::setfill('0') << d
              << ", ";
     else
@@ -78,9 +73,6 @@ std::string Convert(const char *filename, const char *symbol) {
   }
   stream << "\n};\n";
 
-  delete[] data;
-  delete[] compressed;
-
   return stream.str();
 }
 

source/FTB.hpp

@@ -1,4 +1,4 @@
 #pragma once
 #include <string>
 
-extern std::string Convert(const char *filename, const char *symbol);
+extern std::string Convert(std::string filename, std::string symbol);

source/application.cpp

@@ -12,6 +12,15 @@
 #include "fonts/Consolas.hpp"
 #include "fonts/Roboto.hpp"
 
+ImFont *Roboto = nullptr;
+ImFont *Consolas = nullptr;
+
+bool open = true;
+
+std::string VarName;
+std::string FilePath;
+std::string Result;
+
 #if defined(_MSC_VER) && (_MSC_VER >= 1900) &&                                 \
     !defined(IMGUI_DISABLE_WIN32_FUNCTIONS)
 #pragma comment(lib, "legacy_stdio_definitions")
@@ -465,10 +474,10 @@ void Application::Initialize() {
   ImFontConfig fontConfig;
   fontConfig.FontDataOwnedByAtlas = false;
 
-  ImFont *Roboto = io.Fonts->AddFontFromMemoryCompressedTTF(
+  Roboto = io.Fonts->AddFontFromMemoryCompressedTTF(
       Roboto_compressed_data, Roboto_compressed_size, 14.f, &fontConfig);
 
-  ImFont *Consolas = io.Fonts->AddFontFromMemoryCompressedTTF(
+  Consolas = io.Fonts->AddFontFromMemoryCompressedTTF(
       Consolas_compressed_data, Consolas_compressed_size, 14.f, &fontConfig);
 
   io.FontDefault = Roboto;
@@ -535,15 +544,6 @@ void Application::Run() {
   }
 }
 
-ImFont *Roboto = nullptr;
-ImFont *Consolas = nullptr;
-
-bool open = true;
-
-std::string VarName;
-std::string FilePath;
-std::string Result;
-
 void Application::ApplyTheme() {
   ImColor Dim = ImColor(32, 32, 32);
   ImColor Faint = ImColor(40, 40, 40);
@@ -587,7 +587,6 @@ void Application::Render() {
   ImGui::Begin("File To Byte", &open, window_flags);
 
   ImGui::Columns(2, "locations", false);
-  ImGui::PushFont(Roboto);
 
   ImGui::Text("Array Name");
 
@@ -596,7 +595,7 @@ void Application::Render() {
   ImGui::PopItemWidth();
 
   if (ImGui::Button("Convert", ImVec2(-1, 25.f)))
-    Result = Convert(FilePath.c_str(), VarName.c_str());
+    Result = Convert(FilePath, VarName);
 
   ImGui::NextColumn();
 
@@ -612,7 +611,6 @@ void Application::Render() {
     ImGui::LogFinish();
   }
 
-  ImGui::PopFont();
   ImGui::Columns();
 
   ImGui::PushFont(Consolas);