Avoid including image impl details as much as possible (image_impl/bits/iterator.h)

Including doc/image.h should be enough to access/iterate the image
pixels.

src/app/app_brushes.cpp

@@ -21,7 +21,6 @@
 #include "doc/brush.h"
 #include "doc/color.h"
 #include "doc/image.h"
-#include "doc/image_impl.h"
 
 #include "tinyxml2.h"
 

src/app/cmd/clear_mask.cpp

@@ -15,7 +15,7 @@
 #include "app/doc.h"
 #include "doc/algorithm/fill_selection.h"
 #include "doc/cel.h"
-#include "doc/image_impl.h"
+#include "doc/image.h"
 #include "doc/layer.h"
 #include "doc/layer_tilemap.h"
 #include "doc/mask.h"

src/app/commands/cmd_select_palette.cpp

@@ -18,7 +18,7 @@
 #include "app/site.h"
 #include "doc/cel.h"
 #include "doc/frame_range.h"
-#include "doc/image_bits.h"
+#include "doc/image.h"
 #include "doc/layer.h"
 #include "doc/layer_tilemap.h"
 #include "doc/octree_map.h"

src/app/commands/filters/filter_manager_impl.cpp

@@ -34,6 +34,7 @@
 #include "doc/image.h"
 #include "doc/layer.h"
 #include "doc/mask.h"
+#include "doc/palette.h"
 #include "doc/sprite.h"
 #include "filters/filter.h"
 #include "ui/manager.h"

src/app/commands/filters/filter_manager_impl.h

@@ -15,7 +15,7 @@
 #include "app/tx.h"
 #include "base/exception.h"
 #include "base/task.h"
-#include "doc/image_impl.h"
+#include "doc/image.h"
 #include "doc/image_ref.h"
 #include "doc/pixel_format.h"
 #include "filters/filter_indexed_data.h"

src/app/commands/screenshot.cpp

@@ -21,7 +21,7 @@
 #include "base/fs.h"
 #include "doc/cel.h"
 #include "doc/color.h"
-#include "doc/image_impl.h"
+#include "doc/image.h"
 #include "doc/layer.h"
 #include "doc/sprite.h"
 #include "fmt/format.h"

src/app/file/psd_format.cpp

@@ -8,7 +8,7 @@
 #include "app/file/file_format.h"
 #include "base/file_handle.h"
 #include "doc/blend_mode.h"
-#include "doc/image_impl.h"
+#include "doc/image.h"
 #include "doc/layer.h"
 #include "doc/palette.h"
 #include "doc/slice.h"

src/app/file/tga_format.cpp

@@ -19,7 +19,7 @@
 #include "base/convert_to.h"
 #include "base/file_handle.h"
 #include "doc/doc.h"
-#include "doc/image_bits.h"
+#include "doc/image.h"
 #include "tga/tga.h"
 #include "ui/combobox.h"
 #include "ui/listitem.h"

src/app/script/image_iterator_class.cpp

@@ -16,7 +16,6 @@
 #include "doc/algorithm/shrink_bounds.h"
 #include "doc/cel.h"
 #include "doc/image.h"
-#include "doc/image_impl.h"
 #include "doc/image_ref.h"
 #include "doc/primitives.h"
 

src/app/tools/ink_processing.h

@@ -11,7 +11,7 @@
 #include "app/util/wrap_value.h"
 #include "doc/blend_funcs.h"
 #include "doc/blend_internals.h"
-#include "doc/image_impl.h"
+#include "doc/image.h"
 #include "doc/layer.h"
 #include "doc/palette.h"
 #include "doc/remap.h"

src/app/tools/tool_box.cpp

@@ -26,7 +26,7 @@
 #include "doc/algorithm/polygon.h"
 #include "doc/brush.h"
 #include "doc/compressed_image.h"
-#include "doc/image_impl.h"
+#include "doc/image.h"
 #include "doc/mask.h"
 
 #include "tinyxml2.h"

src/app/ui/color_bar.cpp

@@ -57,7 +57,6 @@
 #include "doc/cel.h"
 #include "doc/cels_range.h"
 #include "doc/image.h"
-#include "doc/image_impl.h"
 #include "doc/layer_tilemap.h"
 #include "doc/palette.h"
 #include "doc/palette_gradient_type.h"

src/app/ui/color_popup.cpp

@@ -30,7 +30,7 @@
 #include "app/ui/skin/skin_theme.h"
 #include "app/ui_context.h"
 #include "base/scoped_value.h"
-#include "doc/image_impl.h"
+#include "doc/image.h"
 #include "doc/palette.h"
 #include "doc/sprite.h"
 #include "gfx/border.h"

src/app/ui/editor/brush_preview.cpp

@@ -36,7 +36,7 @@
 #include "doc/blend_internals.h"
 #include "doc/brush.h"
 #include "doc/cel.h"
-#include "doc/image_impl.h"
+#include "doc/image.h"
 #include "doc/layer.h"
 #include "doc/primitives.h"
 #include "os/surface.h"

src/app/util/clipboard_native.cpp

@@ -17,9 +17,9 @@
 #include "doc/color_scales.h"
 #include "doc/file/hex_file.h"
 #include "doc/image.h"
-#include "doc/image_impl.h"
 #include "doc/image_io.h"
 #include "doc/mask_io.h"
+#include "doc/palette.h"
 #include "doc/palette_io.h"
 #include "doc/tileset_io.h"
 #include "gfx/size.h"

src/app/util/conversion_to_image.cpp

@@ -10,7 +10,6 @@
 
 #include "app/util/conversion_to_image.h"
 
-#include "doc/image_traits.h"
 #include "doc/pixel_format.h"
 #include "os/surface.h"
 

src/app/util/conversion_to_surface.cpp

@@ -14,7 +14,7 @@
 #include "base/24bits.h"
 #include "doc/algo.h"
 #include "doc/color_scales.h"
-#include "doc/image_impl.h"
+#include "doc/image.h"
 #include "doc/palette.h"
 #include "doc/rgbmap.h"
 #include "os/surface.h"

src/app/util/expand_cel_canvas.cpp

@@ -27,7 +27,6 @@
 #include "doc/algorithm/shrink_bounds.h"
 #include "doc/cel.h"
 #include "doc/image.h"
-#include "doc/image_impl.h"
 #include "doc/layer.h"
 #include "doc/layer_tilemap.h"
 #include "doc/primitives.h"

src/app/util/layer_boundaries.cpp

@@ -20,7 +20,6 @@
 #include "doc/cel.h"
 #include "doc/document.h"
 #include "doc/image.h"
-#include "doc/image_impl.h"
 #include "doc/layer.h"
 #include "doc/mask.h"
 

src/app/util/new_image_from_mask.cpp

@@ -13,7 +13,7 @@
 
 #include "app/doc.h"
 #include "app/site.h"
-#include "doc/image_impl.h"
+#include "doc/image.h"
 #include "doc/layer.h"
 #include "doc/mask.h"
 #include "doc/primitives.h"

src/doc/algorithm/fill_selection.cpp

@@ -12,7 +12,7 @@
 #include "doc/algorithm/fill_selection.h"
 
 #include "doc/grid.h"
-#include "doc/image_impl.h"
+#include "doc/image.h"
 #include "doc/mask.h"
 #include "doc/primitives.h"
 

src/doc/algorithm/flip_image.cpp

@@ -13,7 +13,6 @@
 
 #include "doc/dispatch.h"
 #include "doc/image.h"
-#include "doc/image_impl.h"
 #include "doc/mask.h"
 #include "doc/primitives.h"
 #include "doc/primitives_fast.h"

src/doc/algorithm/modify_selection.cpp

@@ -11,7 +11,7 @@
 
 #include "doc/algorithm/modify_selection.h"
 
-#include "doc/image_impl.h"
+#include "doc/image.h"
 #include "doc/mask.h"
 #include "doc/primitives.h"
 

src/doc/algorithm/random_image.cpp

@@ -12,7 +12,6 @@
 
 #include "doc/dispatch.h"
 #include "doc/image.h"
-#include "doc/image_impl.h"
 
 #include <random>
 

src/doc/algorithm/resize_image.cpp

@@ -12,7 +12,7 @@
 #include "doc/algorithm/resize_image.h"
 
 #include "doc/algorithm/rotsprite.h"
-#include "doc/image_impl.h"
+#include "doc/image.h"
 #include "doc/palette.h"
 #include "doc/primitives_fast.h"
 #include "doc/rgbmap.h"

src/doc/algorithm/rotate.cpp

@@ -13,7 +13,7 @@
 
 #include "base/pi.h"
 #include "doc/blend_funcs.h"
-#include "doc/image_impl.h"
+#include "doc/image.h"
 #include "doc/mask.h"
 #include "doc/primitives.h"
 #include "doc/primitives_fast.h"

src/doc/algorithm/rotsprite.cpp

@@ -10,7 +10,7 @@
 #endif
 
 #include "doc/algorithm/rotate.h"
-#include "doc/image_impl.h"
+#include "doc/image.h"
 #include "doc/primitives.h"
 
 #include <algorithm>

src/doc/algorithm/shrink_bounds.cpp

@@ -14,7 +14,6 @@
 #include "doc/cel.h"
 #include "doc/grid.h"
 #include "doc/image.h"
-#include "doc/image_impl.h"
 #include "doc/layer.h"
 #include "doc/layer_tilemap.h"
 #include "doc/primitives.h"

src/doc/blend_image.cpp

@@ -11,7 +11,7 @@
 #include "doc/blend_image.h"
 
 #include "doc/blend_internals.h"
-#include "doc/image_impl.h"
+#include "doc/image.h"
 
 namespace doc {
 

src/doc/brush.cpp

@@ -17,7 +17,6 @@
 #include "doc/algorithm/polygon.h"
 #include "doc/blend_internals.h"
 #include "doc/image.h"
-#include "doc/image_impl.h"
 #include "doc/primitives.h"
 
 #include <algorithm>

src/doc/doc.h

@@ -19,7 +19,6 @@
 #include "doc/document.h"
 #include "doc/frame.h"
 #include "doc/image.h"
-#include "doc/image_impl.h"
 #include "doc/image_ref.h"
 #include "doc/images_map.h"
 #include "doc/layer.h"

src/doc/grid.cpp

@@ -11,7 +11,6 @@
 #include "doc/grid.h"
 
 #include "doc/image.h"
-#include "doc/image_impl.h"
 #include "doc/image_ref.h"
 #include "doc/primitives.h"
 #include "gfx/point.h"

src/doc/image.h

@@ -115,4 +115,7 @@ private:
 
 } // namespace doc
 
+#include "doc/image_bits.h"
+#include "doc/image_iterator.h"
+
 #endif

src/doc/image_bits.h

@@ -9,6 +9,8 @@
 #define DOC_IMAGE_BITS_H_INCLUDED
 #pragma once
 
+#include "gfx/rect.h"
+
 #include <algorithm>
 
 namespace doc {

src/doc/image_impl.cpp

@@ -8,10 +8,7 @@
   #include "config.h"
 #endif
 
-#include "doc/image_impl.h"
-
-#include "doc/image_iterator.h"
-#include "doc/image_traits.h"
+#include "doc/image.h"
 
 namespace doc {
 

src/doc/image_impl.h

@@ -15,8 +15,7 @@
 
 #include "doc/blend_funcs.h"
 #include "doc/image.h"
-#include "doc/image_bits.h"
-#include "doc/image_iterator.h"
+#include "doc/image_traits.h"
 #include "doc/palette.h"
 
 namespace doc {
@@ -25,7 +24,7 @@ template<typename ImageTraits>
 class LockImageBits;
 
 template<class Traits>
-class ImageImpl : public Image {
+class ImageImpl final : public Image {
 public:
   using traits_t = Traits;
   using address_t = typename traits_t::address_t;

src/doc/image_iterator.h

@@ -10,6 +10,7 @@
 #pragma once
 
 #include "doc/color.h"
+#include "doc/image_traits.h"
 #include "doc/primitives_fast.h"
 #include "gfx/point.h"
 #include "gfx/rect.h"

src/doc/image_tests.cpp

@@ -11,7 +11,7 @@
 
 #include <gtest/gtest.h>
 
-#include "doc/image_impl.h"
+#include "doc/image.h"
 #include "doc/primitives.h"
 
 #include <memory>

src/doc/mask.cpp

@@ -9,7 +9,7 @@
   #include "config.h"
 #endif
 
-#include "doc/image_impl.h"
+#include "doc/image.h"
 #include "doc/mask.h"
 #include "gfx/point.h"
 

src/doc/mask_boundaries.cpp

@@ -10,7 +10,7 @@
 
 #include "doc/mask_boundaries.h"
 
-#include "doc/image_impl.h"
+#include "doc/image.h"
 
 namespace doc {
 

src/doc/octree_map.h

@@ -9,7 +9,7 @@
 #pragma once
 
 #include "doc/color.h"
-#include "doc/image_impl.h"
+#include "doc/image.h"
 #include "doc/palette.h"
 #include "doc/rgbmap_base.h"
 

src/doc/primitives.cpp

@@ -14,7 +14,7 @@
 #include "doc/algo.h"
 #include "doc/brush.h"
 #include "doc/dispatch.h"
-#include "doc/image_impl.h"
+#include "doc/image.h"
 #include "doc/palette.h"
 #include "doc/remap.h"
 #include "doc/rgbmap.h"

src/doc/primitives_fast.h

@@ -10,10 +10,12 @@
 #pragma once
 
 #include "doc/color.h"
+#include "doc/image.h"
+#include "doc/image_impl.h"
 #include "doc/image_traits.h"
 
 namespace doc {
-class Image;
+
 template<typename ImageTraits>
 class ImageImpl;
 

src/doc/primitives_tests.cpp

@@ -13,7 +13,7 @@
 #include "doc/primitives.h"
 
 #include "doc/algorithm/random_image.h"
-#include "doc/image_impl.h"
+#include "doc/image.h"
 #include "doc/image_ref.h"
 #include "doc/primitives_fast.h"
 

src/doc/sprite.cpp

@@ -15,7 +15,7 @@
 #include "base/remove_from_container.h"
 #include "doc/cel.h"
 #include "doc/cels_range.h"
-#include "doc/image_impl.h"
+#include "doc/image.h"
 #include "doc/layer.h"
 #include "doc/layer_tilemap.h"
 #include "doc/octree_map.h"

src/doc/util.cpp

@@ -7,7 +7,6 @@
 #include "doc/util.h"
 
 #include "doc/image.h"
-#include "doc/image_impl.h"
 #include "doc/mask.h"
 #include "doc/tileset.h"
 

src/filters/convolution_matrix_filter.cpp

@@ -11,7 +11,7 @@
 
 #include "filters/convolution_matrix_filter.h"
 
-#include "doc/image_impl.h"
+#include "doc/image.h"
 #include "doc/palette.h"
 #include "doc/rgbmap.h"
 #include "filters/convolution_matrix.h"

src/filters/median_filter.cpp

@@ -12,7 +12,7 @@
 #include "filters/median_filter.h"
 
 #include "base/memory.h"
-#include "doc/image_impl.h"
+#include "doc/image.h"
 #include "doc/palette.h"
 #include "doc/rgbmap.h"
 #include "filters/filter_indexed_data.h"

src/render/gradient.cpp

@@ -13,7 +13,6 @@
 
 #include "base/vector2d.h"
 #include "doc/image.h"
-#include "doc/image_impl.h"
 #include "render/dithering_matrix.h"
 
 namespace render {

src/render/ordered_dither.h

@@ -10,7 +10,7 @@
 #pragma once
 
 #include "doc/color.h"
-#include "doc/image_impl.h"
+#include "doc/image.h"
 #include "doc/palette.h"
 #include "doc/rgbmap.h"
 #include "gfx/point.h"

src/render/quantization.cpp

@@ -11,7 +11,7 @@
 
 #include "render/quantization.h"
 
-#include "doc/image_impl.h"
+#include "doc/image.h"
 #include "doc/layer.h"
 #include "doc/octree_map.h"
 #include "doc/palette.h"

src/render/render.cpp

@@ -14,7 +14,7 @@
 #include "doc/blend_internals.h"
 #include "doc/blend_mode.h"
 #include "doc/doc.h"
-#include "doc/image_impl.h"
+#include "doc/image.h"
 #include "doc/layer_tilemap.h"
 #include "doc/playback.h"
 #include "doc/render_plan.h"