diff options
Diffstat (limited to 'xfa/src/fdp')
33 files changed, 122 insertions, 29 deletions
diff --git a/xfa/src/fdp/include/fde.h b/xfa/src/fdp/include/fde.h index 2ec103fe25..9a6a663d10 100644 --- a/xfa/src/fdp/include/fde.h +++ b/xfa/src/fdp/include/fde.h @@ -9,16 +9,16 @@ #ifndef XFA_SRC_FDP_INCLUDE_FDE_H_ #define XFA_SRC_FDP_INCLUDE_FDE_H_ -#include "xfa/src/fdp/include/fde_mem.h" -#include "xfa/src/fdp/include/fde_xml.h" -#include "xfa/src/fdp/include/fde_img.h" #include "xfa/src/fdp/include/fde_brs.h" +#include "xfa/src/fdp/include/fde_css.h" +#include "xfa/src/fdp/include/fde_img.h" +#include "xfa/src/fdp/include/fde_mem.h" #include "xfa/src/fdp/include/fde_pen.h" -#include "xfa/src/fdp/include/fde_pth.h" -#include "xfa/src/fdp/include/fde_tto.h" #include "xfa/src/fdp/include/fde_psr.h" -#include "xfa/src/fdp/include/fde_css.h" -#include "xfa/src/fdp/include/fde_rdv.h" +#include "xfa/src/fdp/include/fde_pth.h" #include "xfa/src/fdp/include/fde_rdr.h" +#include "xfa/src/fdp/include/fde_rdv.h" +#include "xfa/src/fdp/include/fde_tto.h" +#include "xfa/src/fdp/include/fde_xml.h" #endif // XFA_SRC_FDP_INCLUDE_FDE_H_ diff --git a/xfa/src/fdp/include/fde_css.h b/xfa/src/fdp/include/fde_css.h index 5e4da8fe35..825a2a65f7 100644 --- a/xfa/src/fdp/include/fde_css.h +++ b/xfa/src/fdp/include/fde_css.h @@ -7,6 +7,11 @@ #ifndef XFA_SRC_FDP_INCLUDE_FDE_CSS_H_ #define XFA_SRC_FDP_INCLUDE_FDE_CSS_H_ +#include "core/include/fxge/fx_dib.h" +#include "xfa/src/fgas/include/fx_fnt.h" +#include "xfa/src/fgas/include/fx_stm.h" +#include "xfa/src/fgas/include/fx_utl.h" + class IFDE_HTMNotify; class IFDE_CSSValue; class IFDE_CSSPrimitiveValue; @@ -41,6 +46,7 @@ class IFDE_CSSQuoteContext; class IFDE_CSSContentContext; class IFDE_CSSMultiColumnContext; class IFDE_CSSFloatContext; + enum FDE_CSSVALUETYPE { FDE_CSSVALUETYPE_Primitive = 1, FDE_CSSVALUETYPE_List = 2, diff --git a/xfa/src/fdp/include/fde_img.h b/xfa/src/fdp/include/fde_img.h index 4388bbfae5..b1612cb91f 100644 --- a/xfa/src/fdp/include/fde_img.h +++ b/xfa/src/fdp/include/fde_img.h @@ -7,7 +7,10 @@ #ifndef XFA_SRC_FDP_INCLUDE_FDE_IMG_H_ #define XFA_SRC_FDP_INCLUDE_FDE_IMG_H_ -class IFDE_Image; +#include "xfa/src/fgas/include/fx_mem.h" +#include "xfa/src/fgas/include/fx_stm.h" +#include "xfa/src/fgas/include/fx_utl.h" + #define FDE_IMAGEFORMAT_Unknown -1 #define FDE_IMAGEFORMAT_BMP 0 #define FDE_IMAGEFORMAT_GIF 1 @@ -16,6 +19,7 @@ class IFDE_Image; #define FDE_IMAGEFORMAT_TIFF 4 #define FDE_IMAGEFORMAT_JPEG2000 5 #define FDE_IMAGEFORMAT_JBig2 6 + class IFDE_Image { public: static IFDE_Image* Create(IFX_Stream* pStream, diff --git a/xfa/src/fdp/include/fde_psr.h b/xfa/src/fdp/include/fde_psr.h index 5f3e93d93c..253eb8d903 100644 --- a/xfa/src/fdp/include/fde_psr.h +++ b/xfa/src/fdp/include/fde_psr.h @@ -7,6 +7,16 @@ #ifndef XFA_SRC_FDP_INCLUDE_FDE_PSR_H_ #define XFA_SRC_FDP_INCLUDE_FDE_PSR_H_ +#include "core/include/fxcrt/fx_coordinates.h" +#include "core/include/fxcrt/fx_system.h" +#include "core/include/fxge/fx_dib.h" +#include "core/include/fxge/fx_ge.h" +#include "xfa/src/fdp/include/fde_brs.h" +#include "xfa/src/fdp/include/fde_img.h" +#include "xfa/src/fdp/include/fde_pen.h" +#include "xfa/src/fdp/include/fde_pth.h" +#include "xfa/src/fgas/include/fx_fnt.h" + enum FDE_VISUALOBJTYPE { FDE_VISUALOBJ_Canvas = 0x00, FDE_VISUALOBJ_Text = 0x01, @@ -14,7 +24,9 @@ enum FDE_VISUALOBJTYPE { FDE_VISUALOBJ_Path = 0x04, FDE_VISUALOBJ_Widget = 0x08, }; + typedef struct _FDE_HVISUALOBJ { void* pData; } const* FDE_HVISUALOBJ; + class IFDE_VisualSet { public: virtual ~IFDE_VisualSet() {} @@ -24,6 +36,7 @@ class IFDE_VisualSet { virtual FX_BOOL GetRect(FDE_HVISUALOBJ hVisualObj, CFX_RectF& rt) = 0; virtual FX_BOOL GetClip(FDE_HVISUALOBJ hVisualObj, CFX_RectF& rt) = 0; }; + class IFDE_CanvasSet : public IFDE_VisualSet { public: virtual FX_POSITION GetFirstPosition(FDE_HVISUALOBJ hCanvas) = 0; diff --git a/xfa/src/fdp/include/fde_rdr.h b/xfa/src/fdp/include/fde_rdr.h index 8aca67361b..085a78e4c1 100644 --- a/xfa/src/fdp/include/fde_rdr.h +++ b/xfa/src/fdp/include/fde_rdr.h @@ -7,6 +7,9 @@ #ifndef XFA_SRC_FDP_INCLUDE_FDE_RDR_H_ #define XFA_SRC_FDP_INCLUDE_FDE_RDR_H_ +#include "core/include/fxcrt/fx_coordinates.h" +#include "xfa/src/fdp/include/fde_psr.h" + class IFDE_Page; class IFDE_RenderDevice; diff --git a/xfa/src/fdp/include/fde_rdv.h b/xfa/src/fdp/include/fde_rdv.h index 2d9e3800ef..88e7dd4507 100644 --- a/xfa/src/fdp/include/fde_rdv.h +++ b/xfa/src/fdp/include/fde_rdv.h @@ -7,6 +7,12 @@ #ifndef XFA_SRC_FDP_INCLUDE_FDE_RDV_H_ #define XFA_SRC_FDP_INCLUDE_FDE_RDV_H_ +#include "core/include/fxcrt/fx_coordinates.h" +#include "core/include/fxge/fx_font.h" +#include "core/include/fxge/fx_ge.h" +#include "xfa/src/fdp/include/fde_pth.h" +#include "xfa/src/fgas/include/fx_fnt.h" + class IFDE_Pen; class IFDE_Brush; class IFDE_Image; diff --git a/xfa/src/fdp/include/fde_tto.h b/xfa/src/fdp/include/fde_tto.h index 3e7fcf9f38..dbfa64775c 100644 --- a/xfa/src/fdp/include/fde_tto.h +++ b/xfa/src/fdp/include/fde_tto.h @@ -7,7 +7,10 @@ #ifndef XFA_SRC_FDP_INCLUDE_FDE_TTO_H_ #define XFA_SRC_FDP_INCLUDE_FDE_TTO_H_ -class IFDE_TextOut; +#include "core/include/fxge/fx_dib.h" +#include "core/include/fxge/fx_ge.h" +#include "xfa/src/fgas/include/fx_fnt.h" + #define FDE_TTOSTYLE_Underline 0x0001 #define FDE_TTOSTYLE_Strikeout 0x0002 #define FDE_TTOSTYLE_VerticalLayout 0x0004 diff --git a/xfa/src/fdp/include/fde_xml.h b/xfa/src/fdp/include/fde_xml.h index 40b0480e8c..a83e27e66c 100644 --- a/xfa/src/fdp/include/fde_xml.h +++ b/xfa/src/fdp/include/fde_xml.h @@ -7,6 +7,9 @@ #ifndef XFA_SRC_FDP_INCLUDE_FDE_XML_H_ #define XFA_SRC_FDP_INCLUDE_FDE_XML_H_ +#include "xfa/src/fgas/include/fx_stm.h" +#include "xfa/src/fgas/include/fx_utl.h" + class IFDE_XMLNode; class IFDE_XMLInstruction; class IFDE_XMLDeclaration; @@ -22,6 +25,7 @@ class IFDE_XMLText; class IFDE_XMLDoc; class IFDE_XMLParser; class IFDE_XMLSyntaxParser; + #ifdef __cplusplus extern "C" { #endif diff --git a/xfa/src/fdp/src/css/fde_csscache.cpp b/xfa/src/fdp/src/css/fde_csscache.cpp index 5909524dae..90fb50f121 100644 --- a/xfa/src/fdp/src/css/fde_csscache.cpp +++ b/xfa/src/fdp/src/css/fde_csscache.cpp @@ -6,8 +6,8 @@ #include <algorithm> -#include "xfa/src/foxitlib.h" #include "xfa/src/fdp/src/css/fde_csscache.h" +#include "xfa/src/foxitlib.h" _FDE_CSSCACHEITEM::_FDE_CSSCACHEITEM(IFDE_CSSStyleSheet* p) : pStylesheet(p), dwActivity(0) { FXSYS_assert(pStylesheet); diff --git a/xfa/src/fdp/src/css/fde_csscache.h b/xfa/src/fdp/src/css/fde_csscache.h index d42821b969..29ef417412 100644 --- a/xfa/src/fdp/src/css/fde_csscache.h +++ b/xfa/src/fdp/src/css/fde_csscache.h @@ -7,6 +7,9 @@ #ifndef XFA_SRC_FDP_SRC_CSS_FDE_CSSCACHE_H_ #define XFA_SRC_FDP_SRC_CSS_FDE_CSSCACHE_H_ +#include "xfa/src/fdp/include/fde_css.h" +#include "xfa/src/fgas/include/fx_mem.h" + typedef struct _FDE_CSSCACHEITEM : public CFX_Target { _FDE_CSSCACHEITEM(IFDE_CSSStyleSheet* p); ~_FDE_CSSCACHEITEM(); diff --git a/xfa/src/fdp/src/css/fde_cssdatatable.cpp b/xfa/src/fdp/src/css/fde_cssdatatable.cpp index cda1fe4638..28b925dda2 100644 --- a/xfa/src/fdp/src/css/fde_cssdatatable.cpp +++ b/xfa/src/fdp/src/css/fde_cssdatatable.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/foxitlib.h" #include "xfa/src/fdp/src/css/fde_cssdatatable.h" +#include "xfa/src/foxitlib.h" FX_BOOL FDE_CSSLengthToFloat(const FDE_CSSLENGTH& len, FX_FLOAT fPercentBase, diff --git a/xfa/src/fdp/src/css/fde_cssdatatable.h b/xfa/src/fdp/src/css/fde_cssdatatable.h index d4e4be5094..df396228fc 100644 --- a/xfa/src/fdp/src/css/fde_cssdatatable.h +++ b/xfa/src/fdp/src/css/fde_cssdatatable.h @@ -7,6 +7,10 @@ #ifndef XFA_SRC_FDP_SRC_CSS_FDE_CSSDATATABLE_H_ #define XFA_SRC_FDP_SRC_CSS_FDE_CSSDATATABLE_H_ +#include "core/include/fxcrt/fx_system.h" +#include "xfa/src/fdp/include/fde_css.h" +#include "xfa/src/fgas/include/fx_mem.h" + class CFDE_CSSFunction : public CFX_Target { public: CFDE_CSSFunction(const FX_WCHAR* pszFuncName, IFDE_CSSValueList* pArgList) diff --git a/xfa/src/fdp/src/css/fde_cssdeclaration.cpp b/xfa/src/fdp/src/css/fde_cssdeclaration.cpp index 08ea0ee7da..6d5081317c 100644 --- a/xfa/src/fdp/src/css/fde_cssdeclaration.cpp +++ b/xfa/src/fdp/src/css/fde_cssdeclaration.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/foxitlib.h" #include "xfa/src/fdp/src/css/fde_cssdeclaration.h" +#include "xfa/src/foxitlib.h" IFDE_CSSValue* CFDE_CSSDeclaration::GetProperty(FDE_CSSPROPERTY eProperty, FX_BOOL& bImportant) const { for (FDE_LPCSSPROPERTYHOLDER pHolder = m_pFirstProperty; pHolder; diff --git a/xfa/src/fdp/src/css/fde_cssstyleselector.cpp b/xfa/src/fdp/src/css/fde_cssstyleselector.cpp index 1bb0133e99..6cf011ac77 100644 --- a/xfa/src/fdp/src/css/fde_cssstyleselector.cpp +++ b/xfa/src/fdp/src/css/fde_cssstyleselector.cpp @@ -4,10 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/foxitlib.h" #include "xfa/src/fdp/src/css/fde_csscache.h" #include "xfa/src/fdp/src/css/fde_cssdeclaration.h" #include "xfa/src/fdp/src/css/fde_cssstyleselector.h" +#include "xfa/src/foxitlib.h" int32_t CFDE_CSSCounterStyle::FindIndex(const FX_WCHAR* pszIdentifier) { int32_t iCount = m_arrCounterData.GetSize(); for (int32_t i = 0; i < iCount; i++) { diff --git a/xfa/src/fdp/src/css/fde_cssstyleselector.h b/xfa/src/fdp/src/css/fde_cssstyleselector.h index 92e58f5ba1..aac9b1fad8 100644 --- a/xfa/src/fdp/src/css/fde_cssstyleselector.h +++ b/xfa/src/fdp/src/css/fde_cssstyleselector.h @@ -7,6 +7,9 @@ #ifndef XFA_SRC_FDP_SRC_CSS_FDE_CSSSTYLESELECTOR_H_ #define XFA_SRC_FDP_SRC_CSS_FDE_CSSSTYLESELECTOR_H_ +#include "xfa/src/fdp/include/fde_mem.h" +#include "xfa/src/fgas/include/fx_sys.h" + #define FDE_CSSUNIVERSALHASH ('*') typedef struct _FDE_CSSRULEDATA : public CFX_Target { public: diff --git a/xfa/src/fdp/src/css/fde_cssstylesheet.cpp b/xfa/src/fdp/src/css/fde_cssstylesheet.cpp index 4aa9bf77b2..b8046280f2 100644 --- a/xfa/src/fdp/src/css/fde_cssstylesheet.cpp +++ b/xfa/src/fdp/src/css/fde_cssstylesheet.cpp @@ -4,10 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/foxitlib.h" -#include "xfa/src/fdp/src/css/fde_csssyntax.h" #include "xfa/src/fdp/src/css/fde_cssdatatable.h" #include "xfa/src/fdp/src/css/fde_cssstylesheet.h" +#include "xfa/src/fdp/src/css/fde_csssyntax.h" +#include "xfa/src/foxitlib.h" IFDE_CSSStyleSheet* IFDE_CSSStyleSheet::LoadHTMLStandardStyleSheet() { static const FX_WCHAR* s_pStyle = L"html,address,blockquote,body,dd,div,dl,dt,fieldset,form,frame,frameset," diff --git a/xfa/src/fdp/src/css/fde_cssstylesheet.h b/xfa/src/fdp/src/css/fde_cssstylesheet.h index 789e55f667..e8b6146e92 100644 --- a/xfa/src/fdp/src/css/fde_cssstylesheet.h +++ b/xfa/src/fdp/src/css/fde_cssstylesheet.h @@ -7,6 +7,7 @@ #ifndef XFA_SRC_FDP_SRC_CSS_FDE_CSSSTYLESHEET_H_ #define XFA_SRC_FDP_SRC_CSS_FDE_CSSSTYLESHEET_H_ +#include "core/include/fxcrt/fx_ext.h" #include "xfa/src/fdp/src/css/fde_cssdeclaration.h" class CFDE_CSSSelector : public IFDE_CSSSelector, public CFX_Target { diff --git a/xfa/src/fdp/src/css/fde_csssyntax.cpp b/xfa/src/fdp/src/css/fde_csssyntax.cpp index 15b8dbb23a..35bb32217d 100644 --- a/xfa/src/fdp/src/css/fde_csssyntax.cpp +++ b/xfa/src/fdp/src/css/fde_csssyntax.cpp @@ -4,9 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/foxitlib.h" -#include "xfa/src/fdp/src/css/fde_csssyntax.h" #include "xfa/src/fdp/src/css/fde_cssdatatable.h" +#include "xfa/src/fdp/src/css/fde_csssyntax.h" +#include "xfa/src/foxitlib.h" #ifdef _cplusplus extern "C" { #endif diff --git a/xfa/src/fdp/src/fde/fde_devbasic.cpp b/xfa/src/fdp/src/fde/fde_devbasic.cpp index bcc441806c..6b0e13971e 100644 --- a/xfa/src/fdp/src/fde/fde_devbasic.cpp +++ b/xfa/src/fdp/src/fde/fde_devbasic.cpp @@ -4,8 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/foxitlib.h" +#include <cstdint> + #include "xfa/src/fdp/src/fde/fde_devbasic.h" +#include "xfa/src/foxitlib.h" + static const FDE_HATCHDATA gs_HatchBitmapData[FDE_HATCHSTYLE_Total] = { {16, 16, diff --git a/xfa/src/fdp/src/fde/fde_devbasic.h b/xfa/src/fdp/src/fde/fde_devbasic.h index e5c27be2e0..62846ca8b7 100644 --- a/xfa/src/fdp/src/fde/fde_devbasic.h +++ b/xfa/src/fdp/src/fde/fde_devbasic.h @@ -7,6 +7,8 @@ #ifndef XFA_SRC_FDP_SRC_FDE_FDE_DEVBASIC_H_ #define XFA_SRC_FDP_SRC_FDE_FDE_DEVBASIC_H_ +#include <cstdint> + struct FDE_HATCHDATA { int32_t iWidth; int32_t iHeight; diff --git a/xfa/src/fdp/src/fde/fde_gedevice.cpp b/xfa/src/fdp/src/fde/fde_gedevice.cpp index 841882f419..fb124e3b4d 100644 --- a/xfa/src/fdp/src/fde/fde_gedevice.cpp +++ b/xfa/src/fdp/src/fde/fde_gedevice.cpp @@ -6,10 +6,10 @@ #include <algorithm> -#include "xfa/src/foxitlib.h" +#include "xfa/src/fdp/src/fde/fde_devbasic.h" #include "xfa/src/fdp/src/fde/fde_gedevice.h" #include "xfa/src/fdp/src/fde/fde_geobject.h" -#include "xfa/src/fdp/src/fde/fde_devbasic.h" +#include "xfa/src/foxitlib.h" #ifndef _FDEPLUS #ifdef _cplusplus exten "C" { diff --git a/xfa/src/fdp/src/fde/fde_gedevice.h b/xfa/src/fdp/src/fde/fde_gedevice.h index dc22f7b0d4..1f39895568 100644 --- a/xfa/src/fdp/src/fde/fde_gedevice.h +++ b/xfa/src/fdp/src/fde/fde_gedevice.h @@ -7,6 +7,9 @@ #ifndef XFA_SRC_FDP_SRC_FDE_FDE_GEDEVICE_H_ #define XFA_SRC_FDP_SRC_FDE_FDE_GEDEVICE_H_ +#include "xfa/src/fdp/include/fde_rdv.h" +#include "xfa/src/fgas/include/fx_mem.h" + #ifndef _FDEPLUS class CFDE_FxgeDevice : public IFDE_RenderDevice, public CFX_Target { public: diff --git a/xfa/src/fdp/src/fde/fde_geobject.cpp b/xfa/src/fdp/src/fde/fde_geobject.cpp index 92ec6ea4da..ed122abbb0 100644 --- a/xfa/src/fdp/src/fde/fde_geobject.cpp +++ b/xfa/src/fdp/src/fde/fde_geobject.cpp @@ -4,9 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/foxitlib.h" -#include "xfa/src/fdp/src/fde/fde_object.h" #include "xfa/src/fdp/src/fde/fde_geobject.h" +#include "xfa/src/fdp/src/fde/fde_object.h" +#include "xfa/src/foxitlib.h" #ifndef _FDEPLUS IFDE_Path* IFDE_Path::Create() { return new CFDE_Path; diff --git a/xfa/src/fdp/src/fde/fde_iterator.cpp b/xfa/src/fdp/src/fde/fde_iterator.cpp index 5d6c415a8e..932fa58ec5 100644 --- a/xfa/src/fdp/src/fde/fde_iterator.cpp +++ b/xfa/src/fdp/src/fde/fde_iterator.cpp @@ -4,8 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/foxitlib.h" #include "xfa/src/fdp/src/fde/fde_iterator.h" +#include "xfa/src/fgas/include/fx_utl.h" +#include "xfa/src/foxitlib.h" + IFDE_VisualSetIterator* IFDE_VisualSetIterator::Create() { return new CFDE_VisualSetIterator; } diff --git a/xfa/src/fdp/src/fde/fde_iterator.h b/xfa/src/fdp/src/fde/fde_iterator.h index c9fb8e423d..736bac0bee 100644 --- a/xfa/src/fdp/src/fde/fde_iterator.h +++ b/xfa/src/fdp/src/fde/fde_iterator.h @@ -7,6 +7,9 @@ #ifndef XFA_SRC_FDP_SRC_FDE_FDE_ITERATOR_H_ #define XFA_SRC_FDP_SRC_FDE_FDE_ITERATOR_H_ +#include "xfa/src/fdp/include/fde_psr.h" +#include "xfa/src/fgas/include/fx_mem.h" + typedef struct _FDE_CANVASITEM : public CFX_Target { IFDE_CanvasSet* pCanvas; FDE_HVISUALOBJ hCanvas; diff --git a/xfa/src/fdp/src/fde/fde_object.cpp b/xfa/src/fdp/src/fde/fde_object.cpp index 47a1bb5efe..ba058b8179 100644 --- a/xfa/src/fdp/src/fde/fde_object.cpp +++ b/xfa/src/fdp/src/fde/fde_object.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/foxitlib.h" #include "xfa/src/fdp/src/fde/fde_object.h" +#include "xfa/src/foxitlib.h" IFDE_Pen* IFDE_Pen::Create() { return new CFDE_Pen(); } diff --git a/xfa/src/fdp/src/fde/fde_object.h b/xfa/src/fdp/src/fde/fde_object.h index 91162edeb4..222968c357 100644 --- a/xfa/src/fdp/src/fde/fde_object.h +++ b/xfa/src/fdp/src/fde/fde_object.h @@ -7,6 +7,13 @@ #ifndef XFA_SRC_FDP_SRC_FDE_FDE_OBJECT_H_ #define XFA_SRC_FDP_SRC_FDE_FDE_OBJECT_H_ +#include <cstdint> + +#include "core/include/fxge/fx_dib.h" +#include "xfa/src/fdp/include/fde_brs.h" +#include "xfa/src/fdp/include/fde_pen.h" +#include "xfa/src/fgas/include/fx_mem.h" + class CFDE_Pen : public IFDE_Pen, public CFX_Target { public: CFDE_Pen() diff --git a/xfa/src/fdp/src/fde/fde_render.cpp b/xfa/src/fdp/src/fde/fde_render.cpp index a3f00acd9e..10ad622637 100644 --- a/xfa/src/fdp/src/fde/fde_render.cpp +++ b/xfa/src/fdp/src/fde/fde_render.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/foxitlib.h" #include "xfa/src/fdp/src/fde/fde_render.h" +#include "xfa/src/foxitlib.h" void FDE_GetPageMatrix(CFX_Matrix& pageMatrix, const CFX_RectF& docPageRect, const CFX_Rect& devicePageRect, diff --git a/xfa/src/fdp/src/fde/fde_render.h b/xfa/src/fdp/src/fde/fde_render.h index 4d9ae42db6..ce405a21fb 100644 --- a/xfa/src/fdp/src/fde/fde_render.h +++ b/xfa/src/fdp/src/fde/fde_render.h @@ -7,6 +7,11 @@ #ifndef XFA_SRC_FDP_SRC_FDE_FDE_RENDER_H_ #define XFA_SRC_FDP_SRC_FDE_FDE_RENDER_H_ +#include "xfa/src/fdp/include/fde_psr.h" +#include "xfa/src/fdp/include/fde_rdr.h" +#include "xfa/src/fdp/include/fde_rdv.h" +#include "xfa/src/fgas/include/fx_mem.h" + class CFDE_RenderContext : public IFDE_RenderContext, public CFX_Target { public: diff --git a/xfa/src/fdp/src/tto/fde_textout.cpp b/xfa/src/fdp/src/tto/fde_textout.cpp index 7150173dbb..b10a6ecbd7 100644 --- a/xfa/src/fdp/src/tto/fde_textout.cpp +++ b/xfa/src/fdp/src/tto/fde_textout.cpp @@ -6,8 +6,8 @@ #include <algorithm> -#include "xfa/src/foxitlib.h" #include "xfa/src/fdp/src/tto/fde_textout.h" +#include "xfa/src/foxitlib.h" IFDE_TextOut* IFDE_TextOut::Create() { return new CFDE_TextOut; } diff --git a/xfa/src/fdp/src/tto/fde_textout.h b/xfa/src/fdp/src/tto/fde_textout.h index ac9d88381a..afe62a613b 100644 --- a/xfa/src/fdp/src/tto/fde_textout.h +++ b/xfa/src/fdp/src/tto/fde_textout.h @@ -7,6 +7,18 @@ #ifndef XFA_SRC_FDP_SRC_TTO_FDE_TEXTOUT_H_ #define XFA_SRC_FDP_SRC_TTO_FDE_TEXTOUT_H_ +#include "core/include/fxcrt/fx_coordinates.h" +#include "core/include/fxcrt/fx_system.h" +#include "core/include/fxge/fx_dib.h" +#include "xfa/src/fdp/include/fde_brs.h" +#include "xfa/src/fdp/include/fde_pen.h" +#include "xfa/src/fdp/include/fde_rdv.h" +#include "xfa/src/fdp/include/fde_tto.h" +#include "xfa/src/fgas/include/fx_fnt.h" +#include "xfa/src/fgas/include/fx_mem.h" +#include "xfa/src/fgas/include/fx_tbk.h" +#include "xfa/src/fgas/include/fx_utl.h" + struct FDE_TTOPIECE { public: int32_t iStartChar; diff --git a/xfa/src/fdp/src/xml/fde_xml_imp.cpp b/xfa/src/fdp/src/xml/fde_xml_imp.cpp index 626e2388b4..fb9207ddf0 100644 --- a/xfa/src/fdp/src/xml/fde_xml_imp.cpp +++ b/xfa/src/fdp/src/xml/fde_xml_imp.cpp @@ -6,8 +6,8 @@ #include <algorithm> -#include "xfa/src/foxitlib.h" #include "xfa/src/fdp/src/xml/fde_xml_imp.h" +#include "xfa/src/foxitlib.h" #ifdef __cplusplus extern "C" { #endif diff --git a/xfa/src/fdp/src/xml/fde_xml_imp.h b/xfa/src/fdp/src/xml/fde_xml_imp.h index 2fed05c0fb..7054eaa292 100644 --- a/xfa/src/fdp/src/xml/fde_xml_imp.h +++ b/xfa/src/fdp/src/xml/fde_xml_imp.h @@ -7,11 +7,16 @@ #ifndef XFA_SRC_FDP_SRC_XML_FDE_XML_IMP_H_ #define XFA_SRC_FDP_SRC_XML_FDE_XML_IMP_H_ +#include "core/include/fxcrt/fx_system.h" +#include "xfa/src/fdp/include/fde_xml.h" +#include "xfa/src/fgas/include/fx_mem.h" +#include "xfa/src/fgas/include/fx_stm.h" + #define _FDE_BLOCK_BUFFER #ifdef _FDE_BLOCK_BUFFER class CFDE_BlockBuffer; -#endif -class CFDE_XMLNode; +#endif // _FDE_BLOCK_BUFFER + class CFDE_XMLInstruction; class CFDE_XMLElement; class CFDE_XMLText; @@ -20,6 +25,7 @@ class IFDE_XMLParser; class CFDE_XMLDOMParser; class CFDE_XMLSAXParser; class CFDE_XMLSyntaxParser; + class CFDE_XMLNode : public CFX_Target { public: CFDE_XMLNode(); |