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

This commit is contained in:
McCabe Maxsted
2010-09-23 20:31:16 -07:00
parent bd0b9087f2
commit d37416251a
+1 -1
View File
@@ -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
{