From 4552f6a4054d7cd4051ebf3bd05554e5495a26e2 Mon Sep 17 00:00:00 2001
From: Ted John <ted@brambles.org>
Date: Mon, 7 May 2018 18:45:15 +0100
Subject: [PATCH] Move Imaging to core

---
 src/openrct2/CmdlineSprite.cpp        |  2 +-
 src/openrct2/{ => core}/Imaging.cpp   | 10 +++++-----
 src/openrct2/{ => core}/Imaging.h     |  2 +-
 src/openrct2/interface/Screenshot.cpp |  2 +-
 src/openrct2/world/MapGen.cpp         |  2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)
 rename src/openrct2/{ => core}/Imaging.cpp (98%)
 rename src/openrct2/{ => core}/Imaging.h (98%)

diff --git a/src/openrct2/CmdlineSprite.cpp b/src/openrct2/CmdlineSprite.cpp
index 66509d6d84..bed9975a7e 100644
--- a/src/openrct2/CmdlineSprite.cpp
+++ b/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"
diff --git a/src/openrct2/Imaging.cpp b/src/openrct2/core/Imaging.cpp
similarity index 98%
rename from src/openrct2/Imaging.cpp
rename to src/openrct2/core/Imaging.cpp
index dde73791f3..8a95d5ca0e 100644
--- a/src/openrct2/Imaging.cpp
+++ b/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
 {
diff --git a/src/openrct2/Imaging.h b/src/openrct2/core/Imaging.h
similarity index 98%
rename from src/openrct2/Imaging.h
rename to src/openrct2/core/Imaging.h
index b7140dae2d..4afec47186 100644
--- a/src/openrct2/Imaging.h
+++ b/src/openrct2/core/Imaging.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "common.h"
+#include "../common.h"
 
 struct rct_drawpixelinfo;
 struct rct_palette;
diff --git a/src/openrct2/interface/Screenshot.cpp b/src/openrct2/interface/Screenshot.cpp
index b619e2103f..f31aaa0434 100644
--- a/src/openrct2/interface/Screenshot.cpp
+++ b/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"
 
diff --git a/src/openrct2/world/MapGen.cpp b/src/openrct2/world/MapGen.cpp
index 7c045da670..a1e054fa14 100644
--- a/src/openrct2/world/MapGen.cpp
+++ b/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"