diff options
author | Nicolas Pena <npm@chromium.org> | 2017-01-04 16:18:57 -0500 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2017-01-04 21:30:15 +0000 |
commit | 0ef7ba086f9e48100f9caebd0a52de478f0ada0a (patch) | |
tree | a3eb0185d89c940c3bc0c56c1a38a7fb6ed38b8f /core | |
parent | dc39e377e1a3923e63569020beb29f9662c1a3ee (diff) | |
download | pdfium-chromium/2972.tar.xz |
Kill render_int.hchromium/2973chromium/2972
CPDF_DIBSource was already in its own file, but files needed renaming.
Change-Id: Ib3ac787a0bb33d3f78ecdcdfcdbc938867857a14
Reviewed-on: https://pdfium-review.googlesource.com/2152
Commit-Queue: Nicolás Peña <npm@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'core')
-rw-r--r-- | core/fpdfapi/page/cpdf_generalstate.cpp | 2 | ||||
-rw-r--r-- | core/fpdfapi/page/cpdf_image.cpp | 2 | ||||
-rw-r--r-- | core/fpdfapi/parser/cpdf_document.cpp | 2 | ||||
-rw-r--r-- | core/fpdfapi/render/cpdf_dibsource.cpp (renamed from core/fpdfapi/render/fpdf_render_loadimage.cpp) | 4 | ||||
-rw-r--r-- | core/fpdfapi/render/cpdf_dibsource.h (renamed from core/fpdfapi/render/render_int.h) | 29 | ||||
-rw-r--r-- | core/fpdfapi/render/cpdf_docrenderdata.cpp | 2 | ||||
-rw-r--r-- | core/fpdfapi/render/cpdf_imagecacheentry.cpp | 2 | ||||
-rw-r--r-- | core/fpdfapi/render/cpdf_imageloader.cpp | 2 | ||||
-rw-r--r-- | core/fpdfapi/render/cpdf_imagerenderer.cpp | 2 | ||||
-rw-r--r-- | core/fpdfapi/render/cpdf_renderstatus.cpp | 2 | ||||
-rw-r--r-- | core/fxge/dib/fx_dib_engine_unittest.cpp | 2 |
11 files changed, 15 insertions, 36 deletions
diff --git a/core/fpdfapi/page/cpdf_generalstate.cpp b/core/fpdfapi/page/cpdf_generalstate.cpp index e06adbee79..4edd9b2a3c 100644 --- a/core/fpdfapi/page/cpdf_generalstate.cpp +++ b/core/fpdfapi/page/cpdf_generalstate.cpp @@ -7,9 +7,9 @@ #include "core/fpdfapi/page/cpdf_generalstate.h" #include "core/fpdfapi/parser/cpdf_document.h" +#include "core/fpdfapi/render/cpdf_dibsource.h" #include "core/fpdfapi/render/cpdf_docrenderdata.h" #include "core/fpdfapi/render/cpdf_transferfunc.h" -#include "core/fpdfapi/render/render_int.h" namespace { diff --git a/core/fpdfapi/page/cpdf_image.cpp b/core/fpdfapi/page/cpdf_image.cpp index a0109f22a8..813ee2b0ed 100644 --- a/core/fpdfapi/page/cpdf_image.cpp +++ b/core/fpdfapi/page/cpdf_image.cpp @@ -22,8 +22,8 @@ #include "core/fpdfapi/parser/cpdf_reference.h" #include "core/fpdfapi/parser/cpdf_stream.h" #include "core/fpdfapi/parser/cpdf_string.h" +#include "core/fpdfapi/render/cpdf_dibsource.h" #include "core/fpdfapi/render/cpdf_pagerendercache.h" -#include "core/fpdfapi/render/render_int.h" #include "core/fxcodec/fx_codec.h" #include "core/fxge/fx_dib.h" #include "third_party/base/numerics/safe_conversions.h" diff --git a/core/fpdfapi/parser/cpdf_document.cpp b/core/fpdfapi/parser/cpdf_document.cpp index a728bf5795..4ac0aa6aa9 100644 --- a/core/fpdfapi/parser/cpdf_document.cpp +++ b/core/fpdfapi/parser/cpdf_document.cpp @@ -25,8 +25,8 @@ #include "core/fpdfapi/parser/cpdf_reference.h" #include "core/fpdfapi/parser/cpdf_stream.h" #include "core/fpdfapi/parser/cpdf_string.h" +#include "core/fpdfapi/render/cpdf_dibsource.h" #include "core/fpdfapi/render/cpdf_docrenderdata.h" -#include "core/fpdfapi/render/render_int.h" #include "core/fxcodec/JBig2_DocumentContext.h" #include "core/fxge/cfx_unicodeencoding.h" #include "core/fxge/fx_font.h" diff --git a/core/fpdfapi/render/fpdf_render_loadimage.cpp b/core/fpdfapi/render/cpdf_dibsource.cpp index 4a018a849d..c84adfe1ec 100644 --- a/core/fpdfapi/render/fpdf_render_loadimage.cpp +++ b/core/fpdfapi/render/cpdf_dibsource.cpp @@ -1,10 +1,10 @@ -// Copyright 2014 PDFium Authors. All rights reserved. +// Copyright 2017 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 "core/fpdfapi/render/render_int.h" +#include "core/fpdfapi/render/cpdf_dibsource.h" #include <algorithm> #include <memory> diff --git a/core/fpdfapi/render/render_int.h b/core/fpdfapi/render/cpdf_dibsource.h index 311ba8aa52..8369d2a1be 100644 --- a/core/fpdfapi/render/render_int.h +++ b/core/fpdfapi/render/cpdf_dibsource.h @@ -1,11 +1,11 @@ -// Copyright 2014 PDFium Authors. All rights reserved. +// Copyright 2017 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_FPDFAPI_RENDER_RENDER_INT_H_ -#define CORE_FPDFAPI_RENDER_RENDER_INT_H_ +#ifndef CORE_FPDFAPI_RENDER_CPDF_DIBSOURCE_H_ +#define CORE_FPDFAPI_RENDER_CPDF_DIBSOURCE_H_ #include <map> #include <memory> @@ -23,31 +23,10 @@ class CCodec_Jbig2Context; class CCodec_ScanlineDecoder; -class CFX_GlyphBitmap; -class CFX_ImageTransformer; -class CFX_PathData; class CPDF_Color; class CPDF_Dictionary; class CPDF_Document; -class CPDF_Font; -class CPDF_FormObject; -class CPDF_ImageCacheEntry; -class CPDF_ImageObject; -class CPDF_Object; -class CPDF_PageObject; -class CPDF_PageObjectHolder; -class CPDF_PageRenderCache; -class CPDF_PathObject; -class CPDF_RenderStatus; -class CPDF_ShadingObject; -class CPDF_ShadingPattern; class CPDF_Stream; -class CPDF_TilingPattern; -class CPDF_TransferFunc; -class CPDF_Type3Cache; -class CPDF_Type3Glyphs; -class CPDF_Type3Char; -class CPDF_Type3Font; typedef struct { FX_FLOAT m_DecodeMin; @@ -173,4 +152,4 @@ class CPDF_DIBSource : public CFX_DIBSource { int m_Status; }; -#endif // CORE_FPDFAPI_RENDER_RENDER_INT_H_ +#endif // CORE_FPDFAPI_RENDER_CPDF_DIBSOURCE_H_ diff --git a/core/fpdfapi/render/cpdf_docrenderdata.cpp b/core/fpdfapi/render/cpdf_docrenderdata.cpp index 7ac0353d42..0e6f2d07e5 100644 --- a/core/fpdfapi/render/cpdf_docrenderdata.cpp +++ b/core/fpdfapi/render/cpdf_docrenderdata.cpp @@ -12,9 +12,9 @@ #include "core/fpdfapi/page/pageint.h" #include "core/fpdfapi/parser/cpdf_array.h" #include "core/fpdfapi/parser/cpdf_document.h" +#include "core/fpdfapi/render/cpdf_dibsource.h" #include "core/fpdfapi/render/cpdf_transferfunc.h" #include "core/fpdfapi/render/cpdf_type3cache.h" -#include "core/fpdfapi/render/render_int.h" namespace { diff --git a/core/fpdfapi/render/cpdf_imagecacheentry.cpp b/core/fpdfapi/render/cpdf_imagecacheentry.cpp index 932d281f98..84efd925c8 100644 --- a/core/fpdfapi/render/cpdf_imagecacheentry.cpp +++ b/core/fpdfapi/render/cpdf_imagecacheentry.cpp @@ -13,10 +13,10 @@ #include "core/fpdfapi/parser/cpdf_dictionary.h" #include "core/fpdfapi/parser/cpdf_document.h" #include "core/fpdfapi/parser/cpdf_stream.h" +#include "core/fpdfapi/render/cpdf_dibsource.h" #include "core/fpdfapi/render/cpdf_pagerendercache.h" #include "core/fpdfapi/render/cpdf_rendercontext.h" #include "core/fpdfapi/render/cpdf_renderstatus.h" -#include "core/fpdfapi/render/render_int.h" CPDF_ImageCacheEntry::CPDF_ImageCacheEntry(CPDF_Document* pDoc, CPDF_Stream* pStream) diff --git a/core/fpdfapi/render/cpdf_imageloader.cpp b/core/fpdfapi/render/cpdf_imageloader.cpp index 77e21168f9..18213ea695 100644 --- a/core/fpdfapi/render/cpdf_imageloader.cpp +++ b/core/fpdfapi/render/cpdf_imageloader.cpp @@ -8,10 +8,10 @@ #include "core/fpdfapi/page/cpdf_image.h" #include "core/fpdfapi/page/cpdf_imageobject.h" +#include "core/fpdfapi/render/cpdf_dibsource.h" #include "core/fpdfapi/render/cpdf_imagecacheentry.h" #include "core/fpdfapi/render/cpdf_pagerendercache.h" #include "core/fpdfapi/render/cpdf_renderstatus.h" -#include "core/fpdfapi/render/render_int.h" #include "core/fxcrt/fx_basic.h" CPDF_ImageLoader::CPDF_ImageLoader() diff --git a/core/fpdfapi/render/cpdf_imagerenderer.cpp b/core/fpdfapi/render/cpdf_imagerenderer.cpp index a5b1238eaf..ad713d0a5e 100644 --- a/core/fpdfapi/render/cpdf_imagerenderer.cpp +++ b/core/fpdfapi/render/cpdf_imagerenderer.cpp @@ -19,11 +19,11 @@ #include "core/fpdfapi/parser/cpdf_array.h" #include "core/fpdfapi/parser/cpdf_dictionary.h" #include "core/fpdfapi/parser/cpdf_document.h" +#include "core/fpdfapi/render/cpdf_dibsource.h" #include "core/fpdfapi/render/cpdf_pagerendercache.h" #include "core/fpdfapi/render/cpdf_rendercontext.h" #include "core/fpdfapi/render/cpdf_renderstatus.h" #include "core/fpdfapi/render/cpdf_transferfunc.h" -#include "core/fpdfapi/render/render_int.h" #include "core/fpdfdoc/cpdf_occontext.h" #include "core/fxcrt/cfx_maybe_owned.h" #include "core/fxcrt/fx_safe_types.h" diff --git a/core/fpdfapi/render/cpdf_renderstatus.cpp b/core/fpdfapi/render/cpdf_renderstatus.cpp index 3897963de8..01026f44a9 100644 --- a/core/fpdfapi/render/cpdf_renderstatus.cpp +++ b/core/fpdfapi/render/cpdf_renderstatus.cpp @@ -34,6 +34,7 @@ #include "core/fpdfapi/parser/cpdf_document.h" #include "core/fpdfapi/render/cpdf_charposlist.h" #include "core/fpdfapi/render/cpdf_devicebuffer.h" +#include "core/fpdfapi/render/cpdf_dibsource.h" #include "core/fpdfapi/render/cpdf_docrenderdata.h" #include "core/fpdfapi/render/cpdf_imagerenderer.h" #include "core/fpdfapi/render/cpdf_pagerendercache.h" @@ -43,7 +44,6 @@ #include "core/fpdfapi/render/cpdf_textrenderer.h" #include "core/fpdfapi/render/cpdf_transferfunc.h" #include "core/fpdfapi/render/cpdf_type3cache.h" -#include "core/fpdfapi/render/render_int.h" #include "core/fpdfdoc/cpdf_occontext.h" #include "core/fxcodec/fx_codec.h" #include "core/fxcrt/cfx_maybe_owned.h" diff --git a/core/fxge/dib/fx_dib_engine_unittest.cpp b/core/fxge/dib/fx_dib_engine_unittest.cpp index d7d66f0755..dff53483b2 100644 --- a/core/fxge/dib/fx_dib_engine_unittest.cpp +++ b/core/fxge/dib/fx_dib_engine_unittest.cpp @@ -8,7 +8,7 @@ #include "core/fpdfapi/parser/cpdf_dictionary.h" #include "core/fpdfapi/parser/cpdf_number.h" #include "core/fpdfapi/parser/cpdf_stream.h" -#include "core/fpdfapi/render/render_int.h" +#include "core/fpdfapi/render/cpdf_dibsource.h" #include "core/fxcrt/fx_memory.h" #include "core/fxge/dib/dib_int.h" #include "core/fxge/fx_dib.h" |