From dbef0b4eb5238cc0fdafe85e4921b47c587b2b3a Mon Sep 17 00:00:00 2001
From: Christophe Riccio <mail@g-truc.net>
Date: Tue, 17 Sep 2013 22:51:39 +0200
Subject: [PATCH] Fixed build

---
 test/external/gli/core/operation.inl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/external/gli/core/operation.inl b/test/external/gli/core/operation.inl
index 87999a81..58b6428f 100644
--- a/test/external/gli/core/operation.inl
+++ b/test/external/gli/core/operation.inl
@@ -123,8 +123,8 @@ namespace gli
 			glm::byte * DstData = DstMipmap.data();
 			glm::byte const * const SrcData = SrcMipmap.data();
 
-			std::size_t SizeX = std::min(std::size_t(SrcSize.x + SrcPosition.x), std::size_t(DstMipmap.dimensions().x  + DstPosition.x));
-			std::size_t SizeY = std::min(std::size_t(SrcSize.y + SrcPosition.y), std::size_t(DstMipmap.dimensions().y + DstPosition.y));
+			std::size_t SizeX = glm::min(std::size_t(SrcSize.x + SrcPosition.x), std::size_t(DstMipmap.dimensions().x  + DstPosition.x));
+			std::size_t SizeY = glm::min(std::size_t(SrcSize.y + SrcPosition.y), std::size_t(DstMipmap.dimensions().y + DstPosition.y));
 
 			for(std::size_t j = 0; j < SizeY; ++j)
 			{