diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-06-19 17:15:41 -0700 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-06-19 17:15:41 -0700 |
| commit | e5b0bd1a79f90b7758246655e18ef965a87bcd0b (patch) | |
| tree | c67974b862b888e4ae7b3e8928e3abdcff7c3e58 /core/src/fxcodec/jbig2 | |
| parent | 1eb69422e2f35a32ed7d12a330fb2505f8a97f3c (diff) | |
| download | pdfium-e5b0bd1a79f90b7758246655e18ef965a87bcd0b.tar.xz | |
Merge to XFA: Do some IWYU cleanups.
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1176333002.
(cherry picked from commit 0ef0de55657db8a83372ad8eb22d84c5893afc4c)
Review URL: https://codereview.chromium.org/1195943005.
Diffstat (limited to 'core/src/fxcodec/jbig2')
| -rw-r--r-- | core/src/fxcodec/jbig2/JBig2_Context.h | 9 | ||||
| -rw-r--r-- | core/src/fxcodec/jbig2/JBig2_GeneralDecoder.h | 11 | ||||
| -rw-r--r-- | core/src/fxcodec/jbig2/JBig2_Image.cpp | 1 |
3 files changed, 12 insertions, 9 deletions
diff --git a/core/src/fxcodec/jbig2/JBig2_Context.h b/core/src/fxcodec/jbig2/JBig2_Context.h index b12853accf..6e47a8a912 100644 --- a/core/src/fxcodec/jbig2/JBig2_Context.h +++ b/core/src/fxcodec/jbig2/JBig2_Context.h @@ -1,19 +1,22 @@ // 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 _JBIG2_CONTEXT_H_ #define _JBIG2_CONTEXT_H_ + +#include <list> +#include <utility> + #include "JBig2_Module.h" #include "JBig2_List.h" #include "JBig2_Segment.h" #include "JBig2_Page.h" #include "JBig2_GeneralDecoder.h" #include "../../../include/fxcodec/fx_codec_def.h" -#include "../../../include/fxcrt/fx_basic.h" -#include <utility> + typedef std::pair<uint8_t*, CJBig2_SymbolDict*> CJBig2_CachePair; typedef enum { JBIG2_OUT_OF_PAGE = 0, diff --git a/core/src/fxcodec/jbig2/JBig2_GeneralDecoder.h b/core/src/fxcodec/jbig2/JBig2_GeneralDecoder.h index 45e2940d3a..2bd2ceac95 100644 --- a/core/src/fxcodec/jbig2/JBig2_GeneralDecoder.h +++ b/core/src/fxcodec/jbig2/JBig2_GeneralDecoder.h @@ -1,18 +1,19 @@ // 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 _JBIG2_GENERAL_DECODER_H_ #define _JBIG2_GENERAL_DECODER_H_ + #include "../../../include/fxcodec/fx_codec_def.h" -#include "../../../include/fxcrt/fx_basic.h" -#include "JBig2_Define.h" -#include "JBig2_SymbolDict.h" +#include "../../../include/fxcrt/fx_coordinates.h" #include "JBig2_ArithDecoder.h" #include "JBig2_ArithIntDecoder.h" -#include "../../../include/fxcrt/fx_coordinates.h" +#include "JBig2_Define.h" +#include "JBig2_SymbolDict.h" + class CJBig2_HuffmanTable; class CJBig2_Image; class CJBig2_PatternDict; diff --git a/core/src/fxcodec/jbig2/JBig2_Image.cpp b/core/src/fxcodec/jbig2/JBig2_Image.cpp index 044ccf7410..9ef4464ef0 100644 --- a/core/src/fxcodec/jbig2/JBig2_Image.cpp +++ b/core/src/fxcodec/jbig2/JBig2_Image.cpp @@ -6,7 +6,6 @@ #include <limits.h> -#include "../../../include/fxcrt/fx_basic.h" #include "../../../include/fxcrt/fx_coordinates.h" #include "../../../include/fxcrt/fx_safe_types.h" #include "JBig2_Image.h" |