diff options
Diffstat (limited to 'core/src/fxcodec')
| -rw-r--r-- | core/src/fxcodec/codec/fx_codec_jpx_opj.cpp | 8 | ||||
| -rw-r--r-- | core/src/fxcodec/jbig2/JBig2_Context.cpp | 2 |
2 files changed, 1 insertions, 9 deletions
diff --git a/core/src/fxcodec/codec/fx_codec_jpx_opj.cpp b/core/src/fxcodec/codec/fx_codec_jpx_opj.cpp index a397a4504a..7dd91b3289 100644 --- a/core/src/fxcodec/codec/fx_codec_jpx_opj.cpp +++ b/core/src/fxcodec/codec/fx_codec_jpx_opj.cpp @@ -649,13 +649,6 @@ FX_BOOL CJPX_Decoder::Init(const unsigned char* src_data, int src_size) image = NULL; return FALSE; } -/* - if(this->m_useColorSpace) { - image->useColorSpace = 1; - } else { - image->useColorSpace = 0; - } -*/ if (!parameters.nb_tile_to_decode) { if (!opj_set_decode_area(l_codec, image, parameters.DA_x0, parameters.DA_y0, parameters.DA_x1, parameters.DA_y1)) { @@ -685,7 +678,6 @@ FX_BOOL CJPX_Decoder::Init(const unsigned char* src_data, int src_size) if(image->color_space == OPJ_CLRSPC_SYCC) { color_sycc_to_rgb(image); } - //if(image->icc_profile_buf && !image->useColorSpace) { if(image->icc_profile_buf) { FX_Free(image->icc_profile_buf); image->icc_profile_buf = NULL; diff --git a/core/src/fxcodec/jbig2/JBig2_Context.cpp b/core/src/fxcodec/jbig2/JBig2_Context.cpp index 1c7592778d..f58b7f36f5 100644 --- a/core/src/fxcodec/jbig2/JBig2_Context.cpp +++ b/core/src/fxcodec/jbig2/JBig2_Context.cpp @@ -1621,7 +1621,7 @@ FX_BOOL CJBig2_Context::parseGenericRefinementRegion(CJBig2_Segment *pSegment) pSeg = NULL; if(pSegment->m_nReferred_to_segment_count > 0) { for(i = 0; i < pSegment->m_nReferred_to_segment_count; i++) { - pSeg = this->findSegmentByNumber(pSegment->m_pReferred_to_segment_numbers[0]); + pSeg = findSegmentByNumber(pSegment->m_pReferred_to_segment_numbers[0]); if(pSeg == NULL) { m_pModule->JBig2_Error("generic refinement region segment : can't find refered to segments"); nRet = JBIG2_ERROR_FETAL; |