eifviewer [add] convert functions

[ref] move code to eif lib

Author: bigunclemax

EifViewer/CMakeLists.txt

@@ -4,9 +4,12 @@ cmake_minimum_required(VERSION 3.10)
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/bin")
 
-add_executable(eifviewer EifImage.cpp imgViewer.cpp ./EasyBMP/EasyBMP.cpp)
+add_library(eif EifConverter.cpp ./EasyBMP/EasyBMP.cpp)
+add_executable(eifviewer  main.cpp)
+target_link_libraries(eifviewer eif)
 include_directories(../cxxopts/include)
 include_directories(../CRCpp/inc)
+include_directories(../utils)
 include_directories(./EasyBMP)
 
 install(TARGETS eifviewer)

EifViewer/EifImage.cpp EifViewer/EifConverter.cppEifViewer/EifImage.cpp renamed to EifViewer/EifConverter.cpp

@@ -2,11 +2,13 @@
 // Created by bigun on 12/28/2018.
 //
 
-#include "EifImage.h"
+#include "EifConverter.h"
 #include "FordPalette.h"
 #include <fstream>
 #include <limits>
 
+using namespace EIF;
+
 int EifImage8bit::openBmp(std::string file_name) {
 
     BMP bmp_image;
@@ -77,7 +79,7 @@ void EifImage8bit::saveEif(std::string file_name) {
 void EifImage8bit::saveBmp(std::string file_name){
 
     BMP bmp_image;
-    bmp_image.SetSize(width, height);
+    bmp_image.SetSize((int)width, (int)height);
 
     for(auto i =0; i < height; i++){
         for(auto j=0; j < width; j++){
@@ -301,7 +303,7 @@ void EifImage16bit::saveBmp(std::string file_name) {
 
     BMP bmp_image;
     bmp_image.SetBitDepth(32);
-    bmp_image.SetSize(width, height);
+    bmp_image.SetSize((int)width, (int)height);
 
     for(auto i =0; i < height; i++){
         for(auto j=0; j < width; j++){
@@ -373,7 +375,7 @@ void EifImage32bit::saveBmp(std::string file_name) {
 
     BMP bmp_image;
     bmp_image.SetBitDepth(32);
-    bmp_image.SetSize(width, height);
+    bmp_image.SetSize((int)width, (int)height);
 
     for(auto i =0; i < height; i++){
         for(auto j=0; j < width; j++){
@@ -455,3 +457,46 @@ void EifImage32bit::saveEif(std::string file_name) {
     }
     out_file.close();
 }
+
+void EifConverter::eifToBmpFile(const std::vector<uint8_t>& data, const std::string& out_file_name) {
+
+    EifImageBase* image;
+
+    if(data[7] == EIF_TYPE_MONOCHROME) {
+        image = new EifImage8bit;
+    } else if(data[7] == EIF_TYPE_MULTICOLOR) {
+        image = new EifImage16bit;
+    } else if(data[7] == EIF_TYPE_SUPERCOLOR){
+        image = new EifImage32bit;
+    } else {
+        throw std::runtime_error("Unsupported EIF format");
+    }
+
+    image->openEif(data);
+    image->saveBmp(out_file_name);
+
+    delete image;
+}
+
+void EifConverter::bmpFileToEifFile(const std::string& file_name, uint8_t depth, const std::string& out_file_name) {
+
+    EifImageBase* image;
+    switch (depth) {
+        case 8:
+            image = new EifImage8bit;
+            break;
+        case 16:
+            image = new EifImage16bit;
+            break;
+        case 32:
+            image = new EifImage32bit;
+            break;
+        default:
+            throw std::runtime_error("Incorrect depth value");
+    }
+
+    image->openBmp(file_name);
+    image->saveEif(out_file_name);
+
+    delete image;
+}

EifViewer/EifImage.h EifViewer/EifConverter.hEifViewer/EifImage.h renamed to EifViewer/EifConverter.h

@@ -13,6 +13,8 @@
 #ifndef VBFEDIT_EIFIMAGE_H
 #define VBFEDIT_EIFIMAGE_H
 
+namespace EIF {
+
 static const uint8_t EIF_SIGNATURE[] = {'E','B','D',0x10,'E','I','F'};
 static const uint8_t EIF_TYPE_MONOCHROME = 0x04;
 static const uint8_t EIF_TYPE_MULTICOLOR = 0x07;
@@ -37,7 +39,7 @@ class EifImageBase {
     virtual int openBmp(std::string fileName) = 0;
     virtual void saveBmp(std::string fileName) = 0;
     virtual void saveEif(std::string fileName) = 0;
-    virtual ~EifImageBase(){};
+    virtual ~EifImageBase()= default;
 };
 
 class EifImage8bit: public EifImageBase {
@@ -50,7 +52,7 @@ class EifImage8bit: public EifImageBase {
 
 class EifImage16bit: public EifImageBase {
     std::vector<uint8_t> palette;
-    uint8_t searchPixel(RGBApixel rgb_pixel);
+    static uint8_t searchPixel(RGBApixel rgb_pixel);
 public:
     int openEif(const std::vector<uint8_t>& data) override;
     void saveBmp(std::string file_name) override;
@@ -66,5 +68,13 @@ class EifImage32bit: public EifImageBase {
     void saveEif(std::string file_name) override;
 };
 
+class EifConverter {
+
+public:
+    static void eifToBmpFile(const std::vector<uint8_t>& data, const std::string& out_file_name);
+    static void bmpFileToEifFile(const std::string& file_name, uint8_t depth, const std::string& out_file_name);
+};
+
+}
 #endif //VBFEDIT_EIFIMAGE_H
 

EifViewer/imgViewer.cpp EifViewer/main.cppEifViewer/imgViewer.cpp renamed to EifViewer/main.cpp

@@ -2,13 +2,11 @@
 // Created by bigun on 12/23/2018.
 //
 #include <iostream>
-#include <fstream>
 #include <vector>
-#include <iomanip>
 #include <cxxopts.hpp>
-#include <exception>
+#include <utils.h>
 
-#include "EifImage.h"
+#include "EifConverter.h"
 
 using namespace std;
 
@@ -20,7 +18,7 @@ int main(int argc, char **argv)
         bool unpack = false;
         unsigned depth = 32;
 
-        cxxopts::Options options("eif2bitmap", "Ford EDB.EIF viewer ");
+        cxxopts::Options options("eifconverter", "Ford EDB.EIF converter");
         options.add_options()
                 ("p,pack","Pack VBF file", cxxopts::value<bool>(pack))
                 ("u,unpack","Unpack VBF file", cxxopts::value<bool>(unpack))
@@ -49,65 +47,27 @@ int main(int argc, char **argv)
         }
 
         if(unpack) {
-            ifstream in_file(input_file_name, ios::binary | ios::ate);
-            if(in_file.fail())
-                throw runtime_error("File open error");
-
-            auto pos = in_file.tellg();
-            in_file.seekg(0, ios::beg);
-
-            vector<uint8_t> file_content(pos);
-            in_file.read(reinterpret_cast<char *>(&file_content[0]), file_content.size());
-            if(in_file.fail())
-                throw runtime_error("File open error");
-            in_file.close();
 
             if(out_file_name.empty()){
                 out_file_name = input_file_name + ".bmp";
             }
 
-            EifImageBase* image;
-
-            if(file_content[7] == EIF_TYPE_MONOCHROME) {
-                image = new EifImage8bit;
-            } else if(file_content[7] == EIF_TYPE_MULTICOLOR) {
-                image = new EifImage16bit;
-            } else if(file_content[7] == EIF_TYPE_SUPERCOLOR){
-                image = new EifImage32bit;
-            } else {
-                throw runtime_error("unsupported format");
-            }
-
-            image->openEif(file_content);
-            image->saveBmp(out_file_name);
-
-            delete image;
+            vector<uint8_t> v;
+            FTUtils::fileToVector(input_file_name, v);
+            EIF::EifConverter::eifToBmpFile(v, out_file_name);
 
         } else if(pack) {
 
             if(out_file_name.empty()){
                 out_file_name = input_file_name + ".eif";
             }
 
-            EifImageBase* image;
-            switch (depth) {
-                case 8:
-                    image = new EifImage8bit;
-                    break;
-                case 16:
-                    image = new EifImage16bit;
-                    break;
-                case 32:
-                    image = new EifImage32bit;
-                    break;
-                default:
-                    throw runtime_error("Incorrect depth value");
+            if(depth != 8 && depth != 16 && depth != 32) {
+                cout << "Incorrect color depth value. It's may be only 8|16|32" << std::endl;
+                return 0;
             }
 
-            image->openBmp(input_file_name);
-            image->saveEif(out_file_name);
-
-            delete image;
+            EIF::EifConverter::bmpFileToEifFile(input_file_name, depth, out_file_name);
         }
     } catch (const cxxopts::OptionException& e){
         cout << "error parsing options: " << e.what() << endl;