diff options
| author | Bo Xu <bo_xu@foxitsoftware.com> | 2014-05-24 12:20:17 -0700 |
|---|---|---|
| committer | Bo Xu <bo_xu@foxitsoftware.com> | 2014-05-24 12:20:17 -0700 |
| commit | 5dc4f24637d353d4d777c251f6d8c5746e062e7e (patch) | |
| tree | 3b456ac537c2ff58afa268bd4a543a482dbdc1f1 /core/src/fxcodec | |
| parent | 4201b2a5f38a6335d012aa4dc4cd19f6989d05f1 (diff) | |
| download | pdfium-5dc4f24637d353d4d777c251f6d8c5746e062e7e.tar.xz | |
Fix warnings in android build, fix font rendering issue, fix issue 357588: wrong characters representation, and addjust some code indent
BUG=
R=jam@chromium.org
Review URL: https://codereview.chromium.org/294353002
Diffstat (limited to 'core/src/fxcodec')
| -rw-r--r-- | core/src/fxcodec/codec/fx_codec_jpx_opj.cpp | 4 | ||||
| -rw-r--r-- | core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/mct.c | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/core/src/fxcodec/codec/fx_codec_jpx_opj.cpp b/core/src/fxcodec/codec/fx_codec_jpx_opj.cpp index 32cb10076d..8e77cdaece 100644 --- a/core/src/fxcodec/codec/fx_codec_jpx_opj.cpp +++ b/core/src/fxcodec/codec/fx_codec_jpx_opj.cpp @@ -729,7 +729,9 @@ FX_BOOL CJPX_Decoder::Decode(FX_LPBYTE dest_buf, int pitch, FX_BOOL bTranslateCo pScanline = pChannel + row * pitch; for (col = 0; col < wid; col++) { pPixel = pScanline + col * image->numcomps; - if (!image->comps[channel].data) continue; + if (!image->comps[channel].data) { + continue; + } src = image->comps[channel].data[row * wid + col]; src += image->comps[channel].sgnd ? 1 << (image->comps[channel].prec - 1) : 0; if (adjust_comps[channel] - 1 < 0) { diff --git a/core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/mct.c b/core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/mct.c index 0a64938b5c..c4341ec1bb 100644 --- a/core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/mct.c +++ b/core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/mct.c @@ -190,7 +190,7 @@ void opj_mct_decode_real( } n &= 7; } else { - for(i = 0; i < n; ++i) { + for (i = 0; i < n; ++i) { OPJ_FLOAT32 y = c0[i]; OPJ_FLOAT32 u = c1[i]; OPJ_FLOAT32 v = c2[i]; @@ -202,7 +202,6 @@ void opj_mct_decode_real( c2[i] = b; } } - #endif for(i = 0; i < n; ++i) { OPJ_FLOAT32 y = c0[i]; |