Move imagewriter into utils directory and rename to pnglib.

7 files changed, 25 insertions, 40 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 236ba3e4d..e64b6cf4f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -685,8 +685,6 @@ SET(SRCS
     resources/imagerect.h
     resources/imageset.h
     resources/imageset.cpp
-    resources/imagewriter.cpp
-    resources/imagewriter.h
     resources/itemcolordata.h
     resources/db/itemdb.cpp
     resources/db/itemdb.h
@@ -916,6 +914,8 @@ SET(SRCS
     fs/paths.h
     utils/perfomance.cpp
     utils/perfomance.h
+    utils/pnglib.cpp
+    utils/pnglib.h
     fs/virtfs/fsfuncs.h
     fs/virtfs/rwops.cpp
     fs/virtfs/rwops.h
@@ -1778,8 +1778,6 @@ SET(DYE_CMD_SRCS
     resources/imagerect.h
     resources/imageset.cpp
     resources/imageset.h
-    resources/imagewriter.cpp
-    resources/imagewriter.h
     resources/itemcolordata.h
     resources/resource.cpp
     resources/resource.h
@@ -1846,6 +1844,8 @@ SET(DYE_CMD_SRCS
     fs/paths.h
     utils/perfomance.cpp
     utils/perfomance.h
+    utils/pnglib.cpp
+    utils/pnglib.h
     fs/virtfs/fsfuncs.h
     fs/virtfs/rwops.cpp
     fs/virtfs/rwops.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 83ea3e584..d46a76cad 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -464,8 +464,6 @@ BASE_SRC += client.h \
 	      resources/imagehelper.h \
 	      resources/imageset.cpp \
 	      resources/imageset.h \
-	      resources/imagewriter.cpp \
-	      resources/imagewriter.h \
 	      resources/itemcolordata.h \
 	      resources/mstack.h \
 	      resources/notificationinfo.h \
@@ -621,6 +619,8 @@ BASE_SRC += client.h \
 	      fs/paths.h \
 	      utils/perfomance.cpp \
 	      utils/perfomance.h \
+	      utils/pnglib.cpp \
+	      utils/pnglib.h \
 	      fs/virtfs/fsfuncs.h \
 	      fs/virtfs/rwops.cpp \
 	      fs/virtfs/rwops.h \
diff --git a/src/game.cpp b/src/game.cpp
index ad819230b..e09e6c92f 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -110,7 +110,6 @@
 #include "particle/particleengine.h"
 
 #include "resources/delayedmanager.h"
-#include "resources/imagewriter.h"
 #include "resources/mapreader.h"
 #include "resources/screenshothelper.h"
 
@@ -125,6 +124,7 @@
 #include "utils/delete2.h"
 #include "utils/foreach.h"
 #include "utils/gettext.h"
+#include "utils/pnglib.h"
 #include "utils/sdlcheckutils.h"
 #include "utils/timer.h"
 
@@ -606,7 +606,7 @@ bool Game::saveScreenshot(SDL_Surface *const screenshot,
     }
 
     const std::string fileNameStr = filename.str();
-    const bool success = ImageWriter::writePNG(screenshot, fileNameStr);
+    const bool success = PngLib::writePNG(screenshot, fileNameStr);
 #ifdef __native_client__
     std::string nacScreenshotlDir = fileNameStr;
     cutFirst(nacScreenshotlDir, "/persistent");
diff --git a/src/progs/dyecmd/dyemain.cpp b/src/progs/dyecmd/dyemain.cpp
index 234e4a600..a5e8a2a34 100644
--- a/src/progs/dyecmd/dyemain.cpp
+++ b/src/progs/dyecmd/dyemain.cpp
@@ -26,8 +26,6 @@
 
 #include "fs/virtfs/fs.h"
 
-#include "resources/imagewriter.h"
-
 #include "resources/image/image.h"
 
 #ifdef USE_SDL2
@@ -37,6 +35,7 @@
 #include "resources/loaders/imageloader.h"
 
 #include "utils/gettext.h"
+#include "utils/pnglib.h"
 #include "utils/sdlhelper.h"
 
 #include <iostream>
@@ -114,7 +113,7 @@ int main(int argc, char **argv)
     }
     SDL_Surface *const surface = ImageHelper::convertTo32Bit(
         image->getSDLSurface());
-    ImageWriter::writePNG(surface, dst);
+    PngLib::writePNG(surface, dst);
     SDL_FreeSurface(surface);
     VirtFs::deinit();
     return 0;
diff --git a/src/test/testlauncher.cpp b/src/test/testlauncher.cpp
index c7331df49..d5df688a7 100644
--- a/src/test/testlauncher.cpp
+++ b/src/test/testlauncher.cpp
@@ -33,13 +33,13 @@
 
 #include "gui/fonts/font.h"
 
+#include "utils/pnglib.h"
 #include "utils/stringutils.h"
 
 #include "render/graphics.h"
 
 #include "render/vertexes/imagecollection.h"
 
-#include "resources/imagewriter.h"
 #include "resources/openglimagehelper.h"
 #include "resources/screenshothelper.h"
 #include "resources/surfaceimagehelper.h"
@@ -476,9 +476,9 @@ int TestLauncher::testDye()
             {
                 SurfaceImageHelper::combineSurface(image->mSDLSurface, nullptr,
                     surface, nullptr);
-                ImageWriter::writePNG(image->mSDLSurface,
+                PngLib::writePNG(image->mSDLSurface,
                     settings.tempDir + "/testimage1.png");
-                ImageWriter::writePNG(surface,
+                PngLib::writePNG(surface,
                     settings.tempDir + "/testimage2.png");
             }
 
@@ -494,9 +494,9 @@ int TestLauncher::testDye()
                 {
                     SurfaceImageHelper::combineSurface(image->mSDLSurface,
                         nullptr, surface, nullptr);
-                    ImageWriter::writePNG(image->mSDLSurface,
+                    PngLib::writePNG(image->mSDLSurface,
                         settings.tempDir + "/testimage3.png");
-                    ImageWriter::writePNG(surface,
+                    PngLib::writePNG(surface,
                         settings.tempDir + "/testimage4.png");
                 }
             }
diff --git a/src/resources/imagewriter.cpp b/src/utils/pnglib.cpp
index d9485a52c..d472bd565 100644
--- a/src/resources/imagewriter.cpp
+++ b/src/utils/pnglib.cpp
@@ -20,7 +20,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "resources/imagewriter.h"
+#include "utils/pnglib.h"
 
 #include "utils/cast.h"
 #include "utils/checkutils.h"
@@ -33,8 +33,8 @@ PRAGMA48(GCC diagnostic pop)
 
 #include "debug.h"
 
-bool ImageWriter::writePNG(SDL_Surface *const surface,
-                           const std::string &filename)
+bool PngLib::writePNG(SDL_Surface *const surface,
+                      const std::string &filename)
 {
     if (surface == nullptr)
         return false;
@@ -89,14 +89,6 @@ bool ImageWriter::writePNG(SDL_Surface *const surface,
 
     png_bytep *const row_pointers
         = new png_bytep[CAST_SIZE(surface->h)];
-/*
-    if (!row_pointers)
-    {
-        logger->log1("Had trouble converting surface to row pointers");
-        fclose(fp);
-        return false;
-    }
-*/
 
     for (int i = 0; i < surface->h; i++)
     {
diff --git a/src/resources/imagewriter.h b/src/utils/pnglib.h
index dbe7c75ff..a79c476ca 100644
--- a/src/resources/imagewriter.h
+++ b/src/utils/pnglib.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef RESOURCES_IMAGEWRITER_H
-#define RESOURCES_IMAGEWRITER_H
+#ifndef UTILS_PNGLIB_H
+#define UTILS_PNGLIB_H
 
 #include <string>
 
@@ -29,16 +29,10 @@
 
 struct SDL_Surface;
 
-class ImageWriter final
+namespace PngLib
 {
-    public:
-        ImageWriter()
-        { }
+    bool writePNG(SDL_Surface *const surface,
+                  const std::string &filename);
+} // namespace PngLib
 
-        A_DELETE_COPY(ImageWriter)
-
-        static bool writePNG(SDL_Surface *const surface,
-                             const std::string &filename);
-};
-
-#endif  // RESOURCES_IMAGEWRITER_H
+#endif  // UTILS_PNGLIB_H