diff --git a/src/display.cpp b/src/display.cpp index 468d229a40a..3baa02383ad 100644 --- a/src/display.cpp +++ b/src/display.cpp @@ -247,8 +247,6 @@ display::display(const display_context* dc, if(zoom_ != preferences::tile_size()) // correct saved tile_size if necessary preferences::set_tile_size(zoom_); - image::set_zoom(zoom_); - init_flags(); if(!menu_buttons_.empty() || !action_buttons_.empty()) { @@ -1936,7 +1934,6 @@ bool display::set_zoom(unsigned int amount, const bool validate_value_and_set_in } preferences::set_tile_size(zoom_); - image::set_zoom(zoom_); labels().recalculate_labels(); redraw_background_ = true; @@ -2211,8 +2208,6 @@ void display::scroll_to_tiles(const std::vector::const_iterator & void display::bounds_check_position() { - const unsigned int orig_zoom = zoom_; - if(zoom_ < MinZoom) { zoom_ = MinZoom; } @@ -2222,10 +2217,6 @@ void display::bounds_check_position() } bounds_check_position(xpos_, ypos_); - - if(zoom_ != orig_zoom) { - image::set_zoom(zoom_); - } } void display::bounds_check_position(int& xpos, int& ypos) const diff --git a/src/picture.cpp b/src/picture.cpp index b0999f03ab0..da68d11896a 100644 --- a/src/picture.cpp +++ b/src/picture.cpp @@ -197,8 +197,6 @@ std::set precached_dirs; int red_adjust = 0, green_adjust = 0, blue_adjust = 0; -unsigned int zoom = tile_size; - const std::string data_uri_prefix = "data:"; struct parsed_data_URI{ explicit parsed_data_URI(std::string_view data_URI); @@ -759,12 +757,6 @@ void set_color_adjustment(int r, int g, int b) } } -void set_zoom(unsigned int amount) -{ - // This no longer has to do anything fancy. - zoom = amount; -} - static surface get_hexed(const locator& i_locator, bool skip_cache = false) { surface image(get_surface(i_locator, UNSCALED, skip_cache)); diff --git a/src/picture.hpp b/src/picture.hpp index 7cc07be5e02..d7890b5ebbb 100644 --- a/src/picture.hpp +++ b/src/picture.hpp @@ -222,14 +222,6 @@ struct manager */ void set_color_adjustment(int r, int g, int b); -/** - * Sets the scaling factor for images. - * - * Changing the previous value automatically invalidates all cached scaled - * images. - */ -void set_zoom(unsigned int zoom); - /** * Used to specify the rendering format of images. */