From d37416251a67733fdc982bf614763440a67666f9 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Thu, 23 Sep 2010 20:31:16 -0700
Subject: Fixed Windows compile bug in 721c25d8. Changed std::max to llmax
 since Windows apparently thought it'd be a good idea to have its own
 definition -_-

---
 linden/indra/llimagej2coj/llimagej2coj.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'linden')

diff --git a/linden/indra/llimagej2coj/llimagej2coj.cpp b/linden/indra/llimagej2coj/llimagej2coj.cpp
index 829dceb..fd92370 100644
--- a/linden/indra/llimagej2coj/llimagej2coj.cpp
+++ b/linden/indra/llimagej2coj/llimagej2coj.cpp
@@ -200,7 +200,7 @@ BOOL LLImageJ2COJ::decodeImpl(LLImageJ2C &base, LLImageRaw &raw_image, F32 decod
 		{	/* get maximum decomposition level difference, first field is from the COD header and the second
 			   is what is actually met in the codestream, NB: if everything was ok, this calculation will
 			   return what was set in the cp_reduce value! */
-			decompdifference = std::max(decompdifference, cinfo.numdecompos[comp] - image->comps[comp].resno_decoded);
+			decompdifference = llmax(decompdifference, cinfo.numdecompos[comp] - image->comps[comp].resno_decoded);
 		}
 		if (decompdifference < 0) // sanity
 		{
-- 
cgit v1.1