From 9cf67663c61e595e9c2be56c250e3261f522b57d Mon Sep 17 00:00:00 2001
From: Tommy <mesilliac@tomanui.nz>
Date: Fri, 24 Jun 2022 14:28:04 +1200
Subject: [PATCH] image: There's no need to exit image namespace for anon
 namespace

---
 src/picture.cpp | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/picture.cpp b/src/picture.cpp
index 0b5da572059..bc354c10c47 100644
--- a/src/picture.cpp
+++ b/src/picture.cpp
@@ -153,14 +153,13 @@ void locator::add_to_cache(cache_type<T>& cache, const T& data) const
 		cache.get_element(index_) = cache_item<T>(data);
 	}
 }
-}
 
 namespace
 {
 image::locator::locator_finder_t locator_finder;
 
 /** Definition of all image maps */
-std::array<image::surface_cache,image::TYPE::NUM_TYPES> surfaces_;
+std::array<surface_cache, NUM_TYPES> surfaces_;
 
 /**
  * Texture caches.
@@ -186,7 +185,7 @@ image::lit_surface_variants surface_lightmaps_;
 image::lit_texture_variants texture_lightmaps_;
 
 // diagnostics for tracking skipped cache impact
-std::array<image::bool_cache,image::TYPE::NUM_TYPES> skipped_cache_;
+std::array<bool_cache, NUM_TYPES> skipped_cache_;
 int duplicate_loads_ = 0;
 int total_loads_ = 0;
 
@@ -229,8 +228,6 @@ parsed_data_URI::parsed_data_URI(std::string_view data_URI)
 
 } // end anon namespace
 
-namespace image
-{
 mini_terrain_cache_map mini_terrain_cache;
 mini_terrain_cache_map mini_fogged_terrain_cache;
 mini_terrain_cache_map mini_highlighted_terrain_cache;