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 -_-

1 files changed, 1 insertions, 1 deletions

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
                 {