Move Imaging to core

src/openrct2/CmdlineSprite.cpp

@@ -21,7 +21,7 @@
 #include <jansson.h>
 #include "CmdlineSprite.h"
 #include "drawing/Drawing.h"
-#include "Imaging.h"
+#include "core/Imaging.h"
 #include "localisation/Language.h"
 #include "OpenRCT2.h"
 #include "platform/platform.h"

src/openrct2/core/Imaging.cpp

@@ -18,12 +18,12 @@
 
 #include <algorithm>
 #include <png.h>
-#include "core/FileStream.hpp"
-#include "core/Guard.hpp"
-#include "core/Memory.hpp"
-#include "drawing/Drawing.h"
-
+#include "FileStream.hpp"
+#include "Guard.hpp"
 #include "Imaging.h"
+#include "Memory.hpp"
+#include "../drawing/Drawing.h"
+
 
 namespace Imaging
 {

src/openrct2/core/Imaging.h

@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "common.h"
+#include "../common.h"
 
 struct rct_drawpixelinfo;
 struct rct_palette;

src/openrct2/interface/Screenshot.cpp

@@ -21,7 +21,7 @@
 #include "../audio/audio.h"
 #include "../Context.h"
 #include "../core/Console.hpp"
-#include "../Imaging.h"
+#include "../core/Imaging.h"
 #include "../OpenRCT2.h"
 #include "Screenshot.h"
 

src/openrct2/world/MapGen.cpp

@@ -25,7 +25,7 @@
 #include "../core/String.hpp"
 #include "../core/Util.hpp"
 #include "../Game.h"
-#include "../Imaging.h"
+#include "../core/Imaging.h"
 #include "../localisation/StringIds.h"
 #include "../object/Object.h"
 #include "../platform/platform.h"