Move image class into image directory.

24 files changed, 36 insertions, 29 deletions

diff --git a/src/resources/ambientlayer.cpp b/src/resources/ambientlayer.cpp
index f75300367..fe8101eb4 100644
--- a/src/resources/ambientlayer.cpp
+++ b/src/resources/ambientlayer.cpp
@@ -25,9 +25,10 @@
 
 #include "render/graphics.h"
 
-#include "resources/image.h"
 #include "resources/imagehelper.h"
 
+#include "resources/image/image.h"
+
 #include "resources/loaders/rescaledloader.h"
 
 #include "debug.h"
diff --git a/src/resources/atlas/atlasitem.h b/src/resources/atlas/atlasitem.h
index 039000393..ae0c0d206 100644
--- a/src/resources/atlas/atlasitem.h
+++ b/src/resources/atlas/atlasitem.h
@@ -23,9 +23,10 @@
 
 #ifdef USE_OPENGL
 
-#include "resources/image.h"
 #include "resources/memorycounter.h"
 
+#include "resources/image/image.h"
+
 #include <string>
 
 struct AtlasItem final : public MemoryCounter
diff --git a/src/resources/atlas/atlasmanager.h b/src/resources/atlas/atlasmanager.h
index 176e2f090..76fca7223 100644
--- a/src/resources/atlas/atlasmanager.h
+++ b/src/resources/atlas/atlasmanager.h
@@ -23,7 +23,7 @@
 
 #ifdef USE_OPENGL
 
-#include "resources/image.h"
+#include "resources/image/image.h"
 
 #include "utils/stringvector.h"
 
diff --git a/src/resources/image.cpp b/src/resources/image/image.cpp
index 26322aed9..683129e7a 100644
--- a/src/resources/image.cpp
+++ b/src/resources/image/image.cpp
@@ -20,7 +20,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "resources/image.h"
+#include "resources/image/image.h"
 
 #include "logger.h"
 
diff --git a/src/resources/image.h b/src/resources/image/image.h
index 39492c360..39492c360 100644
--- a/src/resources/image.h
+++ b/src/resources/image/image.h
diff --git a/src/resources/imageset.cpp b/src/resources/imageset.cpp
index e74ca3c07..913a861e5 100644
--- a/src/resources/imageset.cpp
+++ b/src/resources/imageset.cpp
@@ -24,7 +24,7 @@
 
 #include "logger.h"
 
-#include "resources/image.h"
+#include "resources/image/image.h"
 
 #include "utils/dtor.h"
 
diff --git a/src/resources/loaders/imageloader.cpp b/src/resources/loaders/imageloader.cpp
index d3ab9facc..f2d0d045d 100644
--- a/src/resources/loaders/imageloader.cpp
+++ b/src/resources/loaders/imageloader.cpp
@@ -22,9 +22,10 @@
 
 #include "logger.h"
 
-#include "resources/image.h"
 #include "resources/imagehelper.h"
 
+#include "resources/image/image.h"
+
 #include "resources/loaders/imageloader.h"
 
 #include "resources/resourcemanager/resourcemanager.h"
diff --git a/src/resources/loaders/imagesetloader.cpp b/src/resources/loaders/imagesetloader.cpp
index ad3868cc3..86b0263cb 100644
--- a/src/resources/loaders/imagesetloader.cpp
+++ b/src/resources/loaders/imagesetloader.cpp
@@ -22,9 +22,10 @@
 
 #include "logger.h"
 
-#include "resources/image.h"
 #include "resources/imageset.h"
 
+#include "resources/image/image.h"
+
 #include "resources/loaders/imageloader.h"
 #include "resources/loaders/imagesetloader.h"
 
diff --git a/src/resources/loaders/rescaledloader.cpp b/src/resources/loaders/rescaledloader.cpp
index 95ef6dff7..8909209a4 100644
--- a/src/resources/loaders/rescaledloader.cpp
+++ b/src/resources/loaders/rescaledloader.cpp
@@ -22,7 +22,7 @@
 
 #include "logger.h"
 
-#include "resources/image.h"
+#include "resources/image/image.h"
 
 #include "resources/loaders/rescaledloader.h"
 
diff --git a/src/resources/loaders/subimageloader.cpp b/src/resources/loaders/subimageloader.cpp
index 1331da245..9b0459e88 100644
--- a/src/resources/loaders/subimageloader.cpp
+++ b/src/resources/loaders/subimageloader.cpp
@@ -22,7 +22,7 @@
 
 #include "logger.h"
 
-#include "resources/image.h"
+#include "resources/image/image.h"
 
 #include "resources/loaders/subimageloader.h"
 
diff --git a/src/resources/loaders/subimagesetloader.cpp b/src/resources/loaders/subimagesetloader.cpp
index a8db6771a..1b271b33f 100644
--- a/src/resources/loaders/subimagesetloader.cpp
+++ b/src/resources/loaders/subimagesetloader.cpp
@@ -20,13 +20,14 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "resources/image.h"
 #include "resources/imageset.h"
 
-#include "resources/resourcemanager/resourcemanager.h"
+#include "resources/image/image.h"
 
 #include "resources/loaders/subimagesetloader.h"
 
+#include "resources/resourcemanager/resourcemanager.h"
+
 #include "utils/stringutils.h"
 
 #include "debug.h"
diff --git a/src/resources/map/mapitem.cpp b/src/resources/map/mapitem.cpp
index eb7676342..8bc3ce8f4 100644
--- a/src/resources/map/mapitem.cpp
+++ b/src/resources/map/mapitem.cpp
@@ -27,7 +27,7 @@
 
 #include "gui/fonts/font.h"
 
-#include "resources/image.h"
+#include "resources/image/image.h"
 
 #include "resources/loaders/imageloader.h"
 
diff --git a/src/resources/map/maplayer.cpp b/src/resources/map/maplayer.cpp
index 7ccf26396..ba8f49455 100644
--- a/src/resources/map/maplayer.cpp
+++ b/src/resources/map/maplayer.cpp
@@ -37,7 +37,7 @@
 
 #include "render/graphics.h"
 
-#include "resources/image.h"
+#include "resources/image/image.h"
 
 #include "resources/map/mapitem.h"
 #include "resources/map/maprowvertexes.h"
diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp
index d8e695b7a..05fee875a 100644
--- a/src/resources/mapreader.cpp
+++ b/src/resources/mapreader.cpp
@@ -37,9 +37,10 @@
 #include "resources/map/tileset.h"
 
 #include "resources/beingcommon.h"
-#include "resources/image.h"
 #include "resources/animation/animation.h"
 
+#include "resources/image/image.h"
+
 #ifdef USE_OPENGL
 #include "resources/db/mapdb.h"
 #include "resources/loaders/atlasloader.h"
diff --git a/src/resources/openglimagehelper.cpp b/src/resources/openglimagehelper.cpp
index 7ce48556d..b29e3b3b9 100644
--- a/src/resources/openglimagehelper.cpp
+++ b/src/resources/openglimagehelper.cpp
@@ -39,11 +39,11 @@
 #include "render/opengl/mgl.h"
 #include "render/opengl/mglcheck.h"
 
-#include "resources/image.h"
-
 #include "resources/dye/dye.h"
 #include "resources/dye/dyepalette.h"
 
+#include "resources/image/image.h"
+
 #include "utils/sdlcheckutils.h"
 
 #include <SDL_image.h>
diff --git a/src/resources/resourcemanager/resourcemanager.cpp b/src/resources/resourcemanager/resourcemanager.cpp
index 993d011b7..5fcc35477 100644
--- a/src/resources/resourcemanager/resourcemanager.cpp
+++ b/src/resources/resourcemanager/resourcemanager.cpp
@@ -26,7 +26,7 @@
 #include "logger.h"
 
 #ifdef USE_OPENGL
-#include "resources/image.h"
+#include "resources/image/image.h"
 #endif  // USE_OPENGL
 
 #include "resources/imageset.h"
diff --git a/src/resources/safeopenglimagehelper.cpp b/src/resources/safeopenglimagehelper.cpp
index 8a929f214..60c71d12e 100644
--- a/src/resources/safeopenglimagehelper.cpp
+++ b/src/resources/safeopenglimagehelper.cpp
@@ -36,11 +36,11 @@
 #include "render/opengl/mgl.h"
 #include "render/opengl/mglcheck.h"
 
-#include "resources/image.h"
-
 #include "resources/dye/dye.h"
 #include "resources/dye/dyepalette.h"
 
+#include "resources/image/image.h"
+
 #include "utils/sdlcheckutils.h"
 
 #include <SDL_image.h>
diff --git a/src/resources/sdl2imagehelper.cpp b/src/resources/sdl2imagehelper.cpp
index 9bd66c3e4..5f8f95e6b 100644
--- a/src/resources/sdl2imagehelper.cpp
+++ b/src/resources/sdl2imagehelper.cpp
@@ -27,11 +27,11 @@
 #include "logger.h"
 #include "main.h"
 
-#include "resources/image.h"
-
 #include "resources/dye/dye.h"
 #include "resources/dye/dyepalette.h"
 
+#include "resources/image/image.h"
+
 #include "resources/resourcemanager/resourcemanager.h"
 
 #include "utils/sdlcheckutils.h"
diff --git a/src/resources/sdl2softwareimagehelper.cpp b/src/resources/sdl2softwareimagehelper.cpp
index 375f08cc5..3c50531d0 100644
--- a/src/resources/sdl2softwareimagehelper.cpp
+++ b/src/resources/sdl2softwareimagehelper.cpp
@@ -29,7 +29,7 @@
 
 #include "resources/dye/dye.h"
 
-#include "resources/image.h"
+#include "resources/image/image.h"
 
 #include "resources/resourcemanager/resourcemanager.h"
 
diff --git a/src/resources/sdlimagehelper.cpp b/src/resources/sdlimagehelper.cpp
index d97a51fc6..f8b8fb96d 100644
--- a/src/resources/sdlimagehelper.cpp
+++ b/src/resources/sdlimagehelper.cpp
@@ -27,11 +27,11 @@
 #include "logger.h"
 #include "main.h"
 
-#include "resources/image.h"
-
 #include "resources/dye/dye.h"
 #include "resources/dye/dyepalette.h"
 
+#include "resources/image/image.h"
+
 #include "utils/sdlcheckutils.h"
 
 #include <SDL_gfxBlitFunc.h>
diff --git a/src/resources/sprite/animatedsprite.cpp b/src/resources/sprite/animatedsprite.cpp
index 8a60de0f3..738f8c31b 100644
--- a/src/resources/sprite/animatedsprite.cpp
+++ b/src/resources/sprite/animatedsprite.cpp
@@ -28,10 +28,11 @@
 
 #include "resources/action.h"
 #include "resources/delayedmanager.h"
-#include "resources/image.h"
 
 #include "resources/animation/animation.h"
 
+#include "resources/image/image.h"
+
 #include "resources/loaders/spritedefloader.h"
 
 #include "resources/resourcemanager/resourcemanager.h"
diff --git a/src/resources/sprite/imagesprite.h b/src/resources/sprite/imagesprite.h
index c3fa39fae..21c873f40 100644
--- a/src/resources/sprite/imagesprite.h
+++ b/src/resources/sprite/imagesprite.h
@@ -24,7 +24,7 @@
 
 #include "resources/sprite/sprite.h"
 
-#include "resources/image.h"
+#include "resources/image/image.h"
 
 class Graphics;
 
diff --git a/src/resources/subimage.h b/src/resources/subimage.h
index 1fa0eb3ed..29f7fed1e 100644
--- a/src/resources/subimage.h
+++ b/src/resources/subimage.h
@@ -38,7 +38,7 @@
 
 #endif
 
-#include "resources/image.h"
+#include "resources/image/image.h"
 
 /**
  * A clipped version of a larger image.
diff --git a/src/resources/surfaceimagehelper.cpp b/src/resources/surfaceimagehelper.cpp
index effba4abd..b8c3bf6ac 100644
--- a/src/resources/surfaceimagehelper.cpp
+++ b/src/resources/surfaceimagehelper.cpp
@@ -27,10 +27,10 @@
 #include "logger.h"
 #include "main.h"
 
-#include "resources/image.h"
-
 #include "resources/dye/dye.h"
 
+#include "resources/image/image.h"
+
 #include "resources/resourcemanager/resourcemanager.h"
 
 #include "utils/sdlcheckutils.h"