diff options
| author | McCabe Maxsted | 2010-09-23 20:31:16 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2010-09-23 20:31:16 -0700 |
| commit | d37416251a67733fdc982bf614763440a67666f9 (patch) | |
| tree | 30136bcac3e98fecf3011f81c4a366225bd63181 /linden/indra | |
| parent | Merge remote branch 'armin/weekly' into weekly (diff) | |
| download | meta-impy-d37416251a67733fdc982bf614763440a67666f9.zip meta-impy-d37416251a67733fdc982bf614763440a67666f9.tar.gz meta-impy-d37416251a67733fdc982bf614763440a67666f9.tar.bz2 meta-impy-d37416251a67733fdc982bf614763440a67666f9.tar.xz | |
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 -_-
Diffstat (limited to 'linden/indra')
| -rw-r--r-- | linden/indra/llimagej2coj/llimagej2coj.cpp | 2 |
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 | |||
| 200 | { /* get maximum decomposition level difference, first field is from the COD header and the second | 200 | { /* get maximum decomposition level difference, first field is from the COD header and the second |
| 201 | is what is actually met in the codestream, NB: if everything was ok, this calculation will | 201 | is what is actually met in the codestream, NB: if everything was ok, this calculation will |
| 202 | return what was set in the cp_reduce value! */ | 202 | return what was set in the cp_reduce value! */ |
| 203 | decompdifference = std::max(decompdifference, cinfo.numdecompos[comp] - image->comps[comp].resno_decoded); | 203 | decompdifference = llmax(decompdifference, cinfo.numdecompos[comp] - image->comps[comp].resno_decoded); |
| 204 | } | 204 | } |
| 205 | if (decompdifference < 0) // sanity | 205 | if (decompdifference < 0) // sanity |
| 206 | { | 206 | { |