From 8a4e286e686c3027f382afb07d3ddcec4610fdd9 Mon Sep 17 00:00:00 2001 From: dsinclair Date: Thu, 29 Sep 2016 13:43:30 -0700 Subject: Move core/fxcodec/codec/include and core/fxcodec/include files up BUG=pdfium:611 Review-Url: https://codereview.chromium.org/2381063002 --- core/fxcodec/include/DEPS | 3 - core/fxcodec/include/JBig2_DocumentContext.h | 34 ------- core/fxcodec/include/fx_codec.h | 129 --------------------------- core/fxcodec/include/fx_codec_def.h | 92 ------------------- 4 files changed, 258 deletions(-) delete mode 100644 core/fxcodec/include/DEPS delete mode 100644 core/fxcodec/include/JBig2_DocumentContext.h delete mode 100644 core/fxcodec/include/fx_codec.h delete mode 100644 core/fxcodec/include/fx_codec_def.h (limited to 'core/fxcodec/include') diff --git a/core/fxcodec/include/DEPS b/core/fxcodec/include/DEPS deleted file mode 100644 index 548eb61a3b..0000000000 --- a/core/fxcodec/include/DEPS +++ /dev/null @@ -1,3 +0,0 @@ -include_rules = [ - '+third_party/zlib_v128/zlib.h', -] diff --git a/core/fxcodec/include/JBig2_DocumentContext.h b/core/fxcodec/include/JBig2_DocumentContext.h deleted file mode 100644 index d49bdfab8e..0000000000 --- a/core/fxcodec/include/JBig2_DocumentContext.h +++ /dev/null @@ -1,34 +0,0 @@ -// Copyright 2016 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 - -#ifndef CORE_FXCODEC_INCLUDE_JBIG2_DOCUMENTCONTEXT_H_ -#define CORE_FXCODEC_INCLUDE_JBIG2_DOCUMENTCONTEXT_H_ - -#include -#include -#include - -class CJBig2_SymbolDict; - -using CJBig2_CacheKey = std::pair; -using CJBig2_CachePair = - std::pair>; - -// Holds per-document JBig2 related data. -class JBig2_DocumentContext { - public: - JBig2_DocumentContext(); - ~JBig2_DocumentContext(); - - std::list* GetSymbolDictCache() { - return &m_SymbolDictCache; - } - - private: - std::list m_SymbolDictCache; -}; - -#endif // CORE_FXCODEC_INCLUDE_JBIG2_DOCUMENTCONTEXT_H_ diff --git a/core/fxcodec/include/fx_codec.h b/core/fxcodec/include/fx_codec.h deleted file mode 100644 index 8621db2b2c..0000000000 --- a/core/fxcodec/include/fx_codec.h +++ /dev/null @@ -1,129 +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 - -#ifndef CORE_FXCODEC_INCLUDE_FX_CODEC_H_ -#define CORE_FXCODEC_INCLUDE_FX_CODEC_H_ - -#include -#include -#include - -#include "core/fxcodec/codec/ccodec_basicmodule.h" -#include "core/fxcodec/codec/ccodec_faxmodule.h" -#include "core/fxcodec/codec/ccodec_flatemodule.h" -#include "core/fxcodec/codec/ccodec_iccmodule.h" -#include "core/fxcodec/codec/ccodec_jbig2module.h" -#include "core/fxcodec/codec/ccodec_jpegmodule.h" -#include "core/fxcodec/codec/ccodec_jpxmodule.h" -#include "core/fxcodec/codec/ccodec_scanlinedecoder.h" -#include "core/fxcodec/include/fx_codec_def.h" -#include "core/fxcrt/include/fx_basic.h" -#include "core/fxcrt/include/fx_coordinates.h" - -class CFX_DIBSource; -class CJPX_Decoder; -class CPDF_ColorSpace; -class CPDF_StreamAcc; - -#ifdef PDF_ENABLE_XFA -#include "core/fxcodec/codec/ccodec_bmpmodule.h" -#include "core/fxcodec/codec/ccodec_gifmodule.h" -#include "core/fxcodec/codec/ccodec_pngmodule.h" -#include "core/fxcodec/codec/ccodec_tiffmodule.h" - -class CCodec_ProgressiveDecoder; - -class CFX_DIBAttribute { - public: - CFX_DIBAttribute(); - ~CFX_DIBAttribute(); - - int32_t m_nXDPI; - int32_t m_nYDPI; - FX_FLOAT m_fAspectRatio; - uint16_t m_wDPIUnit; - CFX_ByteString m_strAuthor; - uint8_t m_strTime[20]; - int32_t m_nGifLeft; - int32_t m_nGifTop; - uint32_t* m_pGifLocalPalette; - uint32_t m_nGifLocalPalNum; - int32_t m_nBmpCompressType; - std::map m_Exif; -}; -#endif // PDF_ENABLE_XFA - -class CCodec_ModuleMgr { - public: - CCodec_ModuleMgr(); - ~CCodec_ModuleMgr(); - - CCodec_BasicModule* GetBasicModule() const { return m_pBasicModule.get(); } - CCodec_FaxModule* GetFaxModule() const { return m_pFaxModule.get(); } - CCodec_JpegModule* GetJpegModule() const { return m_pJpegModule.get(); } - CCodec_JpxModule* GetJpxModule() const { return m_pJpxModule.get(); } - CCodec_Jbig2Module* GetJbig2Module() const { return m_pJbig2Module.get(); } - CCodec_IccModule* GetIccModule() const { return m_pIccModule.get(); } - CCodec_FlateModule* GetFlateModule() const { return m_pFlateModule.get(); } - -#ifdef PDF_ENABLE_XFA - CCodec_ProgressiveDecoder* CreateProgressiveDecoder(); - CCodec_PngModule* GetPngModule() const { return m_pPngModule.get(); } - CCodec_GifModule* GetGifModule() const { return m_pGifModule.get(); } - CCodec_BmpModule* GetBmpModule() const { return m_pBmpModule.get(); } - CCodec_TiffModule* GetTiffModule() const { return m_pTiffModule.get(); } -#endif // PDF_ENABLE_XFA - - protected: - std::unique_ptr m_pBasicModule; - std::unique_ptr m_pFaxModule; - std::unique_ptr m_pJpegModule; - std::unique_ptr m_pJpxModule; - std::unique_ptr m_pJbig2Module; - std::unique_ptr m_pIccModule; - -#ifdef PDF_ENABLE_XFA - std::unique_ptr m_pPngModule; - std::unique_ptr m_pGifModule; - std::unique_ptr m_pBmpModule; - std::unique_ptr m_pTiffModule; -#endif // PDF_ENABLE_XFA - - std::unique_ptr m_pFlateModule; -}; - -void ReverseRGB(uint8_t* pDestBuf, const uint8_t* pSrcBuf, int pixels); -void sRGB_to_AdobeCMYK(FX_FLOAT R, - FX_FLOAT G, - FX_FLOAT B, - FX_FLOAT& c, - FX_FLOAT& m, - FX_FLOAT& y, - FX_FLOAT& k); -void AdobeCMYK_to_sRGB(FX_FLOAT c, - FX_FLOAT m, - FX_FLOAT y, - FX_FLOAT k, - FX_FLOAT& R, - FX_FLOAT& G, - FX_FLOAT& B); -void AdobeCMYK_to_sRGB1(uint8_t c, - uint8_t m, - uint8_t y, - uint8_t k, - uint8_t& R, - uint8_t& G, - uint8_t& B); -FX_BOOL MD5ComputeID(const void* buf, uint32_t dwSize, uint8_t ID[16]); -void FaxG4Decode(const uint8_t* src_buf, - uint32_t src_size, - int* pbitpos, - uint8_t* dest_buf, - int width, - int height, - int pitch); - -#endif // CORE_FXCODEC_INCLUDE_FX_CODEC_H_ diff --git a/core/fxcodec/include/fx_codec_def.h b/core/fxcodec/include/fx_codec_def.h deleted file mode 100644 index fb1b5bcdac..0000000000 --- a/core/fxcodec/include/fx_codec_def.h +++ /dev/null @@ -1,92 +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 - -#ifndef CORE_FXCODEC_INCLUDE_FX_CODEC_DEF_H_ -#define CORE_FXCODEC_INCLUDE_FX_CODEC_DEF_H_ - -enum FXCODEC_STATUS { - FXCODEC_STATUS_ERROR = -1, - FXCODEC_STATUS_FRAME_READY, - FXCODEC_STATUS_FRAME_TOBECONTINUE, - FXCODEC_STATUS_DECODE_READY, - FXCODEC_STATUS_DECODE_TOBECONTINUE, - FXCODEC_STATUS_DECODE_FINISH, -#ifdef PDF_ENABLE_XFA - FXCODEC_STATUS_ERR_MEMORY, -#endif // PDF_ENABLE_XFA - FXCODEC_STATUS_ERR_READ, - FXCODEC_STATUS_ERR_FLUSH, - FXCODEC_STATUS_ERR_FORMAT, - FXCODEC_STATUS_ERR_PARAMS -}; -#define JP2_SPACE_INVALID -1 -#define JPX_SPACE_INVALID -1 -#define JP2_SPACE_bilevel1 0 -#define JP2_SPACE_YCbCr1 1 -#define JP2_SPACE_YCbCr2 3 -#define JP2_SPACE_YCbCr3 4 -#define JP2_SPACE_PhotoYCC 9 -#define JP2_SPACE_CMY 11 -#define JP2_SPACE_CMYK 12 -#define JP2_SPACE_YCCK 13 -#define JP2_SPACE_CIELab 14 -#define JP2_SPACE_bilevel2 15 -#define JP2_SPACE_sRGB 16 -#define JP2_SPACE_sLUM 17 -#define JP2_SPACE_sYCC 18 -#define JP2_SPACE_CIEJab 19 -#define JP2_SPACE_esRGB 20 -#define JP2_SPACE_ROMMRGB 21 -#define JP2_SPACE_YPbPr60 22 -#define JP2_SPACE_YPbPr50 23 -#define JP2_SPACE_esYCC 24 -#define JP2_SPACE_iccLUM 100 -#define JP2_SPACE_iccRGB 101 -#define Icc_INTENT_PERCEPTUAL 0 -#define Icc_INTENT_RELATIVE_COLORIMETRIC 1 -#define Icc_INTENT_SATURATION 2 -#define Icc_INTENT_ABSOLUTE_COLORIMETRIC 3 -#define Icc_FORMAT_DEFAULT 0 -#define Icc_FORMAT_SWAP (1 << 10) -#define Icc_FLAGS_DEFAULT 0x0000 -#define Icc_FLAGS_BLACKPOINTCOMPENSATION 0x2000 -#define Icc_FLAGS_NOWHITEONWHITEFIXUP 0x0004 -#define Icc_FLAGS_HIGHRESPRECALC 0x0400 -#define Icc_FLAGS_LOWRESPRECALC 0x0800 -#define Icc_FLAGS_GAMUTCHECK 0x1000 -#define Icc_FLAGS_SOFTPROOFING 0x4000 -#define Icc_PARAMTYPE_NONE 0 -#define Icc_PARAMTYPE_BUFFER 1 -#define Icc_PARAMTYPE_PARAM 2 -#ifdef PDF_ENABLE_XFA -enum FXCODEC_IMAGE_TYPE { - FXCODEC_IMAGE_UNKNOWN = 0, - FXCODEC_IMAGE_BMP, - FXCODEC_IMAGE_JPG, - FXCODEC_IMAGE_PNG, - FXCODEC_IMAGE_GIF, - FXCODEC_IMAGE_TIF, - FXCODEC_IMAGE_MAX -}; -enum FXCODEC_RESUNIT { - FXCODEC_RESUNIT_NONE = 0, - FXCODEC_RESUNIT_INCH, - FXCODEC_RESUNIT_CENTIMETER, - FXCODEC_RESUNIT_METER -}; -#endif // PDF_ENABLE_XFA -#define EXIFTAG_USHORT_RESUNIT 296 -#define EXIFTAG_FLOAT_DPIX 282 -#define EXIFTAG_FLOAT_DPIY 283 -#define EXIFTAG_USHORT_ORIENTATION 274 -#define EXIFTAG_STRING_MANUFACTURER 271 -#define EXIFTAG_STRING_MODULE 272 -#define EXIFTAG_STRING_SOFTWARE 305 -#define EXIFTAG_STRING_IAMGEDESCRIPTION 270 -#define EXIFTAG_STRING_DATETIME 306 -#define EXIFTAG_STRING_COPYRIGHT 33432 - -#endif // CORE_FXCODEC_INCLUDE_FX_CODEC_DEF_H_ -- cgit v1.2.3