Build: Move Image from common to util

src/core/controller.h

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2019-2023 Connor McLaughlin <stenzek@gmail.com>
+// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin <stenzek@gmail.com>
 // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0)
 
 #pragma once
@@ -7,8 +7,6 @@
 #include "settings.h"
 #include "types.h"
 
-#include "common/image.h"
-
 #include <memory>
 #include <optional>
 #include <span>

src/core/texture_replacements.cpp

@@ -90,7 +90,7 @@ void TextureReplacements::DumpVRAMWrite(u32 width, u32 height, const void* pixel
   if (filename.empty())
     return;
 
-  Common::RGBA8Image image;
+  RGBA8Image image;
   image.SetSize(width, height);
 
   const u16* src_pixels = reinterpret_cast<const u16*>(pixels);
@@ -274,7 +274,7 @@ const TextureReplacementTexture* TextureReplacements::LoadTexture(const std::str
   if (it != m_texture_cache.end())
     return &it->second;
 
-  Common::RGBA8Image image;
+  RGBA8Image image;
   if (!image.LoadFromFile(filename.c_str()))
   {
     Log_ErrorPrintf("Failed to load '%s'", filename.c_str());

src/core/texture_replacements.h

@@ -1,10 +1,14 @@
-// SPDX-FileCopyrightText: 2019-2022 Connor McLaughlin <stenzek@gmail.com>
+// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin <stenzek@gmail.com>
 // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0)
 
 #pragma once
+
+#include "util/image.h"
+
 #include "common/hash_combine.h"
-#include "common/image.h"
+
 #include "types.h"
+
 #include <string>
 #include <tuple>
 #include <unordered_map>
@@ -36,7 +40,7 @@ struct hash<TextureReplacementHash>
 };
 } // namespace std
 
-using TextureReplacementTexture = Common::RGBA8Image;
+using TextureReplacementTexture = RGBA8Image;
 
 class TextureReplacements
 {