From 74a34fc71ab02400a4c958709138302a1ab4c0e7 Mon Sep 17 00:00:00 2001 From: dsinclair Date: Thu, 29 Sep 2016 16:41:42 -0700 Subject: Move core/fxge/include to core/fxge BUG=pdfium:611 Review-Url: https://codereview.chromium.org/2377393002 --- core/fpdfapi/cpdf_pagerendercontext.cpp | 2 +- core/fpdfapi/fpdf_font/cpdf_font.cpp | 2 +- core/fpdfapi/fpdf_font/cpdf_font.h | 2 +- core/fpdfapi/fpdf_font/cpdf_fontencoding.cpp | 2 +- core/fpdfapi/fpdf_font/cpdf_simplefont.cpp | 2 +- core/fpdfapi/fpdf_font/cpdf_truetypefont.cpp | 2 +- core/fpdfapi/fpdf_font/cpdf_type1font.cpp | 4 ++-- core/fpdfapi/fpdf_font/cpdf_type3char.cpp | 2 +- core/fpdfapi/fpdf_font/fpdf_font.cpp | 2 +- core/fpdfapi/fpdf_font/fpdf_font_cid.cpp | 2 +- core/fpdfapi/fpdf_font/ttgsubtable.cpp | 2 +- core/fpdfapi/fpdf_font/ttgsubtable.h | 4 ++-- core/fpdfapi/fpdf_page/cpdf_allstates.cpp | 2 +- core/fpdfapi/fpdf_page/cpdf_colorstate.cpp | 2 +- core/fpdfapi/fpdf_page/cpdf_generalstate.h | 2 +- core/fpdfapi/fpdf_page/cpdf_graphicstates.h | 2 +- core/fpdfapi/fpdf_page/cpdf_image.cpp | 2 +- core/fpdfapi/fpdf_page/cpdf_path.h | 6 +++--- core/fpdfapi/fpdf_page/fpdf_page_parser.cpp | 4 ++-- core/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp | 4 ++-- core/fpdfapi/fpdf_page/pageint.h | 4 ++-- core/fpdfapi/fpdf_parser/cpdf_document.cpp | 4 ++-- core/fpdfapi/fpdf_render/cpdf_renderoptions.h | 2 +- core/fpdfapi/fpdf_render/cpdf_textrenderer.h | 2 +- core/fpdfapi/fpdf_render/cpdf_type3cache.cpp | 4 ++-- core/fpdfapi/fpdf_render/cpdf_type3glyphs.cpp | 2 +- core/fpdfapi/fpdf_render/fpdf_render.cpp | 8 ++++---- core/fpdfapi/fpdf_render/fpdf_render_image.cpp | 4 ++-- core/fpdfapi/fpdf_render/fpdf_render_pattern.cpp | 8 ++++---- core/fpdfapi/fpdf_render/fpdf_render_text.cpp | 12 ++++++------ core/fpdfapi/fpdf_render/render_int.h | 4 ++-- 31 files changed, 53 insertions(+), 53 deletions(-) (limited to 'core/fpdfapi') diff --git a/core/fpdfapi/cpdf_pagerendercontext.cpp b/core/fpdfapi/cpdf_pagerendercontext.cpp index e9a6f54aa2..dc5836262e 100644 --- a/core/fpdfapi/cpdf_pagerendercontext.cpp +++ b/core/fpdfapi/cpdf_pagerendercontext.cpp @@ -11,7 +11,7 @@ #include "core/fpdfapi/fpdf_render/cpdf_renderoptions.h" #include "core/fpdfdoc/cpdf_annotlist.h" #include "core/fpdfdoc/cpdf_occontext.h" -#include "core/fxge/include/cfx_renderdevice.h" +#include "core/fxge/cfx_renderdevice.h" CPDF_PageRenderContext::CPDF_PageRenderContext() {} diff --git a/core/fpdfapi/fpdf_font/cpdf_font.cpp b/core/fpdfapi/fpdf_font/cpdf_font.cpp index fd9a666d03..9b6fc5e824 100644 --- a/core/fpdfapi/fpdf_font/cpdf_font.cpp +++ b/core/fpdfapi/fpdf_font/cpdf_font.cpp @@ -23,7 +23,7 @@ #include "core/fpdfapi/fpdf_parser/cpdf_name.h" #include "core/fpdfapi/fpdf_parser/cpdf_stream_acc.h" #include "core/fxcrt/fx_memory.h" -#include "core/fxge/include/fx_freetype.h" +#include "core/fxge/fx_freetype.h" #include "third_party/base/stl_util.h" namespace { diff --git a/core/fpdfapi/fpdf_font/cpdf_font.h b/core/fpdfapi/fpdf_font/cpdf_font.h index 00fcfd7ddd..04f942c03c 100644 --- a/core/fpdfapi/fpdf_font/cpdf_font.h +++ b/core/fpdfapi/fpdf_font/cpdf_font.h @@ -12,7 +12,7 @@ #include "core/fxcrt/fx_string.h" #include "core/fxcrt/fx_system.h" -#include "core/fxge/include/fx_font.h" +#include "core/fxge/fx_font.h" #define PDFFONT_FIXEDPITCH 1 #define PDFFONT_SERIF 2 diff --git a/core/fpdfapi/fpdf_font/cpdf_fontencoding.cpp b/core/fpdfapi/fpdf_font/cpdf_fontencoding.cpp index 8704aea365..e373e01233 100644 --- a/core/fpdfapi/fpdf_font/cpdf_fontencoding.cpp +++ b/core/fpdfapi/fpdf_font/cpdf_fontencoding.cpp @@ -11,7 +11,7 @@ #include "core/fpdfapi/fpdf_parser/cpdf_name.h" #include "core/fpdfapi/fpdf_parser/cpdf_number.h" #include "core/fpdfapi/fpdf_parser/fpdf_parser_decode.h" -#include "core/fxge/include/fx_freetype.h" +#include "core/fxge/fx_freetype.h" namespace { diff --git a/core/fpdfapi/fpdf_font/cpdf_simplefont.cpp b/core/fpdfapi/fpdf_font/cpdf_simplefont.cpp index 94d8a993b7..dda642380f 100644 --- a/core/fpdfapi/fpdf_font/cpdf_simplefont.cpp +++ b/core/fpdfapi/fpdf_font/cpdf_simplefont.cpp @@ -9,7 +9,7 @@ #include "core/fpdfapi/fpdf_font/font_int.h" #include "core/fpdfapi/fpdf_parser/cpdf_array.h" #include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h" -#include "core/fxge/include/fx_freetype.h" +#include "core/fxge/fx_freetype.h" #include "third_party/base/numerics/safe_math.h" CPDF_SimpleFont::CPDF_SimpleFont() : m_BaseEncoding(PDFFONT_ENCODING_BUILTIN) { diff --git a/core/fpdfapi/fpdf_font/cpdf_truetypefont.cpp b/core/fpdfapi/fpdf_font/cpdf_truetypefont.cpp index c6b8eb6419..08c3e11974 100644 --- a/core/fpdfapi/fpdf_font/cpdf_truetypefont.cpp +++ b/core/fpdfapi/fpdf_font/cpdf_truetypefont.cpp @@ -8,7 +8,7 @@ #include "core/fpdfapi/fpdf_font/font_int.h" #include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h" -#include "core/fxge/include/fx_font.h" +#include "core/fxge/fx_font.h" namespace { diff --git a/core/fpdfapi/fpdf_font/cpdf_type1font.cpp b/core/fpdfapi/fpdf_font/cpdf_type1font.cpp index 04b872f0e0..d80d59ae9d 100644 --- a/core/fpdfapi/fpdf_font/cpdf_type1font.cpp +++ b/core/fpdfapi/fpdf_font/cpdf_type1font.cpp @@ -8,8 +8,8 @@ #include "core/fpdfapi/fpdf_font/font_int.h" #include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h" -#include "core/fxge/include/cfx_gemodule.h" -#include "core/fxge/include/fx_freetype.h" +#include "core/fxge/cfx_gemodule.h" +#include "core/fxge/fx_freetype.h" #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ #include "core/fxge/apple/apple_int.h" diff --git a/core/fpdfapi/fpdf_font/cpdf_type3char.cpp b/core/fpdfapi/fpdf_font/cpdf_type3char.cpp index c97e26d76b..a11f319b78 100644 --- a/core/fpdfapi/fpdf_font/cpdf_type3char.cpp +++ b/core/fpdfapi/fpdf_font/cpdf_type3char.cpp @@ -10,7 +10,7 @@ #include "core/fpdfapi/fpdf_page/cpdf_image.h" #include "core/fpdfapi/fpdf_page/cpdf_imageobject.h" #include "core/fpdfapi/fpdf_page/cpdf_pageobject.h" -#include "core/fxge/include/fx_dib.h" +#include "core/fxge/fx_dib.h" CPDF_Type3Char::CPDF_Type3Char(CPDF_Form* pForm) : m_pForm(pForm), m_bColored(FALSE) {} diff --git a/core/fpdfapi/fpdf_font/fpdf_font.cpp b/core/fpdfapi/fpdf_font/fpdf_font.cpp index 722e74dde5..cff5223a00 100644 --- a/core/fpdfapi/fpdf_font/fpdf_font.cpp +++ b/core/fpdfapi/fpdf_font/fpdf_font.cpp @@ -18,7 +18,7 @@ #include "core/fpdfapi/fpdf_parser/cpdf_simple_parser.h" #include "core/fpdfapi/fpdf_parser/cpdf_stream_acc.h" #include "core/fxcrt/fx_ext.h" -#include "core/fxge/include/fx_freetype.h" +#include "core/fxge/fx_freetype.h" #include "third_party/base/numerics/safe_conversions.h" #include "third_party/base/stl_util.h" diff --git a/core/fpdfapi/fpdf_font/fpdf_font_cid.cpp b/core/fpdfapi/fpdf_font/fpdf_font_cid.cpp index 891ca7f9ea..abedcf0708 100644 --- a/core/fpdfapi/fpdf_font/fpdf_font_cid.cpp +++ b/core/fpdfapi/fpdf_font/fpdf_font_cid.cpp @@ -14,7 +14,7 @@ #include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h" #include "core/fpdfapi/fpdf_parser/cpdf_simple_parser.h" #include "core/fxcrt/fx_ext.h" -#include "core/fxge/include/fx_freetype.h" +#include "core/fxge/fx_freetype.h" namespace { diff --git a/core/fpdfapi/fpdf_font/ttgsubtable.cpp b/core/fpdfapi/fpdf_font/ttgsubtable.cpp index fb6287ee28..dde7793050 100644 --- a/core/fpdfapi/fpdf_font/ttgsubtable.cpp +++ b/core/fpdfapi/fpdf_font/ttgsubtable.cpp @@ -6,7 +6,7 @@ #include "core/fpdfapi/fpdf_font/ttgsubtable.h" -#include "core/fxge/include/fx_freetype.h" +#include "core/fxge/fx_freetype.h" #include "third_party/base/stl_util.h" CFX_GlyphMap::CFX_GlyphMap() {} diff --git a/core/fpdfapi/fpdf_font/ttgsubtable.h b/core/fpdfapi/fpdf_font/ttgsubtable.h index 759eea4036..492a6a21de 100644 --- a/core/fpdfapi/fpdf_font/ttgsubtable.h +++ b/core/fpdfapi/fpdf_font/ttgsubtable.h @@ -13,8 +13,8 @@ #include #include "core/fxcrt/fx_basic.h" -#include "core/fxge/include/fx_font.h" -#include "core/fxge/include/fx_freetype.h" +#include "core/fxge/fx_font.h" +#include "core/fxge/fx_freetype.h" class CFX_GlyphMap { public: diff --git a/core/fpdfapi/fpdf_page/cpdf_allstates.cpp b/core/fpdfapi/fpdf_page/cpdf_allstates.cpp index 24ec15f3c1..16eb0dfbae 100644 --- a/core/fpdfapi/fpdf_page/cpdf_allstates.cpp +++ b/core/fpdfapi/fpdf_page/cpdf_allstates.cpp @@ -9,7 +9,7 @@ #include "core/fpdfapi/fpdf_page/pageint.h" #include "core/fpdfapi/fpdf_parser/cpdf_array.h" #include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h" -#include "core/fxge/include/cfx_graphstatedata.h" +#include "core/fxge/cfx_graphstatedata.h" namespace { diff --git a/core/fpdfapi/fpdf_page/cpdf_colorstate.cpp b/core/fpdfapi/fpdf_page/cpdf_colorstate.cpp index c6a5254c0f..e74b884d68 100644 --- a/core/fpdfapi/fpdf_page/cpdf_colorstate.cpp +++ b/core/fpdfapi/fpdf_page/cpdf_colorstate.cpp @@ -8,7 +8,7 @@ #include "core/fpdfapi/fpdf_page/cpdf_pattern.h" #include "core/fpdfapi/fpdf_page/cpdf_tilingpattern.h" -#include "core/fxge/include/fx_dib.h" +#include "core/fxge/fx_dib.h" CPDF_ColorState::CPDF_ColorState() {} diff --git a/core/fpdfapi/fpdf_page/cpdf_generalstate.h b/core/fpdfapi/fpdf_page/cpdf_generalstate.h index 35562d9706..9bcce04894 100644 --- a/core/fpdfapi/fpdf_page/cpdf_generalstate.h +++ b/core/fpdfapi/fpdf_page/cpdf_generalstate.h @@ -9,7 +9,7 @@ #include "core/fxcrt/fx_basic.h" #include "core/fxcrt/fx_coordinates.h" -#include "core/fxge/include/fx_dib.h" +#include "core/fxge/fx_dib.h" class CPDF_Object; class CPDF_TransferFunc; diff --git a/core/fpdfapi/fpdf_page/cpdf_graphicstates.h b/core/fpdfapi/fpdf_page/cpdf_graphicstates.h index f52aba27d8..6e612153d0 100644 --- a/core/fpdfapi/fpdf_page/cpdf_graphicstates.h +++ b/core/fpdfapi/fpdf_page/cpdf_graphicstates.h @@ -11,7 +11,7 @@ #include "core/fpdfapi/fpdf_page/cpdf_colorstate.h" #include "core/fpdfapi/fpdf_page/cpdf_generalstate.h" #include "core/fpdfapi/fpdf_page/cpdf_textstate.h" -#include "core/fxge/include/cfx_graphstate.h" +#include "core/fxge/cfx_graphstate.h" class CPDF_GraphicStates { public: diff --git a/core/fpdfapi/fpdf_page/cpdf_image.cpp b/core/fpdfapi/fpdf_page/cpdf_image.cpp index 5a1f9af037..21cec2e442 100644 --- a/core/fpdfapi/fpdf_page/cpdf_image.cpp +++ b/core/fpdfapi/fpdf_page/cpdf_image.cpp @@ -20,7 +20,7 @@ #include "core/fpdfapi/fpdf_render/cpdf_pagerendercache.h" #include "core/fpdfapi/fpdf_render/render_int.h" #include "core/fxcodec/fx_codec.h" -#include "core/fxge/include/fx_dib.h" +#include "core/fxge/fx_dib.h" CPDF_Image::CPDF_Image(CPDF_Document* pDoc) : CPDF_Image(pDoc, nullptr, false) {} diff --git a/core/fpdfapi/fpdf_page/cpdf_path.h b/core/fpdfapi/fpdf_page/cpdf_path.h index b4450c171e..3f77b05d5b 100644 --- a/core/fpdfapi/fpdf_page/cpdf_path.h +++ b/core/fpdfapi/fpdf_page/cpdf_path.h @@ -9,9 +9,9 @@ #include "core/fxcrt/cfx_count_ref.h" #include "core/fxcrt/fx_system.h" -#include "core/fxge/include/cfx_fxgedevice.h" -#include "core/fxge/include/cfx_pathdata.h" -#include "core/fxge/include/cfx_renderdevice.h" +#include "core/fxge/cfx_fxgedevice.h" +#include "core/fxge/cfx_pathdata.h" +#include "core/fxge/cfx_renderdevice.h" class CPDF_Path { public: diff --git a/core/fpdfapi/fpdf_page/fpdf_page_parser.cpp b/core/fpdfapi/fpdf_page/fpdf_page_parser.cpp index 41fefa0580..18a2e2d882 100644 --- a/core/fpdfapi/fpdf_page/fpdf_page_parser.cpp +++ b/core/fpdfapi/fpdf_page/fpdf_page_parser.cpp @@ -34,8 +34,8 @@ #include "core/fpdfapi/fpdf_parser/cpdf_stream_acc.h" #include "core/fpdfapi/fpdf_parser/fpdf_parser_decode.h" #include "core/fxcrt/fx_safe_types.h" -#include "core/fxge/include/cfx_graphstatedata.h" -#include "core/fxge/include/cfx_pathdata.h" +#include "core/fxge/cfx_graphstatedata.h" +#include "core/fxge/cfx_pathdata.h" namespace { diff --git a/core/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp b/core/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp index 68c6eca210..3c7a301d29 100644 --- a/core/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp +++ b/core/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp @@ -30,8 +30,8 @@ #include "core/fxcodec/fx_codec.h" #include "core/fxcrt/fx_ext.h" #include "core/fxcrt/fx_safe_types.h" -#include "core/fxge/include/cfx_fxgedevice.h" -#include "core/fxge/include/cfx_renderdevice.h" +#include "core/fxge/cfx_fxgedevice.h" +#include "core/fxge/cfx_renderdevice.h" namespace { diff --git a/core/fpdfapi/fpdf_page/pageint.h b/core/fpdfapi/fpdf_page/pageint.h index 2fbc629136..3c10702b9e 100644 --- a/core/fpdfapi/fpdf_page/pageint.h +++ b/core/fpdfapi/fpdf_page/pageint.h @@ -18,8 +18,8 @@ #include "core/fpdfapi/fpdf_page/cpdf_pageobjectholder.h" #include "core/fxcrt/cfx_string_pool_template.h" #include "core/fxcrt/cfx_weak_ptr.h" -#include "core/fxge/include/cfx_pathdata.h" -#include "core/fxge/include/cfx_renderdevice.h" +#include "core/fxge/cfx_pathdata.h" +#include "core/fxge/cfx_renderdevice.h" class CPDF_AllStates; class CPDF_ColorSpace; diff --git a/core/fpdfapi/fpdf_parser/cpdf_document.cpp b/core/fpdfapi/fpdf_parser/cpdf_document.cpp index 30a50f54ae..f90fa3dc78 100644 --- a/core/fpdfapi/fpdf_parser/cpdf_document.cpp +++ b/core/fpdfapi/fpdf_parser/cpdf_document.cpp @@ -21,8 +21,8 @@ #include "core/fpdfapi/fpdf_parser/cpdf_stream.h" #include "core/fpdfapi/fpdf_render/render_int.h" #include "core/fxcodec/JBig2_DocumentContext.h" -#include "core/fxge/include/cfx_unicodeencoding.h" -#include "core/fxge/include/fx_font.h" +#include "core/fxge/cfx_unicodeencoding.h" +#include "core/fxge/fx_font.h" #include "third_party/base/stl_util.h" namespace { diff --git a/core/fpdfapi/fpdf_render/cpdf_renderoptions.h b/core/fpdfapi/fpdf_render/cpdf_renderoptions.h index 73383ae8f0..bb0bcd3651 100644 --- a/core/fpdfapi/fpdf_render/cpdf_renderoptions.h +++ b/core/fpdfapi/fpdf_render/cpdf_renderoptions.h @@ -8,7 +8,7 @@ #define CORE_FPDFAPI_FPDF_RENDER_CPDF_RENDEROPTIONS_H_ #include "core/fxcrt/fx_system.h" -#include "core/fxge/include/fx_dib.h" +#include "core/fxge/fx_dib.h" class CPDF_OCContext; diff --git a/core/fpdfapi/fpdf_render/cpdf_textrenderer.h b/core/fpdfapi/fpdf_render/cpdf_textrenderer.h index ca6d91efe6..b758a01570 100644 --- a/core/fpdfapi/fpdf_render/cpdf_textrenderer.h +++ b/core/fpdfapi/fpdf_render/cpdf_textrenderer.h @@ -10,7 +10,7 @@ #include "core/fxcrt/fx_coordinates.h" #include "core/fxcrt/fx_string.h" #include "core/fxcrt/fx_system.h" -#include "core/fxge/include/fx_dib.h" +#include "core/fxge/fx_dib.h" class CFX_RenderDevice; class CFX_GraphStateData; diff --git a/core/fpdfapi/fpdf_render/cpdf_type3cache.cpp b/core/fpdfapi/fpdf_render/cpdf_type3cache.cpp index a1856ba5e1..6de46a6376 100644 --- a/core/fpdfapi/fpdf_render/cpdf_type3cache.cpp +++ b/core/fpdfapi/fpdf_render/cpdf_type3cache.cpp @@ -12,8 +12,8 @@ #include "core/fpdfapi/fpdf_font/cpdf_type3char.h" #include "core/fpdfapi/fpdf_font/cpdf_type3font.h" #include "core/fpdfapi/fpdf_render/cpdf_type3glyphs.h" -#include "core/fxge/include/fx_dib.h" -#include "core/fxge/include/fx_font.h" +#include "core/fxge/fx_dib.h" +#include "core/fxge/fx_font.h" namespace { diff --git a/core/fpdfapi/fpdf_render/cpdf_type3glyphs.cpp b/core/fpdfapi/fpdf_render/cpdf_type3glyphs.cpp index f450dffa8c..e811c2bd8c 100644 --- a/core/fpdfapi/fpdf_render/cpdf_type3glyphs.cpp +++ b/core/fpdfapi/fpdf_render/cpdf_type3glyphs.cpp @@ -8,7 +8,7 @@ #include -#include "core/fxge/include/fx_font.h" +#include "core/fxge/fx_font.h" CPDF_Type3Glyphs::CPDF_Type3Glyphs() : m_TopBlueCount(0), m_BottomBlueCount(0) {} diff --git a/core/fpdfapi/fpdf_render/fpdf_render.cpp b/core/fpdfapi/fpdf_render/fpdf_render.cpp index d610670fd5..a87a40afae 100644 --- a/core/fpdfapi/fpdf_render/fpdf_render.cpp +++ b/core/fpdfapi/fpdf_render/fpdf_render.cpp @@ -30,10 +30,10 @@ #include "core/fpdfapi/fpdf_render/cpdf_textrenderer.h" #include "core/fpdfapi/fpdf_render/cpdf_type3cache.h" #include "core/fpdfdoc/cpdf_occontext.h" -#include "core/fxge/include/cfx_fxgedevice.h" -#include "core/fxge/include/cfx_graphstatedata.h" -#include "core/fxge/include/cfx_pathdata.h" -#include "core/fxge/include/cfx_renderdevice.h" +#include "core/fxge/cfx_fxgedevice.h" +#include "core/fxge/cfx_graphstatedata.h" +#include "core/fxge/cfx_pathdata.h" +#include "core/fxge/cfx_renderdevice.h" CPDF_DocRenderData::CPDF_DocRenderData(CPDF_Document* pPDFDoc) : m_pPDFDoc(pPDFDoc) {} diff --git a/core/fpdfapi/fpdf_render/fpdf_render_image.cpp b/core/fpdfapi/fpdf_render/fpdf_render_image.cpp index 1b7b7db575..d0bca1a17a 100644 --- a/core/fpdfapi/fpdf_render/fpdf_render_image.cpp +++ b/core/fpdfapi/fpdf_render/fpdf_render_image.cpp @@ -26,8 +26,8 @@ #include "core/fpdfdoc/cpdf_occontext.h" #include "core/fxcodec/fx_codec.h" #include "core/fxcrt/fx_safe_types.h" -#include "core/fxge/include/cfx_fxgedevice.h" -#include "core/fxge/include/cfx_pathdata.h" +#include "core/fxge/cfx_fxgedevice.h" +#include "core/fxge/cfx_pathdata.h" #ifdef _SKIA_SUPPORT_ #include "core/fxge/skia/fx_skia_device.h" diff --git a/core/fpdfapi/fpdf_render/fpdf_render_pattern.cpp b/core/fpdfapi/fpdf_render/fpdf_render_pattern.cpp index b31ae211ab..55887204ef 100644 --- a/core/fpdfapi/fpdf_render/fpdf_render_pattern.cpp +++ b/core/fpdfapi/fpdf_render/fpdf_render_pattern.cpp @@ -21,10 +21,10 @@ #include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h" #include "core/fpdfapi/fpdf_render/cpdf_rendercontext.h" #include "core/fpdfapi/fpdf_render/cpdf_renderoptions.h" -#include "core/fxge/include/cfx_fxgedevice.h" -#include "core/fxge/include/cfx_pathdata.h" -#include "core/fxge/include/cfx_renderdevice.h" -#include "core/fxge/include/ifx_renderdevicedriver.h" +#include "core/fxge/cfx_fxgedevice.h" +#include "core/fxge/cfx_pathdata.h" +#include "core/fxge/cfx_renderdevice.h" +#include "core/fxge/ifx_renderdevicedriver.h" namespace { diff --git a/core/fpdfapi/fpdf_render/fpdf_render_text.cpp b/core/fpdfapi/fpdf_render/fpdf_render_text.cpp index 0f4becf240..1ddf954d86 100644 --- a/core/fpdfapi/fpdf_render/fpdf_render_text.cpp +++ b/core/fpdfapi/fpdf_render/fpdf_render_text.cpp @@ -23,12 +23,12 @@ #include "core/fpdfapi/fpdf_render/cpdf_renderoptions.h" #include "core/fpdfapi/fpdf_render/cpdf_textrenderer.h" #include "core/fpdfapi/fpdf_render/cpdf_type3cache.h" -#include "core/fxge/include/cfx_facecache.h" -#include "core/fxge/include/cfx_fxgedevice.h" -#include "core/fxge/include/cfx_gemodule.h" -#include "core/fxge/include/cfx_graphstatedata.h" -#include "core/fxge/include/cfx_pathdata.h" -#include "core/fxge/include/cfx_renderdevice.h" +#include "core/fxge/cfx_facecache.h" +#include "core/fxge/cfx_fxgedevice.h" +#include "core/fxge/cfx_gemodule.h" +#include "core/fxge/cfx_graphstatedata.h" +#include "core/fxge/cfx_pathdata.h" +#include "core/fxge/cfx_renderdevice.h" FX_BOOL CPDF_RenderStatus::ProcessText(CPDF_TextObject* textobj, const CFX_Matrix* pObj2Device, diff --git a/core/fpdfapi/fpdf_render/render_int.h b/core/fpdfapi/fpdf_render/render_int.h index b193344ca5..c913d56a7f 100644 --- a/core/fpdfapi/fpdf_render/render_int.h +++ b/core/fpdfapi/fpdf_render/render_int.h @@ -16,8 +16,8 @@ #include "core/fpdfapi/fpdf_page/cpdf_graphicstates.h" #include "core/fpdfapi/fpdf_parser/cpdf_stream_acc.h" #include "core/fpdfapi/fpdf_render/cpdf_renderoptions.h" -#include "core/fxge/include/cfx_fxgedevice.h" -#include "core/fxge/include/cfx_renderdevice.h" +#include "core/fxge/cfx_fxgedevice.h" +#include "core/fxge/cfx_renderdevice.h" class CCodec_Jbig2Context; class CCodec_ScanlineDecoder; -- cgit v1.2.3