summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--AUTHORS1
-rw-r--r--core/src/fxcodec/codec/fx_codec_jpeg.cpp1
-rw-r--r--core/src/fxge/fx_freetype/fxft2.5.01/src/psaux/psconv.c2
3 files changed, 3 insertions, 1 deletions
diff --git a/AUTHORS b/AUTHORS
index bf6d0717bd..b7eefe1191 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -12,6 +12,7 @@ Andrey Khalyavin <halyavin@chromium.org>
Finnur Thorarinsson <finnur@chromium.org>
John Abd-El-Malek <jam@chromium.org>
Julien Tinnes <jln@chromium.org>
+Kostya Serebryany <kcc@chromium.org>
Lei Zhang <thestig@chromium.org>
Lucas Nihlen <luken@chromium.org>
Matt Giuca <mgiuca@chromium.org>
diff --git a/core/src/fxcodec/codec/fx_codec_jpeg.cpp b/core/src/fxcodec/codec/fx_codec_jpeg.cpp
index b0a6bd49a8..aae3e24c05 100644
--- a/core/src/fxcodec/codec/fx_codec_jpeg.cpp
+++ b/core/src/fxcodec/codec/fx_codec_jpeg.cpp
@@ -282,6 +282,7 @@ static FX_BOOL _JpegLoadInfo(FX_LPCBYTE src_buf, FX_DWORD src_size, int& width,
jerr.output_message = _error_do_nothing;
jerr.format_message = _error_do_nothing2;
jerr.reset_error_mgr = _error_do_nothing;
+ jerr.trace_level = 0;
cinfo.err = &jerr;
jmp_buf mark;
cinfo.client_data = &mark;
diff --git a/core/src/fxge/fx_freetype/fxft2.5.01/src/psaux/psconv.c b/core/src/fxge/fx_freetype/fxft2.5.01/src/psaux/psconv.c
index 22e2f7d9ba..c13d41b6a8 100644
--- a/core/src/fxge/fx_freetype/fxft2.5.01/src/psaux/psconv.c
+++ b/core/src/fxge/fx_freetype/fxft2.5.01/src/psaux/psconv.c
@@ -202,7 +202,7 @@
FT_INT64 integral = 0;
FT_INT64 decimal = 0;
#else
- FT_Long integral;
+ FT_Long integral = 0;
FT_Long decimal = 0;
FT_Int temp0 = 65536;
FT_Int temp1 = power_ten;