From 5af9e3abc6d9fce609101ee87e53bf6e2ca6bf29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Wed, 13 Feb 2013 00:25:35 +0100 Subject: [PATCH] TextureTools: use Math::max() instead of doing it by hand. --- src/TextureTools/Atlas.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/TextureTools/Atlas.cpp b/src/TextureTools/Atlas.cpp index 336777880..2963515e6 100644 --- a/src/TextureTools/Atlas.cpp +++ b/src/TextureTools/Atlas.cpp @@ -15,6 +15,7 @@ #include "Atlas.h" +#include "Math/Functions.h" #include "Math/Geometry/Rectangle.h" namespace Magnum { namespace TextureTools { @@ -24,11 +25,8 @@ std::vector atlas(const Vector2i& atlasSize, const std::vector maxSize.x()) maxSize.x() = size.x(); - if(size.y() > maxSize.y()) maxSize.y() = size.y(); - } + for(const Vector2i& size: sizes) + maxSize = Math::max(maxSize, size); std::vector atlas;