diff options
| author | Rider Linden <rider@lindenlab.com> | 2016-09-16 14:59:52 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2016-09-16 14:59:52 -0700 |
| commit | 100aa4b79e5ef1aa7ea49fd5ca9a78fa5dfd713c (patch) | |
| tree | a565f3f725e45419b24458b0d819b75cf77018ff /indra/llimage/llimagedimensionsinfo.cpp | |
| parent | 884b03e8770a64aee22281518a5f3e2a7c0420ab (diff) | |
| parent | 51bb369a39142ff5049f753099f9638ce68b95dc (diff) | |
Merge
Diffstat (limited to 'indra/llimage/llimagedimensionsinfo.cpp')
| -rw-r--r-- | indra/llimage/llimagedimensionsinfo.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llimage/llimagedimensionsinfo.cpp b/indra/llimage/llimagedimensionsinfo.cpp index 5bf3f29b3c..a5e546e977 100644 --- a/indra/llimage/llimagedimensionsinfo.cpp +++ b/indra/llimage/llimagedimensionsinfo.cpp @@ -201,7 +201,7 @@ bool LLImageDimensionsInfo::getImageDimensionsJpeg() cinfo.out_color_space = JCS_RGB; jpeg_start_decompress (&cinfo); - mHeight = cinfo.output_width; + mWidth = cinfo.output_width; mHeight = cinfo.output_height; jpeg_destroy_decompress(&cinfo); |