From 3c3669894f9d8b9e079605aee1a84796532fbe5b Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 4 Oct 2021 13:12:38 +1100 Subject: Cleanup: use system includes --- source/blender/blenlib/BLI_task.hh | 2 +- source/blender/blenlib/intern/fileops.c | 4 ++-- source/blender/blenlib/intern/math_color_inline.c | 2 +- source/blender/blenlib/intern/mesh_boolean.cc | 4 ++-- source/blender/blenlib/intern/mesh_intersect.cc | 2 +- source/blender/blenlib/intern/path_util.c | 2 +- source/blender/datatoc/datatoc_icon.c | 2 +- source/blender/editors/io/io_usd.c | 2 +- source/blender/editors/util/select_utils.c | 4 ++-- source/blender/imbuf/intern/jpeg.c | 5 +++-- source/blender/imbuf/intern/png.c | 2 +- source/blender/imbuf/intern/tiff.c | 2 +- source/blender/io/avi/intern/avi_mjpeg.c | 4 ++-- 13 files changed, 19 insertions(+), 18 deletions(-) (limited to 'source') diff --git a/source/blender/blenlib/BLI_task.hh b/source/blender/blenlib/BLI_task.hh index e2446ad143e..da7309837c8 100644 --- a/source/blender/blenlib/BLI_task.hh +++ b/source/blender/blenlib/BLI_task.hh @@ -28,10 +28,10 @@ # define NOMINMAX # define TBB_MIN_MAX_CLEANUP # endif -# include "tbb/parallel_reduce.h" # include # include # include +# include # include # ifdef WIN32 /* We cannot keep this defined, since other parts of the code deal with this on their own, leading diff --git a/source/blender/blenlib/intern/fileops.c b/source/blender/blenlib/intern/fileops.c index 2ef4d1093a8..7019acfbbdc 100644 --- a/source/blender/blenlib/intern/fileops.c +++ b/source/blender/blenlib/intern/fileops.c @@ -30,8 +30,8 @@ #include -#include "zlib.h" -#include "zstd.h" +#include +#include #ifdef WIN32 # include "BLI_fileops_types.h" diff --git a/source/blender/blenlib/intern/math_color_inline.c b/source/blender/blenlib/intern/math_color_inline.c index ad4b844175f..8b3e3b11cff 100644 --- a/source/blender/blenlib/intern/math_color_inline.c +++ b/source/blender/blenlib/intern/math_color_inline.c @@ -27,7 +27,7 @@ #include "BLI_math_color.h" #include "BLI_utildefines.h" -#include "math.h" +#include #ifndef __MATH_COLOR_INLINE_C__ # define __MATH_COLOR_INLINE_C__ diff --git a/source/blender/blenlib/intern/mesh_boolean.cc b/source/blender/blenlib/intern/mesh_boolean.cc index 90ffebdb422..8b029d11c3f 100644 --- a/source/blender/blenlib/intern/mesh_boolean.cc +++ b/source/blender/blenlib/intern/mesh_boolean.cc @@ -51,8 +51,8 @@ # include "BLI_mesh_boolean.hh" # ifdef WITH_TBB -# include "tbb/parallel_reduce.h" -# include "tbb/spin_mutex.h" +# include +# include # endif // # define PERFDEBUG diff --git a/source/blender/blenlib/intern/mesh_intersect.cc b/source/blender/blenlib/intern/mesh_intersect.cc index 5651e52799e..526871c7b1f 100644 --- a/source/blender/blenlib/intern/mesh_intersect.cc +++ b/source/blender/blenlib/intern/mesh_intersect.cc @@ -53,7 +53,7 @@ # include "BLI_mesh_intersect.hh" # ifdef WITH_TBB -# include "tbb/parallel_sort.h" +# include # endif // # define PERFDEBUG diff --git a/source/blender/blenlib/intern/path_util.c b/source/blender/blenlib/intern/path_util.c index 066749f3a94..2403d34e5d7 100644 --- a/source/blender/blenlib/intern/path_util.c +++ b/source/blender/blenlib/intern/path_util.c @@ -48,7 +48,7 @@ # include # include #else -# include "unistd.h" +# include #endif /* WIN32 */ #include "MEM_guardedalloc.h" diff --git a/source/blender/datatoc/datatoc_icon.c b/source/blender/datatoc/datatoc_icon.c index ba7120daa92..8a0c7175fee 100644 --- a/source/blender/datatoc/datatoc_icon.c +++ b/source/blender/datatoc/datatoc_icon.c @@ -32,7 +32,7 @@ # include #endif -#include "png.h" +#include /* for Win32 DIR functions */ #ifdef WIN32 diff --git a/source/blender/editors/io/io_usd.c b/source/blender/editors/io/io_usd.c index d0007d9e5be..4e2ccea36ab 100644 --- a/source/blender/editors/io/io_usd.c +++ b/source/blender/editors/io/io_usd.c @@ -57,7 +57,7 @@ # include "io_usd.h" # include "usd.h" -# include "stdio.h" +# include const EnumPropertyItem rna_enum_usd_export_evaluation_mode_items[] = { {DAG_EVAL_RENDER, diff --git a/source/blender/editors/util/select_utils.c b/source/blender/editors/util/select_utils.c index 5681edd2f5c..99412079adf 100644 --- a/source/blender/editors/util/select_utils.c +++ b/source/blender/editors/util/select_utils.c @@ -18,14 +18,14 @@ * \ingroup edutil */ +#include + #include "BLI_kdtree.h" #include "BLI_math.h" #include "BLI_utildefines.h" #include "ED_select_utils.h" -#include "float.h" - /** 1: select, 0: deselect, -1: pass. */ int ED_select_op_action(const eSelectOp sel_op, const bool is_select, const bool is_inside) { diff --git a/source/blender/imbuf/intern/jpeg.c b/source/blender/imbuf/intern/jpeg.c index 48b5b0c34db..c3a07d7face 100644 --- a/source/blender/imbuf/intern/jpeg.c +++ b/source/blender/imbuf/intern/jpeg.c @@ -40,8 +40,9 @@ #include "IMB_imbuf_types.h" #include "IMB_metadata.h" #include "imbuf.h" -#include "jerror.h" -#include "jpeglib.h" + +#include +#include #include "IMB_colormanagement.h" #include "IMB_colormanagement_intern.h" diff --git a/source/blender/imbuf/intern/png.c b/source/blender/imbuf/intern/png.c index 399fd487065..26f0f11a001 100644 --- a/source/blender/imbuf/intern/png.c +++ b/source/blender/imbuf/intern/png.c @@ -23,7 +23,7 @@ * \todo Save floats as 16 bits per channel, currently readonly. */ -#include "png.h" +#include #include "BLI_fileops.h" #include "BLI_math.h" diff --git a/source/blender/imbuf/intern/tiff.c b/source/blender/imbuf/intern/tiff.c index d9e1db27ef0..3625d7d1af2 100644 --- a/source/blender/imbuf/intern/tiff.c +++ b/source/blender/imbuf/intern/tiff.c @@ -52,7 +52,7 @@ #include "IMB_colormanagement.h" #include "IMB_colormanagement_intern.h" -#include "tiffio.h" +#include #ifdef WIN32 # include "utfconv.h" diff --git a/source/blender/io/avi/intern/avi_mjpeg.c b/source/blender/io/avi/intern/avi_mjpeg.c index 75059c202e5..8b132df7b8f 100644 --- a/source/blender/io/avi/intern/avi_mjpeg.c +++ b/source/blender/io/avi/intern/avi_mjpeg.c @@ -33,8 +33,8 @@ #include "BLI_math_base.h" #include "IMB_imbuf.h" -#include "jerror.h" -#include "jpeglib.h" +#include +#include #include "avi_mjpeg.h" -- cgit v1.2.3