diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-11-09 13:54:02 -0800 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-11-09 13:54:02 -0800 |
| commit | 70f6683fa6ed90e22158824d7d792fcee68ee3b5 (patch) | |
| tree | 5dddfa8fd6e1e7121aae806faed2eaf0b73762e0 | |
| parent | 3d632f023a2e1c4a29512fca3dfe723f4f474c59 (diff) | |
| download | pdfium-70f6683fa6ed90e22158824d7d792fcee68ee3b5.tar.xz | |
Merge to XFA: Remove dead code in fx_codec_jbig_enc.cpp.
TBR=weili@chromium.org
Review URL: https://codereview.chromium.org/1420693004 .
(cherry picked from commit 37e4a11e58257b757bec2700bc53facc59d0b845)
Review URL: https://codereview.chromium.org/1423583005 .
| -rw-r--r-- | BUILD.gn | 1 | ||||
| -rw-r--r-- | core/include/fxcodec/fx_codec.h | 2 | ||||
| -rw-r--r-- | core/src/fxcodec/codec/fx_codec_jbig_enc.cpp | 10 | ||||
| -rw-r--r-- | pdfium.gyp | 1 |
4 files changed, 1 insertions, 13 deletions
@@ -386,7 +386,6 @@ static_library("fxcodec") { "core/src/fxcodec/codec/fx_codec_gif.cpp", "core/src/fxcodec/codec/fx_codec_icc.cpp", "core/src/fxcodec/codec/fx_codec_jbig.cpp", - "core/src/fxcodec/codec/fx_codec_jbig_enc.cpp", "core/src/fxcodec/codec/fx_codec_jpeg.cpp", "core/src/fxcodec/codec/fx_codec_jpx_opj.cpp", "core/src/fxcodec/codec/fx_codec_png.cpp", diff --git a/core/include/fxcodec/fx_codec.h b/core/include/fxcodec/fx_codec.h index b9ba0df694..68628fd016 100644 --- a/core/include/fxcodec/fx_codec.h +++ b/core/include/fxcodec/fx_codec.h @@ -58,7 +58,7 @@ class CFX_DIBAttribute { class CCodec_ModuleMgr { public: CCodec_ModuleMgr(); - ICodec_Jbig2Encoder* CreateJbig2Encoder(); + ICodec_BasicModule* GetBasicModule() const { return m_pBasicModule.get(); } ICodec_FaxModule* GetFaxModule() const { return m_pFaxModule.get(); } ICodec_JpegModule* GetJpegModule() const { return m_pJpegModule.get(); } diff --git a/core/src/fxcodec/codec/fx_codec_jbig_enc.cpp b/core/src/fxcodec/codec/fx_codec_jbig_enc.cpp deleted file mode 100644 index 38c82fdc11..0000000000 --- a/core/src/fxcodec/codec/fx_codec_jbig_enc.cpp +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright 2014 PDFium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com - -#include "../../../include/fxcodec/fx_codec.h" -ICodec_Jbig2Encoder* CCodec_ModuleMgr::CreateJbig2Encoder() { - return NULL; -} diff --git a/pdfium.gyp b/pdfium.gyp index c12f0bb8ff..35a8ce22d3 100644 --- a/pdfium.gyp +++ b/pdfium.gyp @@ -360,7 +360,6 @@ 'core/src/fxcodec/codec/fx_codec_gif.cpp', 'core/src/fxcodec/codec/fx_codec_icc.cpp', 'core/src/fxcodec/codec/fx_codec_jbig.cpp', - 'core/src/fxcodec/codec/fx_codec_jbig_enc.cpp', 'core/src/fxcodec/codec/fx_codec_jpeg.cpp', 'core/src/fxcodec/codec/fx_codec_jpx_opj.cpp', 'core/src/fxcodec/codec/fx_codec_png.cpp', |