summaryrefslogtreecommitdiff
path: root/indra/llimage/llimagejpeg.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2020-05-06 21:00:50 +0100
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2020-05-06 21:00:50 +0100
commitfbd5f63f470e3cea5039b929690c9e28a137c244 (patch)
treeaf6cf39af2aae68460c8d0061ff5e04c2cc50846 /indra/llimage/llimagejpeg.cpp
parentc65151b2b34e3dbc95e64bd9f4a358cad2609be4 (diff)
parent4a7fd0117a43dca9e30c58c6417ebdf6862561f6 (diff)
merge
Diffstat (limited to 'indra/llimage/llimagejpeg.cpp')
-rw-r--r--indra/llimage/llimagejpeg.cpp2
1 files changed, 1 insertions, 1 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);