eifviewer [fix] conversion form BMP to 16bit EIFs

Not all EIF contains same color palette, so the -s param has been added. It's allow specify source EIF palette. Also 16bit EIFs palettes are now extracted and has .pal prefix.

Author: bigunclemax

EifViewer/EifConverter.cpp

@@ -3,9 +3,9 @@
 //
 
 #include "EifConverter.h"
-#include "FordPalette.h"
 #include <fstream>
 #include <limits>
+#include <utils.h>
 
 using namespace EIF;
 
@@ -18,9 +18,6 @@ int EifImage8bit::openBmp(std::string file_name) {
     width = (unsigned)bmp_image.TellWidth();
     height = (unsigned)bmp_image.TellHeight();
 
-    std::cout << "Open pic: " << file_name << " Bit depth: "
-              << depth << "W: " << width <<"H: " << height;
-
     auto aligned_width = (width % 4) ? (width/4 + 1)*4 : width;
     bitmap_data.clear();
     bitmap_data.resize(height * aligned_width);
@@ -206,10 +203,10 @@ uint8_t EifImage16bit::searchPixel(RGBApixel rgb_pixel) {
     double color_distance = std::numeric_limits<double>::max();
     uint8_t closest_index =0;
 
-    for(auto i=0; i < palette_bin_len; i+=3) {
-        int R = palette_bin[i];
-        int G = palette_bin[i+1];
-        int B = palette_bin[i+2];
+    for(auto i=0; i < EIF_MULTICOLOR_PALETTE_SIZE; i+=3) {
+        int R = palette[i];
+        int G = palette[i+1];
+        int B = palette[i+2];
 
         double color_distance_new = sqrt(
                 pow((rgb_pixel.Blue - B),2) +
@@ -230,16 +227,18 @@ uint8_t EifImage16bit::searchPixel(RGBApixel rgb_pixel) {
 
 int EifImage16bit::openBmp(std::string file_name) {
 
+    if(palette.empty()) {
+        std::cerr << "Can't open bmp file: " << file_name << " Palette required" << std::endl;
+        return 0;
+    }
+
     BMP bmp_image;
     bmp_image.ReadFromFile(file_name.c_str());
 
     auto depth = bmp_image.TellBitDepth();
     width = (unsigned)bmp_image.TellWidth();
     height = (unsigned)bmp_image.TellHeight();
 
-    std::cout << "Open pic: " << file_name << " Bit depth: "
-              << depth << "W: " << width <<"H: " << height;
-
     auto aligned_width = (width % 2) ? (width/2 + 1)*2 : width;
     bitmap_data.clear();
     bitmap_data.resize(height * aligned_width * 2);
@@ -283,8 +282,8 @@ void EifImage16bit::saveEif(std::string file_name) {
     header.length = bitmap_data.size();
 
     /* set palette */
-    for(int i=0; i < palette_bin_len; i++) {
-        eif_img.push_back(palette_bin[i]);
+    for(int i=0; i < EIF_MULTICOLOR_PALETTE_SIZE; i++) {
+        eif_img.push_back(palette[i]);
     }
 
     /* set pixels */
@@ -322,6 +321,28 @@ void EifImage16bit::saveBmp(std::string file_name) {
     bmp_image.WriteToFile(file_name.c_str());
 }
 
+int EifImage16bit::setPalette(const std::vector<uint8_t> &data) {
+
+    if(data.size() != EIF_MULTICOLOR_PALETTE_SIZE) {
+        std::cerr << "Error: palette wrong size" << std::endl;
+        return -1;
+    }
+
+    palette = data;
+
+    return 0;
+}
+
+void EifImage16bit::savePalette(const std::string& file_name) {
+
+    if(palette.size() != EIF_MULTICOLOR_PALETTE_SIZE) {
+        std::cerr << "Error: palette wrong size" << std::endl;
+        return;
+    }
+
+    FTUtils::bufferToFile(file_name, (char *)palette.data(), EIF_MULTICOLOR_PALETTE_SIZE);
+}
+
 int EifImage32bit::openEif(const std::vector<uint8_t> &data) {
 
     if(data.size() < sizeof(EifBaseHeader)){
@@ -402,9 +423,6 @@ int EifImage32bit::openBmp(std::string file_name) {
     width = (unsigned)bmp_image.TellWidth();
     height = (unsigned)bmp_image.TellHeight();
 
-    std::cout << "Open pic: " << file_name << " Bit depth: "
-    << depth << "W: " << width <<"H: " << height;
-
     bitmap_data.clear();
     bitmap_data.resize(height * width * 4);
 
@@ -474,19 +492,31 @@ void EifConverter::eifToBmpFile(const std::vector<uint8_t>& data, const std::str
 
     image->openEif(data);
     image->saveBmp(out_file_name);
+    if(data[7] == EIF_TYPE_MULTICOLOR) {
+        dynamic_cast<EifImage16bit*>(image)->savePalette(out_file_name+".pal");
+    }
 
     delete image;
 }
 
-void EifConverter::bmpFileToEifFile(const std::string& file_name, uint8_t depth, const std::string& out_file_name) {
+void EifConverter::bmpFileToEifFile(const std::string& file_name, uint8_t depth, const std::string& out_file_name,
+        const std::string& palette_file_name)
+{
 
     EifImageBase* image;
     switch (depth) {
         case 8:
             image = new EifImage8bit;
             break;
-        case 16:
+        case 16: {
             image = new EifImage16bit;
+            if(palette_file_name.empty()) {
+                throw std::runtime_error("Incorrect palette path");
+            }
+            std::vector<uint8_t> palette;
+            FTUtils::fileToVector(palette_file_name, palette);
+            dynamic_cast<EifImage16bit*>(image)->setPalette(palette);
+        }
             break;
         case 32:
             image = new EifImage32bit;

EifViewer/EifConverter.h

@@ -47,17 +47,19 @@ class EifImage8bit: public EifImageBase {
     int openEif(const std::vector<uint8_t>& data) override;
     void saveBmp(std::string file_name) override;
     int openBmp(std::string file_name) override;
-    void saveEif(std::string file_name)override;
+    void saveEif(std::string file_name) override;
 };
 
 class EifImage16bit: public EifImageBase {
     std::vector<uint8_t> palette;
-    static uint8_t searchPixel(RGBApixel rgb_pixel);
+    uint8_t searchPixel(RGBApixel rgb_pixel);
 public:
     int openEif(const std::vector<uint8_t>& data) override;
     void saveBmp(std::string file_name) override;
     int openBmp(std::string file_name) override;
-    void saveEif(std::string file_name)override;
+    void saveEif(std::string file_name) override;
+    int setPalette(const std::vector<uint8_t>& data);
+    void savePalette(const std::string& file_name);
 };
 
 class EifImage32bit: public EifImageBase {
@@ -72,7 +74,8 @@ 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);
+    static void bmpFileToEifFile(const std::string& file_name, uint8_t depth, const std::string& out_file_name,
+            const std::string& palette_file_name = "");
 };
 
 }

EifViewer/FordPalette.h

@@ -25,6 +25,7 @@ int main(int argc, char **argv)
                 ("d,depth","Output Eif type 8/16/32", cxxopts::value<unsigned>(depth))
                 ("i,input","Input file", cxxopts::value<string>())
                 ("o,output","Output file", cxxopts::value<string>())
+                ("s,scheme","Color scheme file", cxxopts::value<string>())
                 ("h,help","Print help");
 
         options.parse_positional({"input"});
@@ -67,7 +68,16 @@ int main(int argc, char **argv)
                 return 0;
             }
 
-            EIF::EifConverter::bmpFileToEifFile(input_file_name, depth, out_file_name);
+            if(depth == 16) {
+                if(!result.count("scheme")){
+                    cout << "Please, specify color scheme file" << std::endl;
+                    return 0;
+                }
+                EIF::EifConverter::bmpFileToEifFile(input_file_name, depth, out_file_name,
+                        result["scheme"].as<string>());
+            } else {
+                EIF::EifConverter::bmpFileToEifFile(input_file_name, depth, out_file_name);
+            }
         }
     } catch (const cxxopts::OptionException& e){
         cout << "error parsing options: " << e.what() << endl;