upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-11 03:18:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

image: There's no need to exit image namespace for anon namespace

Browse Source
This commit is contained in:
Tommy 2022-06-24 14:28:04 +12:00
parent 2684d4e3b9
commit 9cf67663c6
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/picture.cpp
View File

@ -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); cache.get_element(index_) = cache_item<T>(data);
} }
} }
}
namespace namespace
{ {
image::locator::locator_finder_t locator_finder; image::locator::locator_finder_t locator_finder;
/** Definition of all image maps */ /** Definition of all image maps */
std::array<image::surface_cache,image::TYPE::NUM_TYPES> surfaces_; std::array<surface_cache, NUM_TYPES> surfaces_;
/** /**
* Texture caches. * Texture caches.
@ -186,7 +185,7 @@ image::lit_surface_variants surface_lightmaps_;
image::lit_texture_variants texture_lightmaps_; image::lit_texture_variants texture_lightmaps_;
// diagnostics for tracking skipped cache impact // 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 duplicate_loads_ = 0;
int total_loads_ = 0; int total_loads_ = 0;
@ -229,8 +228,6 @@ parsed_data_URI::parsed_data_URI(std::string_view data_URI)
} // end anon namespace } // end anon namespace
namespace image
{
mini_terrain_cache_map mini_terrain_cache; mini_terrain_cache_map mini_terrain_cache;
mini_terrain_cache_map mini_fogged_terrain_cache; mini_terrain_cache_map mini_fogged_terrain_cache;
mini_terrain_cache_map mini_highlighted_terrain_cache; mini_terrain_cache_map mini_highlighted_terrain_cache;