summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/fxcodec/codec/fx_codec_jpx_opj.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/core/fxcodec/codec/fx_codec_jpx_opj.cpp b/core/fxcodec/codec/fx_codec_jpx_opj.cpp
index 9e72c509d7..ed9331974d 100644
--- a/core/fxcodec/codec/fx_codec_jpx_opj.cpp
+++ b/core/fxcodec/codec/fx_codec_jpx_opj.cpp
@@ -835,6 +835,9 @@ bool CJPX_Decoder::Decode(uint8_t* dest_buf,
uint8_t* pScanline = pChannel + row * pitch;
for (int col = 0; col < width; ++col) {
uint8_t* pPixel = pScanline + col * image->numcomps;
+ if (!image->comps[channel].data)
+ continue;
+
int src = image->comps[channel].data[row * width + col];
src += image->comps[channel].sgnd
? 1 << (image->comps[channel].prec - 1)
@@ -851,9 +854,9 @@ bool CJPX_Decoder::Decode(uint8_t* dest_buf,
uint8_t* pScanline = pChannel + row * pitch;
for (int col = 0; col < width; ++col) {
uint8_t* pPixel = pScanline + col * image->numcomps;
- if (!image->comps[channel].data) {
+ if (!image->comps[channel].data)
continue;
- }
+
int src = image->comps[channel].data[row * width + col];
src += image->comps[channel].sgnd
? 1 << (image->comps[channel].prec - 1)