From fb27cf0e424b074db96e2dedfa915e04bbfd44f9 Mon Sep 17 00:00:00 2001 From: Tact Yoshida Date: Feb 03 2020 20:13:08 +0000 Subject: Use std::minmax_element --- diff --git a/toonz/sources/toonzlib/tcenterlinecolors.cpp b/toonz/sources/toonzlib/tcenterlinecolors.cpp index 57a94d9..172026d 100644 --- a/toonz/sources/toonzlib/tcenterlinecolors.cpp +++ b/toonz/sources/toonzlib/tcenterlinecolors.cpp @@ -7,7 +7,6 @@ // Boost includes #include -#include namespace boost_c = boost::container; @@ -514,13 +513,6 @@ static int getInkPredominance(const TRasterCM32P &ras, TPalette *palette, int x, */ static int getBranchPredominance(const TRasterCM32P &ras, TPalette *palette, JointSequenceGraph::Node &node) { - struct locals { - static inline bool valueLess(const std::pair &a, - const std::pair &b) { - return (a.second < b.second); - } - }; - boost_c::flat_map branchInksHistogram; UINT l, lCount = node.getLinksCount(); @@ -536,9 +528,11 @@ static int getBranchPredominance(const TRasterCM32P &ras, TPalette *palette, typedef boost_c::flat_map::iterator histo_it; - const std::pair &histoRange = - boost::minmax_element(branchInksHistogram.begin(), - branchInksHistogram.end(), locals::valueLess); + const std::pair &histoRange = std::minmax_element( + branchInksHistogram.begin(), branchInksHistogram.end(), + [](const std::pair &a, const std::pair &b) { + return a.second < b.second; + }); return (histoRange.first->second == histoRange.second->second) ? -1