From 7fb8cfc8fab97c9e4caa3a437501e4dfc4be47f3 Mon Sep 17 00:00:00 2001 From: David Capello Date: Thu, 19 Dec 2024 09:36:27 -0300 Subject: [PATCH] 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 | 1 - src/app/cmd/clear_mask.cpp | 2 +- src/app/commands/cmd_select_palette.cpp | 2 +- src/app/commands/filters/filter_manager_impl.cpp | 1 + src/app/commands/filters/filter_manager_impl.h | 2 +- src/app/commands/screenshot.cpp | 2 +- src/app/file/psd_format.cpp | 2 +- src/app/file/tga_format.cpp | 2 +- src/app/script/image_iterator_class.cpp | 1 - src/app/tools/ink_processing.h | 2 +- src/app/tools/tool_box.cpp | 2 +- src/app/ui/color_bar.cpp | 1 - src/app/ui/color_popup.cpp | 2 +- src/app/ui/editor/brush_preview.cpp | 2 +- src/app/util/clipboard_native.cpp | 2 +- src/app/util/conversion_to_image.cpp | 1 - src/app/util/conversion_to_surface.cpp | 2 +- src/app/util/expand_cel_canvas.cpp | 1 - src/app/util/layer_boundaries.cpp | 1 - src/app/util/new_image_from_mask.cpp | 2 +- src/doc/algorithm/fill_selection.cpp | 2 +- src/doc/algorithm/flip_image.cpp | 1 - src/doc/algorithm/modify_selection.cpp | 2 +- src/doc/algorithm/random_image.cpp | 1 - src/doc/algorithm/resize_image.cpp | 2 +- src/doc/algorithm/rotate.cpp | 2 +- src/doc/algorithm/rotsprite.cpp | 2 +- src/doc/algorithm/shrink_bounds.cpp | 1 - src/doc/blend_image.cpp | 2 +- src/doc/brush.cpp | 1 - src/doc/doc.h | 1 - src/doc/grid.cpp | 1 - src/doc/image.h | 3 +++ src/doc/image_bits.h | 2 ++ src/doc/image_impl.cpp | 5 +---- src/doc/image_impl.h | 5 ++--- src/doc/image_iterator.h | 1 + src/doc/image_tests.cpp | 2 +- src/doc/mask.cpp | 2 +- src/doc/mask_boundaries.cpp | 2 +- src/doc/octree_map.h | 2 +- src/doc/primitives.cpp | 2 +- src/doc/primitives_fast.h | 4 +++- src/doc/primitives_tests.cpp | 2 +- src/doc/sprite.cpp | 2 +- src/doc/util.cpp | 1 - src/filters/convolution_matrix_filter.cpp | 2 +- src/filters/median_filter.cpp | 2 +- src/render/gradient.cpp | 1 - src/render/ordered_dither.h | 2 +- src/render/quantization.cpp | 2 +- src/render/render.cpp | 2 +- 52 files changed, 44 insertions(+), 53 deletions(-) diff --git a/src/app/app_brushes.cpp b/src/app/app_brushes.cpp index 22f5db2b4..a1c5db546 100644 --- a/src/app/app_brushes.cpp +++ b/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" diff --git a/src/app/cmd/clear_mask.cpp b/src/app/cmd/clear_mask.cpp index f2f8aec58..ed2c38dc9 100644 --- a/src/app/cmd/clear_mask.cpp +++ b/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" diff --git a/src/app/commands/cmd_select_palette.cpp b/src/app/commands/cmd_select_palette.cpp index dcbbbb8f0..63742a7df 100644 --- a/src/app/commands/cmd_select_palette.cpp +++ b/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" diff --git a/src/app/commands/filters/filter_manager_impl.cpp b/src/app/commands/filters/filter_manager_impl.cpp index 32196e5d7..7349f7f49 100644 --- a/src/app/commands/filters/filter_manager_impl.cpp +++ b/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" diff --git a/src/app/commands/filters/filter_manager_impl.h b/src/app/commands/filters/filter_manager_impl.h index 56aafacbd..aec740db6 100644 --- a/src/app/commands/filters/filter_manager_impl.h +++ b/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" diff --git a/src/app/commands/screenshot.cpp b/src/app/commands/screenshot.cpp index 17c719c33..cca841583 100644 --- a/src/app/commands/screenshot.cpp +++ b/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" diff --git a/src/app/file/psd_format.cpp b/src/app/file/psd_format.cpp index 208d6b0ff..e736a93c6 100644 --- a/src/app/file/psd_format.cpp +++ b/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" diff --git a/src/app/file/tga_format.cpp b/src/app/file/tga_format.cpp index d051b8bd0..49f466f77 100644 --- a/src/app/file/tga_format.cpp +++ b/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" diff --git a/src/app/script/image_iterator_class.cpp b/src/app/script/image_iterator_class.cpp index 0332d15d5..36e8aea65 100644 --- a/src/app/script/image_iterator_class.cpp +++ b/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" diff --git a/src/app/tools/ink_processing.h b/src/app/tools/ink_processing.h index 80370a9e6..ab11df6a4 100644 --- a/src/app/tools/ink_processing.h +++ b/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" diff --git a/src/app/tools/tool_box.cpp b/src/app/tools/tool_box.cpp index 2d69448bc..0624bb229 100644 --- a/src/app/tools/tool_box.cpp +++ b/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" diff --git a/src/app/ui/color_bar.cpp b/src/app/ui/color_bar.cpp index 52871db2c..64008b002 100644 --- a/src/app/ui/color_bar.cpp +++ b/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" diff --git a/src/app/ui/color_popup.cpp b/src/app/ui/color_popup.cpp index 6a5a84313..6d6dd0f71 100644 --- a/src/app/ui/color_popup.cpp +++ b/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" diff --git a/src/app/ui/editor/brush_preview.cpp b/src/app/ui/editor/brush_preview.cpp index 07a738646..faf54186c 100644 --- a/src/app/ui/editor/brush_preview.cpp +++ b/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" diff --git a/src/app/util/clipboard_native.cpp b/src/app/util/clipboard_native.cpp index b00e7d325..48eac277b 100644 --- a/src/app/util/clipboard_native.cpp +++ b/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" diff --git a/src/app/util/conversion_to_image.cpp b/src/app/util/conversion_to_image.cpp index 464743afb..4a613a973 100644 --- a/src/app/util/conversion_to_image.cpp +++ b/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" diff --git a/src/app/util/conversion_to_surface.cpp b/src/app/util/conversion_to_surface.cpp index 5b45a7a6f..3d92fc036 100644 --- a/src/app/util/conversion_to_surface.cpp +++ b/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" diff --git a/src/app/util/expand_cel_canvas.cpp b/src/app/util/expand_cel_canvas.cpp index d2b626d11..da0159916 100644 --- a/src/app/util/expand_cel_canvas.cpp +++ b/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" diff --git a/src/app/util/layer_boundaries.cpp b/src/app/util/layer_boundaries.cpp index 686013044..c6a4e6404 100644 --- a/src/app/util/layer_boundaries.cpp +++ b/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" diff --git a/src/app/util/new_image_from_mask.cpp b/src/app/util/new_image_from_mask.cpp index 889aa8122..4fa276134 100644 --- a/src/app/util/new_image_from_mask.cpp +++ b/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" diff --git a/src/doc/algorithm/fill_selection.cpp b/src/doc/algorithm/fill_selection.cpp index 5634d50e5..0bbceedfe 100644 --- a/src/doc/algorithm/fill_selection.cpp +++ b/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" diff --git a/src/doc/algorithm/flip_image.cpp b/src/doc/algorithm/flip_image.cpp index 0b1b4cbc8..54a2dbd02 100644 --- a/src/doc/algorithm/flip_image.cpp +++ b/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" diff --git a/src/doc/algorithm/modify_selection.cpp b/src/doc/algorithm/modify_selection.cpp index e307c6289..f805eeb21 100644 --- a/src/doc/algorithm/modify_selection.cpp +++ b/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" diff --git a/src/doc/algorithm/random_image.cpp b/src/doc/algorithm/random_image.cpp index 051b0c6fa..471a74417 100644 --- a/src/doc/algorithm/random_image.cpp +++ b/src/doc/algorithm/random_image.cpp @@ -12,7 +12,6 @@ #include "doc/dispatch.h" #include "doc/image.h" -#include "doc/image_impl.h" #include diff --git a/src/doc/algorithm/resize_image.cpp b/src/doc/algorithm/resize_image.cpp index 80d5f5d77..ee0e0624a 100644 --- a/src/doc/algorithm/resize_image.cpp +++ b/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" diff --git a/src/doc/algorithm/rotate.cpp b/src/doc/algorithm/rotate.cpp index 6b7add386..be4e8c21e 100644 --- a/src/doc/algorithm/rotate.cpp +++ b/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" diff --git a/src/doc/algorithm/rotsprite.cpp b/src/doc/algorithm/rotsprite.cpp index 8e4a87564..d5b920ac7 100644 --- a/src/doc/algorithm/rotsprite.cpp +++ b/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 diff --git a/src/doc/algorithm/shrink_bounds.cpp b/src/doc/algorithm/shrink_bounds.cpp index 93f489b74..a53acce32 100644 --- a/src/doc/algorithm/shrink_bounds.cpp +++ b/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" diff --git a/src/doc/blend_image.cpp b/src/doc/blend_image.cpp index 5b70e65d4..e4b1aaad1 100644 --- a/src/doc/blend_image.cpp +++ b/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 { diff --git a/src/doc/brush.cpp b/src/doc/brush.cpp index f9fca7804..eaa342f67 100644 --- a/src/doc/brush.cpp +++ b/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 diff --git a/src/doc/doc.h b/src/doc/doc.h index 6974756d1..8fb05d0f8 100644 --- a/src/doc/doc.h +++ b/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" diff --git a/src/doc/grid.cpp b/src/doc/grid.cpp index c4ce22451..8ca41a237 100644 --- a/src/doc/grid.cpp +++ b/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" diff --git a/src/doc/image.h b/src/doc/image.h index 915956580..2287ea4db 100644 --- a/src/doc/image.h +++ b/src/doc/image.h @@ -115,4 +115,7 @@ private: } // namespace doc +#include "doc/image_bits.h" +#include "doc/image_iterator.h" + #endif diff --git a/src/doc/image_bits.h b/src/doc/image_bits.h index 15b7a6375..90a55eefd 100644 --- a/src/doc/image_bits.h +++ b/src/doc/image_bits.h @@ -9,6 +9,8 @@ #define DOC_IMAGE_BITS_H_INCLUDED #pragma once +#include "gfx/rect.h" + #include namespace doc { diff --git a/src/doc/image_impl.cpp b/src/doc/image_impl.cpp index 6e5e2b0e6..05e43b8a8 100644 --- a/src/doc/image_impl.cpp +++ b/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 { diff --git a/src/doc/image_impl.h b/src/doc/image_impl.h index 85a9fb6aa..75ff53b7d 100644 --- a/src/doc/image_impl.h +++ b/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 class LockImageBits; template -class ImageImpl : public Image { +class ImageImpl final : public Image { public: using traits_t = Traits; using address_t = typename traits_t::address_t; diff --git a/src/doc/image_iterator.h b/src/doc/image_iterator.h index d598c5512..73f600925 100644 --- a/src/doc/image_iterator.h +++ b/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" diff --git a/src/doc/image_tests.cpp b/src/doc/image_tests.cpp index 9b480f46b..42922957c 100644 --- a/src/doc/image_tests.cpp +++ b/src/doc/image_tests.cpp @@ -11,7 +11,7 @@ #include -#include "doc/image_impl.h" +#include "doc/image.h" #include "doc/primitives.h" #include diff --git a/src/doc/mask.cpp b/src/doc/mask.cpp index f05d721db..f8e9e94d0 100644 --- a/src/doc/mask.cpp +++ b/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" diff --git a/src/doc/mask_boundaries.cpp b/src/doc/mask_boundaries.cpp index e5a16f4ef..24286a8d5 100644 --- a/src/doc/mask_boundaries.cpp +++ b/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 { diff --git a/src/doc/octree_map.h b/src/doc/octree_map.h index 0197d7b14..219069210 100644 --- a/src/doc/octree_map.h +++ b/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" diff --git a/src/doc/primitives.cpp b/src/doc/primitives.cpp index a70dc6bc2..be10329fe 100644 --- a/src/doc/primitives.cpp +++ b/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" diff --git a/src/doc/primitives_fast.h b/src/doc/primitives_fast.h index d90fca386..4a9b5846a 100644 --- a/src/doc/primitives_fast.h +++ b/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 class ImageImpl; diff --git a/src/doc/primitives_tests.cpp b/src/doc/primitives_tests.cpp index e8cf86b42..c539595ce 100644 --- a/src/doc/primitives_tests.cpp +++ b/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" diff --git a/src/doc/sprite.cpp b/src/doc/sprite.cpp index 19e0aee5e..a698eb572 100644 --- a/src/doc/sprite.cpp +++ b/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" diff --git a/src/doc/util.cpp b/src/doc/util.cpp index 5995e679a..d451fbb11 100644 --- a/src/doc/util.cpp +++ b/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" diff --git a/src/filters/convolution_matrix_filter.cpp b/src/filters/convolution_matrix_filter.cpp index 0bf295ed3..7ea208d05 100644 --- a/src/filters/convolution_matrix_filter.cpp +++ b/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" diff --git a/src/filters/median_filter.cpp b/src/filters/median_filter.cpp index f7fe245c7..23bed71c3 100644 --- a/src/filters/median_filter.cpp +++ b/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" diff --git a/src/render/gradient.cpp b/src/render/gradient.cpp index 368712d7c..8d417c668 100644 --- a/src/render/gradient.cpp +++ b/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 { diff --git a/src/render/ordered_dither.h b/src/render/ordered_dither.h index 267c59504..61f961d7c 100644 --- a/src/render/ordered_dither.h +++ b/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" diff --git a/src/render/quantization.cpp b/src/render/quantization.cpp index df9d392a7..072f9f749 100644 --- a/src/render/quantization.cpp +++ b/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" diff --git a/src/render/render.cpp b/src/render/render.cpp index ad771076d..b19fea603 100644 --- a/src/render/render.cpp +++ b/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"