[aseprite] 18/196: Include base/base.h on files that use MIN/MID/MAX
Tobias Hansen
thansen at moszumanska.debian.org
Wed Apr 20 18:49:56 UTC 2016
This is an automated email from the git hooks/post-receive script.
thansen pushed a commit to branch master
in repository aseprite.
commit 5f97e66a8b454e589450ea739f555abdb552b2be
Author: David Capello <davidcapello at gmail.com>
Date: Thu Mar 3 19:18:46 2016 -0300
Include base/base.h on files that use MIN/MID/MAX
---
src/base/program_options.cpp | 4 +++-
src/doc/algo.cpp | 3 ++-
src/doc/algorithm/floodfill.cpp | 1 +
src/doc/algorithm/rotsprite.cpp | 3 ++-
src/doc/blend_funcs.cpp | 1 +
src/doc/file/col_file.cpp | 3 ++-
src/doc/handle_anidir.cpp | 3 ++-
src/doc/image_io.cpp | 3 ++-
src/doc/mask.cpp | 3 ++-
src/doc/palette.cpp | 3 ++-
src/doc/remap.cpp | 3 ++-
src/doc/site.cpp | 3 ++-
src/doc/sprite.cpp | 3 ++-
src/filters/color_curve_filter.cpp | 7 ++++---
src/filters/convolution_matrix_filter.cpp | 3 ++-
src/filters/replace_color_filter.cpp | 3 ++-
src/render/quantization.cpp | 3 ++-
src/render/render.cpp | 3 ++-
src/render/zoom.cpp | 1 +
src/she/skia/skia_system.h | 1 +
src/she/win/window.h | 1 +
21 files changed, 40 insertions(+), 18 deletions(-)
diff --git a/src/base/program_options.cpp b/src/base/program_options.cpp
index 7fad4cf..f4cb3ce 100644
--- a/src/base/program_options.cpp
+++ b/src/base/program_options.cpp
@@ -1,5 +1,5 @@
// Aseprite Base Library
-// Copyright (c) 2001-2013, 2015 David Capello
+// Copyright (c) 2001-2016 David Capello
//
// This file is released under the terms of the MIT license.
// Read LICENSE.txt for more information.
@@ -10,6 +10,8 @@
#include "base/program_options.h"
+#include "base/base.h"
+
#include <algorithm>
#include <sstream>
#include <iomanip>
diff --git a/src/doc/algo.cpp b/src/doc/algo.cpp
index d4ef8dd..3f394da 100644
--- a/src/doc/algo.cpp
+++ b/src/doc/algo.cpp
@@ -1,5 +1,5 @@
// Aseprite Document Library
-// Copyright (c) 2001-2015 David Capello
+// Copyright (c) 2001-2016 David Capello
//
// This file is released under the terms of the MIT license.
// Read LICENSE.txt for more information.
@@ -10,6 +10,7 @@
#include <math.h>
+#include "base/base.h"
#include "doc/algo.h"
namespace doc {
diff --git a/src/doc/algorithm/floodfill.cpp b/src/doc/algorithm/floodfill.cpp
index bba44f3..8ea5288 100644
--- a/src/doc/algorithm/floodfill.cpp
+++ b/src/doc/algorithm/floodfill.cpp
@@ -15,6 +15,7 @@
#include "config.h"
#endif
+#include "base/base.h"
#include "doc/algo.h"
#include "doc/image.h"
#include "doc/mask.h"
diff --git a/src/doc/algorithm/rotsprite.cpp b/src/doc/algorithm/rotsprite.cpp
index 4901da9..76bc491 100644
--- a/src/doc/algorithm/rotsprite.cpp
+++ b/src/doc/algorithm/rotsprite.cpp
@@ -1,5 +1,5 @@
// Aseprite Document Library
-// Copyright (c) 2001-2015 David Capello
+// Copyright (c) 2001-2016 David Capello
//
// This file is released under the terms of the MIT license.
// Read LICENSE.txt for more information.
@@ -8,6 +8,7 @@
#include "config.h"
#endif
+#include "base/base.h"
#include "base/unique_ptr.h"
#include "doc/algorithm/rotate.h"
#include "doc/image_impl.h"
diff --git a/src/doc/blend_funcs.cpp b/src/doc/blend_funcs.cpp
index 578a822..dc5c9d1 100644
--- a/src/doc/blend_funcs.cpp
+++ b/src/doc/blend_funcs.cpp
@@ -18,6 +18,7 @@
#include "doc/blend_funcs.h"
+#include "base/base.h"
#include "base/debug.h"
#include "doc/blend_internals.h"
diff --git a/src/doc/file/col_file.cpp b/src/doc/file/col_file.cpp
index e1d09a0..594c249 100644
--- a/src/doc/file/col_file.cpp
+++ b/src/doc/file/col_file.cpp
@@ -1,5 +1,5 @@
// Aseprite Document Library
-// Copyright (c) 2001-2015 David Capello
+// Copyright (c) 2001-2016 David Capello
//
// This file is released under the terms of the MIT license.
// Read LICENSE.txt for more information.
@@ -8,6 +8,7 @@
#include "config.h"
#endif
+#include "base/base.h"
#include "base/cfile.h"
#include "base/clamp.h"
#include "doc/color_scales.h"
diff --git a/src/doc/handle_anidir.cpp b/src/doc/handle_anidir.cpp
index 96b2e31..9ba10c1 100644
--- a/src/doc/handle_anidir.cpp
+++ b/src/doc/handle_anidir.cpp
@@ -1,5 +1,5 @@
// Aseprite Document Library
-// Copyright (c) 2001-2015 David Capello
+// Copyright (c) 2001-2016 David Capello
//
// This file is released under the terms of the MIT license.
// Read LICENSE.txt for more information.
@@ -10,6 +10,7 @@
#include "doc/handle_anidir.h"
+#include "base/base.h"
#include "doc/frame.h"
#include "doc/frame_tag.h"
#include "doc/sprite.h"
diff --git a/src/doc/image_io.cpp b/src/doc/image_io.cpp
index 05a161b..264e170 100644
--- a/src/doc/image_io.cpp
+++ b/src/doc/image_io.cpp
@@ -1,5 +1,5 @@
// Aseprite Document Library
-// Copyright (c) 2001-2015 David Capello
+// Copyright (c) 2001-2016 David Capello
//
// This file is released under the terms of the MIT license.
// Read LICENSE.txt for more information.
@@ -10,6 +10,7 @@
#include "doc/image_io.h"
+#include "base/base.h"
#include "base/exception.h"
#include "base/serialization.h"
#include "base/unique_ptr.h"
diff --git a/src/doc/mask.cpp b/src/doc/mask.cpp
index 4225b4f..bc00186 100644
--- a/src/doc/mask.cpp
+++ b/src/doc/mask.cpp
@@ -1,5 +1,5 @@
// Aseprite Document Library
-// Copyright (c) 2001-2015 David Capello
+// Copyright (c) 2001-2016 David Capello
//
// This file is released under the terms of the MIT license.
// Read LICENSE.txt for more information.
@@ -10,6 +10,7 @@
#include "doc/mask.h"
+#include "base/base.h"
#include "base/memory.h"
#include "doc/image_impl.h"
diff --git a/src/doc/palette.cpp b/src/doc/palette.cpp
index b2d16bc..8a74168 100644
--- a/src/doc/palette.cpp
+++ b/src/doc/palette.cpp
@@ -1,5 +1,5 @@
// Aseprite Document Library
-// Copyright (c) 2001-2015 David Capello
+// Copyright (c) 2001-2016 David Capello
//
// This file is released under the terms of the MIT license.
// Read LICENSE.txt for more information.
@@ -10,6 +10,7 @@
#include "doc/palette.h"
+#include "base/base.h"
#include "doc/image.h"
#include "doc/remap.h"
diff --git a/src/doc/remap.cpp b/src/doc/remap.cpp
index a5e9e62..c8350f6 100644
--- a/src/doc/remap.cpp
+++ b/src/doc/remap.cpp
@@ -1,5 +1,5 @@
// Aseprite Document Library
-// Copyright (c) 2001-2015 David Capello
+// Copyright (c) 2001-2016 David Capello
//
// This file is released under the terms of the MIT license.
// Read LICENSE.txt for more information.
@@ -10,6 +10,7 @@
#include "doc/remap.h"
+#include "base/base.h"
#include "doc/palette.h"
#include "doc/palette_picks.h"
#include "doc/rgbmap.h"
diff --git a/src/doc/site.cpp b/src/doc/site.cpp
index ee69d24..e65e74f 100644
--- a/src/doc/site.cpp
+++ b/src/doc/site.cpp
@@ -1,5 +1,5 @@
// Aseprite Document Library
-// Copyright (c) 2001-2015 David Capello
+// Copyright (c) 2001-2016 David Capello
//
// This file is released under the terms of the MIT license.
// Read LICENSE.txt for more information.
@@ -10,6 +10,7 @@
#include "doc/site.h"
+#include "base/base.h"
#include "doc/cel.h"
#include "doc/layer.h"
#include "doc/sprite.h"
diff --git a/src/doc/sprite.cpp b/src/doc/sprite.cpp
index 828e63f..5095201 100644
--- a/src/doc/sprite.cpp
+++ b/src/doc/sprite.cpp
@@ -1,5 +1,5 @@
// Aseprite Document Library
-// Copyright (c) 2001-2015 David Capello
+// Copyright (c) 2001-2016 David Capello
//
// This file is released under the terms of the MIT license.
// Read LICENSE.txt for more information.
@@ -10,6 +10,7 @@
#include "doc/sprite.h"
+#include "base/base.h"
#include "base/memory.h"
#include "base/remove_from_container.h"
#include "base/unique_ptr.h"
diff --git a/src/filters/color_curve_filter.cpp b/src/filters/color_curve_filter.cpp
index 52735d8..a354737 100644
--- a/src/filters/color_curve_filter.cpp
+++ b/src/filters/color_curve_filter.cpp
@@ -1,5 +1,5 @@
// Aseprite
-// Copyright (C) 2001-2015 David Capello
+// Copyright (C) 2001-2016 David Capello
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
@@ -11,8 +11,7 @@
#include "filters/color_curve_filter.h"
-#include <vector>
-
+#include "base/base.h"
#include "filters/color_curve.h"
#include "filters/filter_indexed_data.h"
#include "filters/filter_manager.h"
@@ -21,6 +20,8 @@
#include "doc/rgbmap.h"
#include "doc/sprite.h"
+#include <vector>
+
namespace filters {
using namespace doc;
diff --git a/src/filters/convolution_matrix_filter.cpp b/src/filters/convolution_matrix_filter.cpp
index 5212828..53e0153 100644
--- a/src/filters/convolution_matrix_filter.cpp
+++ b/src/filters/convolution_matrix_filter.cpp
@@ -1,5 +1,5 @@
// Aseprite
-// Copyright (C) 2001-2015 David Capello
+// Copyright (C) 2001-2016 David Capello
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
@@ -11,6 +11,7 @@
#include "filters/convolution_matrix_filter.h"
+#include "base/base.h"
#include "filters/convolution_matrix.h"
#include "filters/filter_indexed_data.h"
#include "filters/filter_manager.h"
diff --git a/src/filters/replace_color_filter.cpp b/src/filters/replace_color_filter.cpp
index 1021cd4..81782f0 100644
--- a/src/filters/replace_color_filter.cpp
+++ b/src/filters/replace_color_filter.cpp
@@ -1,5 +1,5 @@
// Aseprite
-// Copyright (C) 2001-2015 David Capello
+// Copyright (C) 2001-2016 David Capello
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
@@ -11,6 +11,7 @@
#include "filters/replace_color_filter.h"
+#include "base/base.h"
#include "doc/image.h"
#include "doc/palette.h"
#include "doc/rgbmap.h"
diff --git a/src/render/quantization.cpp b/src/render/quantization.cpp
index 8bff4b6..9c7787d 100644
--- a/src/render/quantization.cpp
+++ b/src/render/quantization.cpp
@@ -1,5 +1,5 @@
// Aseprite Render Library
-// Copyright (c) 2001-2015 David Capello
+// Copyright (c) 2001-2016 David Capello
//
// This file is released under the terms of the MIT license.
// Read LICENSE.txt for more information.
@@ -10,6 +10,7 @@
#include "render/quantization.h"
+#include "base/base.h"
#include "doc/image_impl.h"
#include "doc/images_collector.h"
#include "doc/layer.h"
diff --git a/src/render/render.cpp b/src/render/render.cpp
index a9ba29c..da27c23 100644
--- a/src/render/render.cpp
+++ b/src/render/render.cpp
@@ -1,5 +1,5 @@
// Aseprite Render Library
-// Copyright (c) 2001-2015 David Capello
+// Copyright (c) 2001-2016 David Capello
//
// This file is released under the terms of the MIT license.
// Read LICENSE.txt for more information.
@@ -10,6 +10,7 @@
#include "render/render.h"
+#include "base/base.h"
#include "doc/blend_internals.h"
#include "doc/blend_mode.h"
#include "doc/doc.h"
diff --git a/src/render/zoom.cpp b/src/render/zoom.cpp
index 9b7a1f6..eb7169b 100644
--- a/src/render/zoom.cpp
+++ b/src/render/zoom.cpp
@@ -8,6 +8,7 @@
#include "config.h"
#endif
+#include "base/base.h"
#include "base/debug.h"
#include "render/zoom.h"
diff --git a/src/she/skia/skia_system.h b/src/she/skia/skia_system.h
index 8961d5e..1ff2c27 100644
--- a/src/she/skia/skia_system.h
+++ b/src/she/skia/skia_system.h
@@ -8,6 +8,7 @@
#define SHE_SKIA_SKIA_SYSTEM_INCLUDED
#pragma once
+#include "base/base.h"
#include "base/file_handle.h"
#include "SkImageDecoder.h"
diff --git a/src/she/win/window.h b/src/she/win/window.h
index a135544..be29adf 100644
--- a/src/she/win/window.h
+++ b/src/she/win/window.h
@@ -14,6 +14,7 @@
#include <shellapi.h>
#include <sstream>
+#include "base/base.h"
#include "gfx/size.h"
#include "she/event.h"
#include "she/keys.h"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/aseprite.git
More information about the Pkg-games-commits
mailing list