diff options
| author | Rider Linden <rider@lindenlab.com> | 2016-09-26 10:55:25 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2016-09-26 10:55:25 -0700 |
| commit | bee933049f3b3bb7073f2576483e78a0420e5e21 (patch) | |
| tree | 67de2d289e35929be636e668dd860895c217d7ec /indra/llimage/llimagedimensionsinfo.cpp | |
| parent | 9e25ba239044b9708259ea3d4617cb6cfdcea458 (diff) | |
| parent | 42dce6766435da1deaea19e837629fdf38c0018d (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); |