From 2a1cbc0417985485ab660ee6fd98c3bbedf716cd Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Tue, 25 Sep 2018 20:07:29 +0000 Subject: Revert "Remove unreachable code in CPDF_DIBBase." This reverts commit 214982c4d02a720c3b1b3de121cddc62189b8848. Reason for revert: Turns out it is reachable. Original change's description: > Remove unreachable code in CPDF_DIBBase. > > The colorspace is always available when creating image decoders that use > colorspaces. > > Change-Id: I20ac75edcd614ccc1e83de262c128776e9d03eed > Reviewed-on: https://pdfium-review.googlesource.com/42872 > Commit-Queue: Ryan Harrison > Reviewed-by: Ryan Harrison TBR=thestig@chromium.org,rharrison@chromium.org BUG=chromium:888743 # Not skipping CQ checks because original CL landed > 1 day ago. Change-Id: I45903543f0e4bf2785660fb8c1e45c34febb6ecf Reviewed-on: https://pdfium-review.googlesource.com/43050 Reviewed-by: Lei Zhang Commit-Queue: Lei Zhang --- core/fxcodec/codec/ccodec_jpxmodule.cpp | 2 -- 1 file changed, 2 deletions(-) (limited to 'core/fxcodec/codec') diff --git a/core/fxcodec/codec/ccodec_jpxmodule.cpp b/core/fxcodec/codec/ccodec_jpxmodule.cpp index 2465ea7bd0..28221be340 100644 --- a/core/fxcodec/codec/ccodec_jpxmodule.cpp +++ b/core/fxcodec/codec/ccodec_jpxmodule.cpp @@ -646,8 +646,6 @@ CCodec_JpxModule::~CCodec_JpxModule() {} std::unique_ptr CCodec_JpxModule::CreateDecoder( pdfium::span src_span, CPDF_ColorSpace* cs) { - // TODO(thestig): |cs| should never be nullptr in production, but - // pdf_jpx_fuzzer.cc passes that in. auto decoder = pdfium::MakeUnique(cs); if (!decoder->Init(src_span)) return nullptr; -- cgit v1.2.3