diff --git a/toonz/sources/CMakeLists.txt b/toonz/sources/CMakeLists.txt index ef90216..111441c 100644 --- a/toonz/sources/CMakeLists.txt +++ b/toonz/sources/CMakeLists.txt @@ -21,6 +21,7 @@ if (WIN32) endif() set(QT_LIB_PATH ${QT_PATH}) set(CMAKE_PREFIX_PATH "${QT_PATH}/lib/cmake/") + add_definitions(-DNOMINMAX) elseif (APPLE) message("Apple System") if (NOT PLATFORM) diff --git a/toonz/sources/include/tscanner.h b/toonz/sources/include/tscanner.h index f34b7c3..c8c0202 100644 --- a/toonz/sources/include/tscanner.h +++ b/toonz/sources/include/tscanner.h @@ -1,12 +1,6 @@ - - #ifndef TSCANNER_H #define TSCANNER_H -#ifdef _WIN32 -#define NOMINMAX -#endif - #include "trasterimage.h" #include #include diff --git a/toonz/sources/stdfx/artcontourfx.cpp b/toonz/sources/stdfx/artcontourfx.cpp index b884a10..5ab992a 100644 --- a/toonz/sources/stdfx/artcontourfx.cpp +++ b/toonz/sources/stdfx/artcontourfx.cpp @@ -1,8 +1,5 @@ - - #ifdef _WIN32 #pragma warning(disable : 4996) -#define NOMINMAX #endif #include "ttzpimagefx.h" diff --git a/toonz/sources/stdfx/blendtzfx.cpp b/toonz/sources/stdfx/blendtzfx.cpp index b05f2e3..186e04a 100644 --- a/toonz/sources/stdfx/blendtzfx.cpp +++ b/toonz/sources/stdfx/blendtzfx.cpp @@ -1,8 +1,5 @@ - - #ifdef _WIN32 #pragma warning(disable : 4996) -#define NOMINMAX #endif #include "ttzpimagefx.h" diff --git a/toonz/sources/stdfx/blurfx.cpp b/toonz/sources/stdfx/blurfx.cpp index 27801c5..bc26110 100644 --- a/toonz/sources/stdfx/blurfx.cpp +++ b/toonz/sources/stdfx/blurfx.cpp @@ -1,9 +1,3 @@ - - -#ifdef _WIN32 -#define NOMINMAX -#endif - #include "texception.h" #include "tfxparam.h" #include "trop.h" diff --git a/toonz/sources/stdfx/igs_fog.cpp b/toonz/sources/stdfx/igs_fog.cpp index 663e5f4..000432c 100644 --- a/toonz/sources/stdfx/igs_fog.cpp +++ b/toonz/sources/stdfx/igs_fog.cpp @@ -3,9 +3,6 @@ #include // std::numeric_limits #include // std::domain_error() #include // std::max(),std::rotate() -#if defined _WIN32 && !defined NOMINMAX -#define NOMINMAX // cancel max(-) -#endif #include "igs_resource_multithread.h" #include "igs_ifx_common.h" #include "igs_fog.h" diff --git a/toonz/sources/stdfx/ino_blend_add.cpp b/toonz/sources/stdfx/ino_blend_add.cpp index c783825..1a596b1 100644 --- a/toonz/sources/stdfx/ino_blend_add.cpp +++ b/toonz/sources/stdfx/ino_blend_add.cpp @@ -1,7 +1,4 @@ //------------------------------------------------------------ -#if defined _WIN32 && !defined NOMINMAX -#define NOMINMAX -#endif #include "tfxparam.h" #include "stdfx.h" diff --git a/toonz/sources/stdfx/ino_blend_color_burn.cpp b/toonz/sources/stdfx/ino_blend_color_burn.cpp index 8a3a90e..88631d3 100644 --- a/toonz/sources/stdfx/ino_blend_color_burn.cpp +++ b/toonz/sources/stdfx/ino_blend_color_burn.cpp @@ -1,7 +1,4 @@ //------------------------------------------------------------ -#if defined _WIN32 && !defined NOMINMAX -#define NOMINMAX -#endif #include "tfxparam.h" #include "stdfx.h" diff --git a/toonz/sources/stdfx/ino_blend_color_dodge.cpp b/toonz/sources/stdfx/ino_blend_color_dodge.cpp index 55236a5..d612e6a 100644 --- a/toonz/sources/stdfx/ino_blend_color_dodge.cpp +++ b/toonz/sources/stdfx/ino_blend_color_dodge.cpp @@ -1,7 +1,4 @@ //------------------------------------------------------------ -#if defined _WIN32 && !defined NOMINMAX -#define NOMINMAX -#endif #include "tfxparam.h" #include "stdfx.h" diff --git a/toonz/sources/stdfx/ino_blend_cross_dissolve.cpp b/toonz/sources/stdfx/ino_blend_cross_dissolve.cpp index 58f7b2f..5c89d5d 100644 --- a/toonz/sources/stdfx/ino_blend_cross_dissolve.cpp +++ b/toonz/sources/stdfx/ino_blend_cross_dissolve.cpp @@ -1,7 +1,4 @@ //------------------------------------------------------------ -#if defined _WIN32 && !defined NOMINMAX -#define NOMINMAX -#endif #include "tfxparam.h" #include "stdfx.h" diff --git a/toonz/sources/stdfx/ino_blend_darken.cpp b/toonz/sources/stdfx/ino_blend_darken.cpp index 96c09b5..0fd040b 100644 --- a/toonz/sources/stdfx/ino_blend_darken.cpp +++ b/toonz/sources/stdfx/ino_blend_darken.cpp @@ -1,7 +1,4 @@ //------------------------------------------------------------ -#if defined _WIN32 && !defined NOMINMAX -#define NOMINMAX -#endif #include "tfxparam.h" #include "stdfx.h" diff --git a/toonz/sources/stdfx/ino_blend_darker_color.cpp b/toonz/sources/stdfx/ino_blend_darker_color.cpp index f4b5a2b..28e1b07 100644 --- a/toonz/sources/stdfx/ino_blend_darker_color.cpp +++ b/toonz/sources/stdfx/ino_blend_darker_color.cpp @@ -1,7 +1,4 @@ //------------------------------------------------------------ -#if defined _WIN32 && !defined NOMINMAX -#define NOMINMAX -#endif #include "tfxparam.h" #include "stdfx.h" diff --git a/toonz/sources/stdfx/ino_blend_divide.cpp b/toonz/sources/stdfx/ino_blend_divide.cpp index 7c08507..0f132c4 100644 --- a/toonz/sources/stdfx/ino_blend_divide.cpp +++ b/toonz/sources/stdfx/ino_blend_divide.cpp @@ -1,7 +1,4 @@ //------------------------------------------------------------ -#if defined _WIN32 && !defined NOMINMAX -#define NOMINMAX -#endif #include "tfxparam.h" #include "stdfx.h" diff --git a/toonz/sources/stdfx/ino_blend_hard_light.cpp b/toonz/sources/stdfx/ino_blend_hard_light.cpp index 0ab01e0..b739841 100644 --- a/toonz/sources/stdfx/ino_blend_hard_light.cpp +++ b/toonz/sources/stdfx/ino_blend_hard_light.cpp @@ -1,7 +1,4 @@ //------------------------------------------------------------ -#if defined _WIN32 && !defined NOMINMAX -#define NOMINMAX -#endif #include "tfxparam.h" #include "stdfx.h" diff --git a/toonz/sources/stdfx/ino_blend_hard_mix.cpp b/toonz/sources/stdfx/ino_blend_hard_mix.cpp index 8c51311..d9b9a32 100644 --- a/toonz/sources/stdfx/ino_blend_hard_mix.cpp +++ b/toonz/sources/stdfx/ino_blend_hard_mix.cpp @@ -1,7 +1,4 @@ //------------------------------------------------------------ -#if defined _WIN32 && !defined NOMINMAX -#define NOMINMAX -#endif #include "tfxparam.h" #include "stdfx.h" diff --git a/toonz/sources/stdfx/ino_blend_lighten.cpp b/toonz/sources/stdfx/ino_blend_lighten.cpp index 3c8a7a0..449a9b3 100644 --- a/toonz/sources/stdfx/ino_blend_lighten.cpp +++ b/toonz/sources/stdfx/ino_blend_lighten.cpp @@ -1,7 +1,4 @@ //------------------------------------------------------------ -#if defined _WIN32 && !defined NOMINMAX -#define NOMINMAX -#endif #include "tfxparam.h" #include "stdfx.h" diff --git a/toonz/sources/stdfx/ino_blend_lighter_color.cpp b/toonz/sources/stdfx/ino_blend_lighter_color.cpp index cc74fe4..ed6a3e4 100644 --- a/toonz/sources/stdfx/ino_blend_lighter_color.cpp +++ b/toonz/sources/stdfx/ino_blend_lighter_color.cpp @@ -1,7 +1,4 @@ //------------------------------------------------------------ -#if defined _WIN32 && !defined NOMINMAX -#define NOMINMAX -#endif #include "tfxparam.h" #include "stdfx.h" diff --git a/toonz/sources/stdfx/ino_blend_linear_burn.cpp b/toonz/sources/stdfx/ino_blend_linear_burn.cpp index 793f87e..60d8011 100644 --- a/toonz/sources/stdfx/ino_blend_linear_burn.cpp +++ b/toonz/sources/stdfx/ino_blend_linear_burn.cpp @@ -1,7 +1,4 @@ //------------------------------------------------------------ -#if defined _WIN32 && !defined NOMINMAX -#define NOMINMAX -#endif #include "tfxparam.h" #include "stdfx.h" diff --git a/toonz/sources/stdfx/ino_blend_linear_dodge.cpp b/toonz/sources/stdfx/ino_blend_linear_dodge.cpp index 5f95d6a..053f635 100644 --- a/toonz/sources/stdfx/ino_blend_linear_dodge.cpp +++ b/toonz/sources/stdfx/ino_blend_linear_dodge.cpp @@ -1,7 +1,4 @@ //------------------------------------------------------------ -#if defined _WIN32 && !defined NOMINMAX -#define NOMINMAX -#endif #include "tfxparam.h" #include "stdfx.h" diff --git a/toonz/sources/stdfx/ino_blend_linear_light.cpp b/toonz/sources/stdfx/ino_blend_linear_light.cpp index b3225a5..548ba22 100644 --- a/toonz/sources/stdfx/ino_blend_linear_light.cpp +++ b/toonz/sources/stdfx/ino_blend_linear_light.cpp @@ -1,7 +1,4 @@ //------------------------------------------------------------ -#if defined _WIN32 && !defined NOMINMAX -#define NOMINMAX -#endif #include "tfxparam.h" #include "stdfx.h" diff --git a/toonz/sources/stdfx/ino_blend_multiply.cpp b/toonz/sources/stdfx/ino_blend_multiply.cpp index 738fc8c..ab49b10 100644 --- a/toonz/sources/stdfx/ino_blend_multiply.cpp +++ b/toonz/sources/stdfx/ino_blend_multiply.cpp @@ -1,7 +1,4 @@ //------------------------------------------------------------ -#if defined _WIN32 && !defined NOMINMAX -#define NOMINMAX -#endif #include "tfxparam.h" #include "stdfx.h" diff --git a/toonz/sources/stdfx/ino_blend_over.cpp b/toonz/sources/stdfx/ino_blend_over.cpp index 9e78579..6c469d2 100644 --- a/toonz/sources/stdfx/ino_blend_over.cpp +++ b/toonz/sources/stdfx/ino_blend_over.cpp @@ -1,7 +1,4 @@ //------------------------------------------------------------ -#if defined _WIN32 && !defined NOMINMAX -#define NOMINMAX -#endif #include "tfxparam.h" #include "stdfx.h" diff --git a/toonz/sources/stdfx/ino_blend_overlay.cpp b/toonz/sources/stdfx/ino_blend_overlay.cpp index 9fdf5d9..c2b1181 100644 --- a/toonz/sources/stdfx/ino_blend_overlay.cpp +++ b/toonz/sources/stdfx/ino_blend_overlay.cpp @@ -1,7 +1,4 @@ //------------------------------------------------------------ -#if defined _WIN32 && !defined NOMINMAX -#define NOMINMAX -#endif #include "tfxparam.h" #include "stdfx.h" diff --git a/toonz/sources/stdfx/ino_blend_pin_light.cpp b/toonz/sources/stdfx/ino_blend_pin_light.cpp index 9c4c1dc..bf3b74b 100644 --- a/toonz/sources/stdfx/ino_blend_pin_light.cpp +++ b/toonz/sources/stdfx/ino_blend_pin_light.cpp @@ -1,7 +1,4 @@ //------------------------------------------------------------ -#if defined _WIN32 && !defined NOMINMAX -#define NOMINMAX -#endif #include "tfxparam.h" #include "stdfx.h" diff --git a/toonz/sources/stdfx/ino_blend_screen.cpp b/toonz/sources/stdfx/ino_blend_screen.cpp index bf7c502..95d46fd 100644 --- a/toonz/sources/stdfx/ino_blend_screen.cpp +++ b/toonz/sources/stdfx/ino_blend_screen.cpp @@ -1,7 +1,4 @@ //------------------------------------------------------------ -#if defined _WIN32 && !defined NOMINMAX -#define NOMINMAX -#endif #include "tfxparam.h" #include "stdfx.h" diff --git a/toonz/sources/stdfx/ino_blend_soft_light.cpp b/toonz/sources/stdfx/ino_blend_soft_light.cpp index 007e5c7..85a5dc6 100644 --- a/toonz/sources/stdfx/ino_blend_soft_light.cpp +++ b/toonz/sources/stdfx/ino_blend_soft_light.cpp @@ -1,7 +1,4 @@ //------------------------------------------------------------ -#if defined _WIN32 && !defined NOMINMAX -#define NOMINMAX -#endif #include "tfxparam.h" #include "stdfx.h" diff --git a/toonz/sources/stdfx/ino_blend_subtract.cpp b/toonz/sources/stdfx/ino_blend_subtract.cpp index dff322d..9bec520 100644 --- a/toonz/sources/stdfx/ino_blend_subtract.cpp +++ b/toonz/sources/stdfx/ino_blend_subtract.cpp @@ -1,7 +1,4 @@ //------------------------------------------------------------ -#if defined _WIN32 && !defined NOMINMAX -#define NOMINMAX -#endif #include "tfxparam.h" #include "stdfx.h" diff --git a/toonz/sources/stdfx/ino_blend_vivid_light.cpp b/toonz/sources/stdfx/ino_blend_vivid_light.cpp index 0bcc1f5..1cbdead 100644 --- a/toonz/sources/stdfx/ino_blend_vivid_light.cpp +++ b/toonz/sources/stdfx/ino_blend_vivid_light.cpp @@ -1,7 +1,4 @@ //------------------------------------------------------------ -#if defined _WIN32 && !defined NOMINMAX -#define NOMINMAX -#endif #include "tfxparam.h" #include "stdfx.h" diff --git a/toonz/sources/stdfx/ino_blur.cpp b/toonz/sources/stdfx/ino_blur.cpp index d327bf3..6d8a1ea 100644 --- a/toonz/sources/stdfx/ino_blur.cpp +++ b/toonz/sources/stdfx/ino_blur.cpp @@ -1,7 +1,3 @@ -#if defined _WIN32 && !defined NOMINMAX -#define NOMINMAX -#endif - #include /* std::ostringstream */ #include "tfxparam.h" #include "stdfx.h" diff --git a/toonz/sources/stdfx/ino_channel_selector.cpp b/toonz/sources/stdfx/ino_channel_selector.cpp index 5937a56..7b132bd 100644 --- a/toonz/sources/stdfx/ino_channel_selector.cpp +++ b/toonz/sources/stdfx/ino_channel_selector.cpp @@ -1,7 +1,3 @@ -#if defined _WIN32 && !defined NOMINMAX -#define NOMINMAX -#endif - #include /* std::ostringstream */ /* Not use boost at toonz-6.1 */ // #include /* boost::shared_array<> */ diff --git a/toonz/sources/stdfx/ino_density.cpp b/toonz/sources/stdfx/ino_density.cpp index 9eb701a..efd553b 100644 --- a/toonz/sources/stdfx/ino_density.cpp +++ b/toonz/sources/stdfx/ino_density.cpp @@ -1,7 +1,3 @@ -#if defined _WIN32 && !defined NOMINMAX -#define NOMINMAX -#endif - #include /* std::ostringstream */ #include "tfxparam.h" #include "stdfx.h" diff --git a/toonz/sources/stdfx/ino_fog.cpp b/toonz/sources/stdfx/ino_fog.cpp index 8ee88b4..e84524b 100644 --- a/toonz/sources/stdfx/ino_fog.cpp +++ b/toonz/sources/stdfx/ino_fog.cpp @@ -1,7 +1,3 @@ -#if defined _WIN32 && !defined NOMINMAX -#define NOMINMAX -#endif - #include /* std::ostringstream */ #include "tfxparam.h" #include "stdfx.h" diff --git a/toonz/sources/stdfx/ino_hls_add.cpp b/toonz/sources/stdfx/ino_hls_add.cpp index 479e632..400d6b2 100644 --- a/toonz/sources/stdfx/ino_hls_add.cpp +++ b/toonz/sources/stdfx/ino_hls_add.cpp @@ -1,7 +1,3 @@ -#if defined _WIN32 && !defined NOMINMAX -#define NOMINMAX -#endif - #include /* std::ostringstream */ #include "tfxparam.h" #include "stdfx.h" diff --git a/toonz/sources/stdfx/ino_hls_adjust.cpp b/toonz/sources/stdfx/ino_hls_adjust.cpp index f87bb6d..7c78595 100644 --- a/toonz/sources/stdfx/ino_hls_adjust.cpp +++ b/toonz/sources/stdfx/ino_hls_adjust.cpp @@ -1,7 +1,3 @@ -#if defined _WIN32 && !defined NOMINMAX -#define NOMINMAX -#endif - #include /* std::ostringstream */ #include "tfxparam.h" #include "stdfx.h" diff --git a/toonz/sources/stdfx/ino_hls_noise.cpp b/toonz/sources/stdfx/ino_hls_noise.cpp index e45ecbc..68bec1c 100644 --- a/toonz/sources/stdfx/ino_hls_noise.cpp +++ b/toonz/sources/stdfx/ino_hls_noise.cpp @@ -1,7 +1,3 @@ -#if defined _WIN32 && !defined NOMINMAX -#define NOMINMAX -#endif - #include /* std::ostringstream */ #include "tfxparam.h" #include "stdfx.h" diff --git a/toonz/sources/stdfx/ino_hsv_add.cpp b/toonz/sources/stdfx/ino_hsv_add.cpp index b8bc128..4e6e0d6 100644 --- a/toonz/sources/stdfx/ino_hsv_add.cpp +++ b/toonz/sources/stdfx/ino_hsv_add.cpp @@ -1,7 +1,3 @@ -#if defined _WIN32 && !defined NOMINMAX -#define NOMINMAX -#endif - #include /* std::ostringstream */ #include "tfxparam.h" #include "stdfx.h" diff --git a/toonz/sources/stdfx/ino_hsv_adjust.cpp b/toonz/sources/stdfx/ino_hsv_adjust.cpp index 453cebc..6bd929e 100644 --- a/toonz/sources/stdfx/ino_hsv_adjust.cpp +++ b/toonz/sources/stdfx/ino_hsv_adjust.cpp @@ -1,7 +1,3 @@ -#if defined _WIN32 && !defined NOMINMAX -#define NOMINMAX -#endif - #include /* std::ostringstream */ #include "tfxparam.h" #include "stdfx.h" diff --git a/toonz/sources/stdfx/ino_hsv_noise.cpp b/toonz/sources/stdfx/ino_hsv_noise.cpp index c133e6a..638b7e6 100644 --- a/toonz/sources/stdfx/ino_hsv_noise.cpp +++ b/toonz/sources/stdfx/ino_hsv_noise.cpp @@ -1,7 +1,3 @@ -#if defined _WIN32 && !defined NOMINMAX -#define NOMINMAX -#endif - #include /* std::ostringstream */ #include "tfxparam.h" #include "stdfx.h" diff --git a/toonz/sources/stdfx/ino_level_auto.cpp b/toonz/sources/stdfx/ino_level_auto.cpp index 331ce07..fdd85bc 100644 --- a/toonz/sources/stdfx/ino_level_auto.cpp +++ b/toonz/sources/stdfx/ino_level_auto.cpp @@ -1,7 +1,3 @@ -#if defined _WIN32 && !defined NOMINMAX -#define NOMINMAX -#endif - #include /* std::ostringstream */ #include "tfxparam.h" #include "stdfx.h" diff --git a/toonz/sources/stdfx/ino_level_master.cpp b/toonz/sources/stdfx/ino_level_master.cpp index b75a962..01ea78e 100644 --- a/toonz/sources/stdfx/ino_level_master.cpp +++ b/toonz/sources/stdfx/ino_level_master.cpp @@ -1,7 +1,3 @@ -#if defined _WIN32 && !defined NOMINMAX -#define NOMINMAX -#endif - #include /* std::ostringstream */ #include "tfxparam.h" #include "stdfx.h" diff --git a/toonz/sources/stdfx/ino_level_rgba.cpp b/toonz/sources/stdfx/ino_level_rgba.cpp index 5e9341b..0a67724 100644 --- a/toonz/sources/stdfx/ino_level_rgba.cpp +++ b/toonz/sources/stdfx/ino_level_rgba.cpp @@ -1,7 +1,3 @@ -#if defined _WIN32 && !defined NOMINMAX -#define NOMINMAX -#endif - #include /* std::ostringstream */ #include "tfxparam.h" #include "stdfx.h" diff --git a/toonz/sources/stdfx/ino_line_blur.cpp b/toonz/sources/stdfx/ino_line_blur.cpp index ac47bba..b7929ec 100644 --- a/toonz/sources/stdfx/ino_line_blur.cpp +++ b/toonz/sources/stdfx/ino_line_blur.cpp @@ -6818,10 +6818,6 @@ void igs::line_blur::convert( //===================== -#if defined _WIN32 && !defined NOMINMAX -#define NOMINMAX -#endif - #include /* std::ostringstream */ #include "tfxparam.h" #include "stdfx.h" diff --git a/toonz/sources/stdfx/ino_maxmin.cpp b/toonz/sources/stdfx/ino_maxmin.cpp index 9222541..057d429 100644 --- a/toonz/sources/stdfx/ino_maxmin.cpp +++ b/toonz/sources/stdfx/ino_maxmin.cpp @@ -1,7 +1,3 @@ -#if defined _WIN32 && !defined NOMINMAX -#define NOMINMAX -#endif - #include /* std::ostringstream */ #include "tfxparam.h" #include "stdfx.h" diff --git a/toonz/sources/stdfx/ino_median.cpp b/toonz/sources/stdfx/ino_median.cpp index ab50eb5..9ac1395 100644 --- a/toonz/sources/stdfx/ino_median.cpp +++ b/toonz/sources/stdfx/ino_median.cpp @@ -1,7 +1,3 @@ -#if defined _WIN32 && !defined NOMINMAX -#define NOMINMAX -#endif - #include /* std::ostringstream */ #include "tfxparam.h" #include "stdfx.h" diff --git a/toonz/sources/stdfx/ino_median_filter.cpp b/toonz/sources/stdfx/ino_median_filter.cpp index 3ba0b8f..c6b9cb3 100644 --- a/toonz/sources/stdfx/ino_median_filter.cpp +++ b/toonz/sources/stdfx/ino_median_filter.cpp @@ -1,7 +1,3 @@ -#if defined _WIN32 && !defined NOMINMAX -#define NOMINMAX -#endif - #include /* std::ostringstream */ #include "tfxparam.h" #include "stdfx.h" diff --git a/toonz/sources/stdfx/ino_motion_blur.cpp b/toonz/sources/stdfx/ino_motion_blur.cpp index 71f6199..462295b 100644 --- a/toonz/sources/stdfx/ino_motion_blur.cpp +++ b/toonz/sources/stdfx/ino_motion_blur.cpp @@ -1,7 +1,3 @@ -#if defined _WIN32 && !defined NOMINMAX -#define NOMINMAX -#endif - #include /* std::ostringstream */ #include "tfxparam.h" #include "stdfx.h" diff --git a/toonz/sources/stdfx/ino_motion_wind.cpp b/toonz/sources/stdfx/ino_motion_wind.cpp index caa1a3f..5e5a693 100644 --- a/toonz/sources/stdfx/ino_motion_wind.cpp +++ b/toonz/sources/stdfx/ino_motion_wind.cpp @@ -1,7 +1,3 @@ -#if defined _WIN32 && !defined NOMINMAX -#define NOMINMAX -#endif - #include /* std::ostringstream */ #include "tfxparam.h" #include "stdfx.h" diff --git a/toonz/sources/stdfx/ino_negate.cpp b/toonz/sources/stdfx/ino_negate.cpp index b5617e5..c210c25 100644 --- a/toonz/sources/stdfx/ino_negate.cpp +++ b/toonz/sources/stdfx/ino_negate.cpp @@ -1,7 +1,3 @@ -#if defined _WIN32 && !defined NOMINMAX -#define NOMINMAX -#endif - #include /* std::ostringstream */ #include "tfxparam.h" #include "stdfx.h" diff --git a/toonz/sources/stdfx/ino_pn_clouds.cpp b/toonz/sources/stdfx/ino_pn_clouds.cpp index 9534c50..890dd06 100644 --- a/toonz/sources/stdfx/ino_pn_clouds.cpp +++ b/toonz/sources/stdfx/ino_pn_clouds.cpp @@ -1,7 +1,3 @@ -#if defined _WIN32 && !defined NOMINMAX -#define NOMINMAX -#endif - #include /* std::ostringstream */ #include "tfxparam.h" #include "stdfx.h" diff --git a/toonz/sources/stdfx/ino_radial_blur.cpp b/toonz/sources/stdfx/ino_radial_blur.cpp index d26350a..17ae5fa 100644 --- a/toonz/sources/stdfx/ino_radial_blur.cpp +++ b/toonz/sources/stdfx/ino_radial_blur.cpp @@ -1,7 +1,3 @@ -#if defined _WIN32 && !defined NOMINMAX -#define NOMINMAX -#endif - #include /* std::ostringstream */ #include "tfxparam.h" #include "tparamset.h" // TPointParamP diff --git a/toonz/sources/stdfx/ino_spin_blur.cpp b/toonz/sources/stdfx/ino_spin_blur.cpp index 6489a21..d3efebf 100644 --- a/toonz/sources/stdfx/ino_spin_blur.cpp +++ b/toonz/sources/stdfx/ino_spin_blur.cpp @@ -1,7 +1,3 @@ -#if defined _WIN32 && !defined NOMINMAX -#define NOMINMAX -#endif - #include /* std::ostringstream */ #include "tfxparam.h" #include "tparamset.h" // TPointParamP diff --git a/toonz/sources/stdfx/ino_warp_hv.cpp b/toonz/sources/stdfx/ino_warp_hv.cpp index e741708..b3cd9fa 100644 --- a/toonz/sources/stdfx/ino_warp_hv.cpp +++ b/toonz/sources/stdfx/ino_warp_hv.cpp @@ -1,7 +1,3 @@ -#if defined _WIN32 && !defined NOMINMAX -#define NOMINMAX -#endif - #include /* std::ostringstream */ #include "tfxparam.h" #include "stdfx.h" diff --git a/toonz/sources/stdfx/iwa_particlesengine.cpp b/toonz/sources/stdfx/iwa_particlesengine.cpp index 1ebbf3d..ad8ecc9 100644 --- a/toonz/sources/stdfx/iwa_particlesengine.cpp +++ b/toonz/sources/stdfx/iwa_particlesengine.cpp @@ -2,8 +2,6 @@ // Iwa_Particles_Engine for Marnie // based on Particles_Engine by Digital Video //------------------------------------------------------------------ -#define NOMINMAX - #include "trop.h" #include "tfxparam.h" #include "tofflinegl.h" diff --git a/toonz/sources/tnzext/NotSimmetricBezierPotential.cpp b/toonz/sources/tnzext/NotSimmetricBezierPotential.cpp index e8a3a5e..b4a6101 100644 --- a/toonz/sources/tnzext/NotSimmetricBezierPotential.cpp +++ b/toonz/sources/tnzext/NotSimmetricBezierPotential.cpp @@ -1,9 +1,3 @@ - - -#ifdef _WIN32 -#define NOMINMAX -#endif - #include "ext/NotSimmetricBezierPotential.h" #include "tstroke.h" diff --git a/toonz/sources/tnzext/OverallDesigner.cpp b/toonz/sources/tnzext/OverallDesigner.cpp index 4240a1f..41175f3 100644 --- a/toonz/sources/tnzext/OverallDesigner.cpp +++ b/toonz/sources/tnzext/OverallDesigner.cpp @@ -1,9 +1,3 @@ - - -#ifdef _WIN32 -#define NOMINMAX -#endif - #include "ext/OverallDesigner.h" //#include "ext/StrokeParametricDeformer.h" #include "ext/StrokeDeformation.h" diff --git a/toonz/sources/tnzext/Selector.cpp b/toonz/sources/tnzext/Selector.cpp index d98caab..3d8c554 100644 --- a/toonz/sources/tnzext/Selector.cpp +++ b/toonz/sources/tnzext/Selector.cpp @@ -1,9 +1,3 @@ - - -#ifdef _WIN32 -#define NOMINMAX -#endif - #include "ext/Selector.h" #include "tgl.h" //#include "drawutil.h" diff --git a/toonz/sources/tnzext/StrokeDeformationImpl.cpp b/toonz/sources/tnzext/StrokeDeformationImpl.cpp index 0e651c5..38d51f0 100644 --- a/toonz/sources/tnzext/StrokeDeformationImpl.cpp +++ b/toonz/sources/tnzext/StrokeDeformationImpl.cpp @@ -6,9 +6,6 @@ #ifdef _DEBUG #define _STLP_DEBUG 1 #endif -#ifdef _WIN32 -#define NOMINMAX -#endif #include "ext/StrokeDeformationImpl.h" #include "ext/StrokeDeformation.h" diff --git a/toonz/sources/tnztools/pinchtool.cpp b/toonz/sources/tnztools/pinchtool.cpp index 5cb69ea..8504f4b 100644 --- a/toonz/sources/tnztools/pinchtool.cpp +++ b/toonz/sources/tnztools/pinchtool.cpp @@ -48,6 +48,7 @@ #include "ext/StrokeDeformation.h" #include +#include using namespace ToolUtils; using namespace ToonzExt; @@ -273,7 +274,7 @@ void PinchTool::leftButtonDrag(const TPointD &pos, val_in_range = m_selector.getLength(); // set value in range - val_in_range = max(min(val_in_range, prop_range.second), prop_range.first); + val_in_range = std::max(std::min(val_in_range, prop_range.second), prop_range.first); try { m_toolRange.setValue(val_in_range); TTool::getApplication()->getCurrentTool()->notifyToolChanged(); diff --git a/toonz/sources/toonz/ObjectTracker.cpp b/toonz/sources/toonz/ObjectTracker.cpp index 265588b..3363549 100644 --- a/toonz/sources/toonz/ObjectTracker.cpp +++ b/toonz/sources/toonz/ObjectTracker.cpp @@ -10,10 +10,6 @@ Compiler: Microsoft Visual Studio.net Luigi Sgaglione **********************************************************************/ -#ifdef _WIN32 -#define NOMINMAX -#endif - #include #include "ObjectTracker.h" diff --git a/toonz/sources/toonz/mergecmapped.cpp b/toonz/sources/toonz/mergecmapped.cpp index 6149dd8..9d1d3d5 100644 --- a/toonz/sources/toonz/mergecmapped.cpp +++ b/toonz/sources/toonz/mergecmapped.cpp @@ -1,5 +1,3 @@ - - #include "tapp.h" #include "tpalette.h" #include "toonz/txsheet.h" @@ -35,6 +33,8 @@ #include "toonz/toonzscene.h" #include "toonz/childstack.h" +#include + using namespace DVGui; namespace @@ -457,13 +457,13 @@ void mergeCmapped(int column, int mColumn, const QString &fullpath, bool isRedo) if (start > end) return; - vector cell(max(end, mEnd) - min(start, mStart) + 1); + vector cell(std::max(end, mEnd) - std::min(start, mStart) + 1); vector mCell(cell.size()); - xsh->getCells(min(start, mStart), column, cell.size(), &(cell[0])); + xsh->getCells(std::min(start, mStart), column, cell.size(), &(cell[0])); if (mColumn != -1) - xsh->getCells(min(start, mStart), mColumn, cell.size(), &(mCell[0])); + xsh->getCells(std::min(start, mStart), mColumn, cell.size(), &(mCell[0])); TXshColumn *col = xsh->getColumn(column); TXshColumn *mcol = xsh->getColumn(mColumn); @@ -511,8 +511,8 @@ void mergeCmapped(int column, int mColumn, const QString &fullpath, bool isRedo) TAffine imgAff, matchAff; - getColumnPlacement(imgAff, xsh, min(start, mStart) + i, column, false); - getColumnPlacement(matchAff, xsh, min(start, mStart) + i, mColumn, false); + getColumnPlacement(imgAff, xsh, std::min(start, mStart) + i, column, false); + getColumnPlacement(matchAff, xsh, std::min(start, mStart) + i, mColumn, false); //std::map::iterator it; MergedPair mp(cell[i].isEmpty() ? TFrameId() : cell[i].getFrameId(), diff --git a/toonz/sources/toonzlib/sandor_fxs/BlurMatrix.cpp b/toonz/sources/toonzlib/sandor_fxs/BlurMatrix.cpp index 0af80d1..1ac1f0a 100644 --- a/toonz/sources/toonzlib/sandor_fxs/BlurMatrix.cpp +++ b/toonz/sources/toonzlib/sandor_fxs/BlurMatrix.cpp @@ -17,7 +17,9 @@ int nanosleep(const struct timespec *rqtp, struct timespec *rmtp); #endif #endif + #include +#include #include #include @@ -199,7 +201,7 @@ void CBlurMatrix::addPath(vector::iterator pBS) //SXYD* xyd= pBS->begin(); int x = xyd->x; int y = xyd->y; - int l = max(abs(x), abs(y)); + int l = std::max(std::abs(x), std::abs(y)); double dx = -(double)x / (double)l; double dy = -(double)y / (double)l; double xx = (double)x + dx; diff --git a/toonz/sources/toonzlib/sandor_fxs/STColSelPic.h b/toonz/sources/toonzlib/sandor_fxs/STColSelPic.h index 8152055..48cdd5a 100644 --- a/toonz/sources/toonzlib/sandor_fxs/STColSelPic.h +++ b/toonz/sources/toonzlib/sandor_fxs/STColSelPic.h @@ -277,21 +277,21 @@ public: bool isBetween(const I_PIXEL &a, const I_PIXEL &b, const I_PIXEL &c) const { - if (c.r < min(a.r, b.r)) + if (c.r < std::min(a.r, b.r)) return false; - if (c.r > max(a.r, b.r)) + if (c.r > std::max(a.r, b.r)) return false; - if (c.g < min(a.g, b.g)) + if (c.g < std::min(a.g, b.g)) return false; - if (c.g > max(a.g, b.g)) + if (c.g > std::max(a.g, b.g)) return false; - if (c.b < min(a.b, b.b)) + if (c.b < std::min(a.b, b.b)) return false; - if (c.b > max(a.b, b.b)) + if (c.b > std::max(a.b, b.b)) return false; - if (c.m < min(a.m, b.m)) + if (c.m < std::min(a.m, b.m)) return false; - if (c.m > max(a.m, b.m)) + if (c.m > std::max(a.m, b.m)) return false; /* //if ( c.m!=0 ) @@ -542,10 +542,10 @@ public: for (int y = 0; y < CSTPic

::m_lY; y++) for (int x = 0; x < CSTPic

::m_lX; x++, pSel++) if (*pSel > (UCHAR)0) { - box.x0 = min(box.x0, x); - box.x1 = max(box.x1, x); - box.y0 = min(box.y0, y); - box.y1 = max(box.y1, y); + box.x0 = std::min(box.x0, x); + box.x1 = std::max(box.x1, x); + box.y0 = std::min(box.y0, y); + box.y1 = std::max(box.y1, y); } } diff --git a/toonz/sources/toonzlib/sandor_fxs/YOMBInputParam.cpp b/toonz/sources/toonzlib/sandor_fxs/YOMBInputParam.cpp index a4b6a1e..b41d3b1 100644 --- a/toonz/sources/toonzlib/sandor_fxs/YOMBInputParam.cpp +++ b/toonz/sources/toonzlib/sandor_fxs/YOMBInputParam.cpp @@ -4,15 +4,17 @@ // ////////////////////////////////////////////////////////////////////// +#ifdef _WIN32 +#pragma warning(disable : 4996) +#endif + +#include #include #include #include #include #include "YOMBInputParam.h" -//#include "tmsg.h" -#ifdef _WIN32 -#pragma warning(disable : 4996) -#endif + ////////////////////////////////////////////////////////////////////// // Construction/Destruction ////////////////////////////////////////////////////////////////////// @@ -72,9 +74,9 @@ void CYOMBInputParam::strToColorIndex(const char *s, COLOR_INDEX_LIST &cil, int begin = getRangeBegin(s); int end = getRangeEnd(s); if (begin >= 0 && end >= 0) { - begin = min(begin, maxIndex); - end = min(end, maxIndex); - for (int i = min(begin, end); i <= max(begin, end) && cil.nb < MAXNBCIL; i++) + begin = std::min(begin, maxIndex); + end = std::min(end, maxIndex); + for (int i = std::min(begin, end); i <= std::max(begin, end) && cil.nb < MAXNBCIL; i++) cil.ci[cil.nb++] = (unsigned short)i; } // If there is no 'begin' or 'end' of range, it is considered diff --git a/toonz/sources/toonzqt/pluginhost.cpp b/toonz/sources/toonzqt/pluginhost.cpp index 4e5d401..4cd67ff 100644 --- a/toonz/sources/toonzqt/pluginhost.cpp +++ b/toonz/sources/toonzqt/pluginhost.cpp @@ -1,6 +1,3 @@ -#ifdef _MSC_VER -#define NOMINMAX -#endif #include #include #include