diff options
| author | Rider Linden <rider@lindenlab.com> | 2016-09-26 10:39:21 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2016-09-26 10:39:21 -0700 |
| commit | 42dce6766435da1deaea19e837629fdf38c0018d (patch) | |
| tree | 063491157df3319f70c811b2b4555806fcd681f8 /indra/llimage/llimagedimensionsinfo.cpp | |
| parent | d258fe40353642b20524ef320b70e6b9bf0f8ec4 (diff) | |
| parent | 51bb369a39142ff5049f753099f9638ce68b95dc (diff) | |
Merged lindenlab/viewer-release into default
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); |