Remove obsolete code from skin_generator.

3 files changed, 32 insertions, 18 deletions

diff --git a/skin_generator/main.cpp b/skin_generator/main.cpp
index 0ea19f0662..8c9e511eb5 100644
--- a/skin_generator/main.cpp
+++ b/skin_generator/main.cpp
@@ -34,11 +34,13 @@ int main(int argc, char *argv[])
   std::vector<std::string> suffixes;
   suffixes.push_back(FLAGS_skinSuffix);
 
+  /*
   gen.processSearchIcons(FLAGS_searchIconsSrcPath,
                          FLAGS_searchCategories,
                          FLAGS_searchIconsOutPath,
                          FLAGS_searchIconWidth,
                          FLAGS_searchIconHeight);
+                         */
 
   gen.processSymbols(FLAGS_symbolsDir, FLAGS_skinName, symbolSizes, suffixes);
 
diff --git a/skin_generator/skin_generator.cpp b/skin_generator/skin_generator.cpp
index 8e096aad29..caf402681c 100644
--- a/skin_generator/skin_generator.cpp
+++ b/skin_generator/skin_generator.cpp
@@ -1,16 +1,21 @@
 #include "skin_generator.hpp"
-#include <QtXml/QDomElement>
-#include <QtXml/QDomDocument>
-#include <QtCore/QDir>
-#include "../std/bind.hpp"
+
 #include "../coding/lodepng_io.hpp"
-#include <boost/gil/gil_all.hpp>
+
+#include "../base/logging.hpp"
+
 #include "../std/algorithm.hpp"
 #include "../std/iterator.hpp"
 #include "../std/fstream.hpp"
 #include "../std/iostream.hpp"
-#include "../base/logging.hpp"
+#include "../std/bind.hpp"
+
+#include <QtXml/QDomElement>
+#include <QtXml/QDomDocument>
+#include <QtCore/QDir>
+
 
+/*
 #include <ft2build.h>
 
 #include FT_FREETYPE_H
@@ -50,6 +55,7 @@ void CheckError(FT_Error error)
 #define FTCHECK(x) do {FT_Error e = (x); CheckError(e);} while (false)
 
 namespace gil = boost::gil;
+*/
 
 namespace tools
 {
@@ -57,6 +63,7 @@ namespace tools
     : m_baseLineOffset(0)
   {}
 
+  /*
   void SkinGenerator::processFont(string const & fileName, string const & skinName, vector<int8_t> const & fontSizes, int symbolScale)
   {
     string symbols(" 0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ;:'\"/?.,`~!@#$%^&*()-_+=<>");
@@ -167,22 +174,23 @@ namespace tools
         fontInfo.m_chars[symbol] = make_pair(normalCharInfo, strokedCharInfo);
       }
 
-/*      std::stringstream out;
-      out << getBaseFileName(fileName) + "_" << (int)fontSizes[i];
+      //std::stringstream out;
+      //out << getBaseFileName(fileName) + "_" << (int)fontSizes[i];
 
-      page.m_fileName = out.str().c_str();
+      //page.m_fileName = out.str().c_str();
 
-      gil::bgra8_image_t skinImage(page.m_width, page.m_height);
-      gil::fill_pixels(gil::view(skinImage), gil::rgba8_pixel_t(0, 0, 0, 0));
+      //gil::bgra8_image_t skinImage(page.m_width, page.m_height);
+      //gil::fill_pixels(gil::view(skinImage), gil::rgba8_pixel_t(0, 0, 0, 0));
 
-      gil::lodepng_write_view(
-          skinName.substr(0, skinName.find_last_of("/") + 1) + page.m_fileName + ".png",
-          gil::const_view(skinImage));*/
+      //gil::lodepng_write_view(
+      //    skinName.substr(0, skinName.find_last_of("/") + 1) + page.m_fileName + ".png",
+      //    gil::const_view(skinImage));
     }
 
     FT_Done_Face(face);
     FT_Done_FreeType(lib);
   }
+  */
 
   string const SkinGenerator::getBaseFileName(string const & fileName)
   {
diff --git a/skin_generator/skin_generator.hpp b/skin_generator/skin_generator.hpp
index 10ff43adb0..8ba0bd7028 100644
--- a/skin_generator/skin_generator.hpp
+++ b/skin_generator/skin_generator.hpp
@@ -1,13 +1,17 @@
 #pragma once
 
+#include "../../geometry/rect2d.hpp"
+#include "../../geometry/packer.hpp"
+
+#include "../../coding/writer.hpp"
+
 #include "../../base/base.hpp"
+
 #include "../../std/vector.hpp"
 #include "../../std/list.hpp"
 #include "../../std/string.hpp"
 #include "../../std/map.hpp"
-#include "../../geometry/rect2d.hpp"
-#include "../../coding/writer.hpp"
-#include "../../geometry/packer.hpp"
+
 #include <boost/gil/gil_all.hpp>
 
 #include <QtGui/QPainter>
@@ -97,7 +101,7 @@ namespace tools
   public:
 
       SkinGenerator();
-      void processFont(string const & fileName, string const & skinName, vector<int8_t> const & fontSizes, int symbolScale);
+      //void processFont(string const & fileName, string const & skinName, vector<int8_t> const & fontSizes, int symbolScale);
       void processSymbols(string const & symbolsDir,
                           string const & skinName,
                           vector<QSize> const & symbolSizes,