diff options
| author | Callum Prentice <callum@gmail.com> | 2020-05-04 10:53:11 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@gmail.com> | 2020-05-04 10:53:11 -0700 |
| commit | 691a2d996cb364201d8e73378eab0d3d09eddb08 (patch) | |
| tree | 49c26bb103d30daf398e57c51a424639d80f5b03 /indra/llimage | |
| parent | 77d2a05921bdba3ac284350650c5394dcc8e3444 (diff) | |
| parent | 4a7fd0117a43dca9e30c58c6417ebdf6862561f6 (diff) | |
Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-512
Diffstat (limited to 'indra/llimage')
| -rw-r--r-- | indra/llimage/llimagejpeg.cpp | 2 | ||||
| -rw-r--r-- | indra/llimage/llpngwrapper.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/llimage/llimagejpeg.cpp b/indra/llimage/llimagejpeg.cpp index 3b1b060c02..ead9a37fb8 100644 --- a/indra/llimage/llimagejpeg.cpp +++ b/indra/llimage/llimagejpeg.cpp @@ -315,7 +315,7 @@ bool LLImageJPEG::decode(LLImageRaw* raw_image, F32 decode_time) jpeg_destroy_decompress(&cinfo); } - catch (std::bad_alloc) + catch (std::bad_alloc&) { setLastError( "Out of memory"); jpeg_destroy_decompress(&cinfo); diff --git a/indra/llimage/llpngwrapper.cpp b/indra/llimage/llpngwrapper.cpp index f298764cc0..f7dc6272cf 100644 --- a/indra/llimage/llpngwrapper.cpp +++ b/indra/llimage/llpngwrapper.cpp @@ -210,7 +210,7 @@ BOOL LLPngWrapper::readPng(U8* src, S32 dataSize, LLImageRaw* rawImage, ImageInf releaseResources(); return (FALSE); } - catch (std::bad_alloc) + catch (std::bad_alloc&) { mErrorMessage = "LLPngWrapper"; releaseResources(); |