summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--AUTHORS1
-rw-r--r--core/src/fxcodec/codec/fx_codec_jpeg.cpp2
2 files changed, 2 insertions, 1 deletions
diff --git a/AUTHORS b/AUTHORS
index 19b563cf89..bf6d0717bd 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -9,6 +9,7 @@
# See python fnmatch module documentation for more information.
Andrey Khalyavin <halyavin@chromium.org>
+Finnur Thorarinsson <finnur@chromium.org>
John Abd-El-Malek <jam@chromium.org>
Julien Tinnes <jln@chromium.org>
Lei Zhang <thestig@chromium.org>
diff --git a/core/src/fxcodec/codec/fx_codec_jpeg.cpp b/core/src/fxcodec/codec/fx_codec_jpeg.cpp
index 5e78e134aa..b0a6bd49a8 100644
--- a/core/src/fxcodec/codec/fx_codec_jpeg.cpp
+++ b/core/src/fxcodec/codec/fx_codec_jpeg.cpp
@@ -411,7 +411,7 @@ FX_BOOL CCodec_JpegDecoder::InitDecode()
m_OrigWidth = cinfo.image_width;
m_OrigHeight = cinfo.image_height;
m_OutputWidth = m_OrigWidth;
- m_OutputHeight = m_OutputHeight;
+ m_OutputHeight = m_OrigHeight;
m_nDefaultScaleDenom = cinfo.scale_denom;
return TRUE;
}