diff options
author | Dan Sinclair <dsinclair@chromium.org> | 2016-02-22 13:04:17 -0500 |
---|---|---|
committer | Dan Sinclair <dsinclair@chromium.org> | 2016-02-22 13:04:17 -0500 |
commit | 04d02dbdd511aed4ddd61d8648edc633a0fb8c43 (patch) | |
tree | 23c45c573096dbb58ca67c4c296d7c5aee579514 /xfa | |
parent | 22d6607d104d4cb8c5263c4d307b4ba1e4ff959e (diff) | |
download | pdfium-04d02dbdd511aed4ddd61d8648edc633a0fb8c43.tar.xz |
Expand XFA includes to be relative to pdfium/.
This Cl updates the includes in the XFA directory to be relative to the
pdfium/ directory instead of the current directory.
This does not sort the includes as that is a larger IWYU task that will be
handled separately.
BUG=pdfium:65
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1723533002 .
Diffstat (limited to 'xfa')
227 files changed, 785 insertions, 777 deletions
diff --git a/xfa/include/fwl/basewidget/fwl_barcode.h b/xfa/include/fwl/basewidget/fwl_barcode.h index a0a6b816fd..b6452f31eb 100644 --- a/xfa/include/fwl/basewidget/fwl_barcode.h +++ b/xfa/include/fwl/basewidget/fwl_barcode.h @@ -7,7 +7,7 @@ #ifndef XFA_INCLUDE_FWL_BASEWIDGET_FWL_BARCODE_H_ #define XFA_INCLUDE_FWL_BASEWIDGET_FWL_BARCODE_H_ -#include "fwl_edit.h" +#include "xfa/include/fwl/basewidget/fwl_edit.h" class CFWL_WidgetImpProperties; class IFWL_Widget; diff --git a/xfa/include/fxfa/fxfa.h b/xfa/include/fxfa/fxfa.h index c92f392abe..3c2b54877a 100644 --- a/xfa/include/fxfa/fxfa.h +++ b/xfa/include/fxfa/fxfa.h @@ -47,8 +47,8 @@ class IXFA_Widget { IXFA_Widget() {} }; -#include "fxfa_basic.h" -#include "fxfa_widget.h" +#include "xfa/include/fxfa/fxfa_basic.h" +#include "xfa/include/fxfa/fxfa_widget.h" #define XFA_MBICON_Error 0 #define XFA_MBICON_Warning 1 #define XFA_MBICON_Question 2 diff --git a/xfa/include/fxfa/fxfa_widget.h b/xfa/include/fxfa/fxfa_widget.h index 5994b81b3c..00fe369c4b 100644 --- a/xfa/include/fxfa/fxfa_widget.h +++ b/xfa/include/fxfa/fxfa_widget.h @@ -7,6 +7,8 @@ #ifndef XFA_INCLUDE_FXFA_FXFA_WIDGET_H_ #define XFA_INCLUDE_FXFA_FXFA_WIDGET_H_ +#include "xfa/include/fxfa/fxfa_objectacc.h" + class CXFA_Node; class CXFA_FFDocView; class CXFA_FFDoc; @@ -19,7 +21,7 @@ class CXFA_TextProvider; class CXFA_WidgetLayoutData; class IFX_Font; class CXFA_WidgetAcc; -#include "fxfa_objectacc.h" + class CXFA_WidgetAcc : public CXFA_WidgetData { public: CXFA_WidgetAcc(CXFA_FFDocView* pDocView, CXFA_Node* pNode); diff --git a/xfa/src/fdp/include/fde.h b/xfa/src/fdp/include/fde.h index 1d6f360391..2ec103fe25 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 "fde_mem.h" -#include "fde_xml.h" -#include "fde_img.h" -#include "fde_brs.h" -#include "fde_pen.h" -#include "fde_pth.h" -#include "fde_tto.h" -#include "fde_psr.h" -#include "fde_css.h" -#include "fde_rdv.h" -#include "fde_rdr.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_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_rdr.h" #endif // XFA_SRC_FDP_INCLUDE_FDE_H_ diff --git a/xfa/src/fdp/src/css/fde_csscache.cpp b/xfa/src/fdp/src/css/fde_csscache.cpp index a4f89c9867..5d98b98629 100644 --- a/xfa/src/fdp/src/css/fde_csscache.cpp +++ b/xfa/src/fdp/src/css/fde_csscache.cpp @@ -7,7 +7,7 @@ #include <algorithm> #include "xfa/src/foxitlib.h" -#include "fde_csscache.h" +#include "xfa/src/fdp/src/css/fde_csscache.h" _FDE_CSSCACHEITEM::_FDE_CSSCACHEITEM(IFDE_CSSStyleSheet* p) : pStylesheet(p), dwActivity(0) { FXSYS_assert(pStylesheet); diff --git a/xfa/src/fdp/src/css/fde_cssdatatable.cpp b/xfa/src/fdp/src/css/fde_cssdatatable.cpp index 5d0fa9fe03..cda1fe4638 100644 --- a/xfa/src/fdp/src/css/fde_cssdatatable.cpp +++ b/xfa/src/fdp/src/css/fde_cssdatatable.cpp @@ -5,7 +5,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "fde_cssdatatable.h" +#include "xfa/src/fdp/src/css/fde_cssdatatable.h" FX_BOOL FDE_CSSLengthToFloat(const FDE_CSSLENGTH& len, FX_FLOAT fPercentBase, diff --git a/xfa/src/fdp/src/css/fde_cssdeclaration.cpp b/xfa/src/fdp/src/css/fde_cssdeclaration.cpp index 1d4f58b8d0..08ea0ee7da 100644 --- a/xfa/src/fdp/src/css/fde_cssdeclaration.cpp +++ b/xfa/src/fdp/src/css/fde_cssdeclaration.cpp @@ -5,7 +5,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "fde_cssdeclaration.h" +#include "xfa/src/fdp/src/css/fde_cssdeclaration.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_cssdeclaration.h b/xfa/src/fdp/src/css/fde_cssdeclaration.h index 8670e5e169..3cb6418a32 100644 --- a/xfa/src/fdp/src/css/fde_cssdeclaration.h +++ b/xfa/src/fdp/src/css/fde_cssdeclaration.h @@ -7,7 +7,7 @@ #ifndef XFA_SRC_FDP_SRC_CSS_FDE_CSSDECLARATION_H_ #define XFA_SRC_FDP_SRC_CSS_FDE_CSSDECLARATION_H_ -#include "fde_cssdatatable.h" +#include "xfa/src/fdp/src/css/fde_cssdatatable.h" typedef struct _FDE_CSSPROPERTYHOLDER : public CFX_Target { int16_t eProperty; diff --git a/xfa/src/fdp/src/css/fde_cssstyleselector.cpp b/xfa/src/fdp/src/css/fde_cssstyleselector.cpp index d58407bee0..815aaf5604 100644 --- a/xfa/src/fdp/src/css/fde_cssstyleselector.cpp +++ b/xfa/src/fdp/src/css/fde_cssstyleselector.cpp @@ -5,9 +5,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "fde_csscache.h" -#include "fde_cssdeclaration.h" -#include "fde_cssstyleselector.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" 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_cssstylesheet.cpp b/xfa/src/fdp/src/css/fde_cssstylesheet.cpp index b9da5b6b8b..4aa9bf77b2 100644 --- a/xfa/src/fdp/src/css/fde_cssstylesheet.cpp +++ b/xfa/src/fdp/src/css/fde_cssstylesheet.cpp @@ -5,9 +5,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "fde_csssyntax.h" -#include "fde_cssdatatable.h" -#include "fde_cssstylesheet.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" 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 596443bfcb..789e55f667 100644 --- a/xfa/src/fdp/src/css/fde_cssstylesheet.h +++ b/xfa/src/fdp/src/css/fde_cssstylesheet.h @@ -7,7 +7,7 @@ #ifndef XFA_SRC_FDP_SRC_CSS_FDE_CSSSTYLESHEET_H_ #define XFA_SRC_FDP_SRC_CSS_FDE_CSSSTYLESHEET_H_ -#include "fde_cssdeclaration.h" +#include "xfa/src/fdp/src/css/fde_cssdeclaration.h" class CFDE_CSSSelector : public IFDE_CSSSelector, public CFX_Target { public: diff --git a/xfa/src/fdp/src/css/fde_csssyntax.cpp b/xfa/src/fdp/src/css/fde_csssyntax.cpp index 2308281be5..b546d1046f 100644 --- a/xfa/src/fdp/src/css/fde_csssyntax.cpp +++ b/xfa/src/fdp/src/css/fde_csssyntax.cpp @@ -5,8 +5,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "fde_csssyntax.h" -#include "fde_cssdatatable.h" +#include "xfa/src/fdp/src/css/fde_csssyntax.h" +#include "xfa/src/fdp/src/css/fde_cssdatatable.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 c4cf5032b4..bcc441806c 100644 --- a/xfa/src/fdp/src/fde/fde_devbasic.cpp +++ b/xfa/src/fdp/src/fde/fde_devbasic.cpp @@ -5,7 +5,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "fde_devbasic.h" +#include "xfa/src/fdp/src/fde/fde_devbasic.h" static const FDE_HATCHDATA gs_HatchBitmapData[FDE_HATCHSTYLE_Total] = { {16, 16, diff --git a/xfa/src/fdp/src/fde/fde_gdidevice.cpp b/xfa/src/fdp/src/fde/fde_gdidevice.cpp index 55b206e80c..e29b3b18da 100644 --- a/xfa/src/fdp/src/fde/fde_gdidevice.cpp +++ b/xfa/src/fdp/src/fde/fde_gdidevice.cpp @@ -5,8 +5,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "stdafx.h" -#include "fde_gdidevice.h" -#include "fde_gdiobject.h" +#include "xfa/src/fdp/src/fde/fde_gdidevice.h" + #ifdef _FDEPLUS #if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN32_MOBILE_ || \ _FX_OS_ == _FX_WIN64_ diff --git a/xfa/src/fdp/src/fde/fde_gedevice.cpp b/xfa/src/fdp/src/fde/fde_gedevice.cpp index 65b76762d2..841882f419 100644 --- a/xfa/src/fdp/src/fde/fde_gedevice.cpp +++ b/xfa/src/fdp/src/fde/fde_gedevice.cpp @@ -7,9 +7,9 @@ #include <algorithm> #include "xfa/src/foxitlib.h" -#include "fde_gedevice.h" -#include "fde_geobject.h" -#include "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" #ifndef _FDEPLUS #ifdef _cplusplus exten "C" { diff --git a/xfa/src/fdp/src/fde/fde_geobject.cpp b/xfa/src/fdp/src/fde/fde_geobject.cpp index c005a74117..92ec6ea4da 100644 --- a/xfa/src/fdp/src/fde/fde_geobject.cpp +++ b/xfa/src/fdp/src/fde/fde_geobject.cpp @@ -5,8 +5,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "fde_object.h" -#include "fde_geobject.h" +#include "xfa/src/fdp/src/fde/fde_object.h" +#include "xfa/src/fdp/src/fde/fde_geobject.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 d711c4b6fc..5d6c415a8e 100644 --- a/xfa/src/fdp/src/fde/fde_iterator.cpp +++ b/xfa/src/fdp/src/fde/fde_iterator.cpp @@ -5,7 +5,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "fde_iterator.h" +#include "xfa/src/fdp/src/fde/fde_iterator.h" IFDE_VisualSetIterator* IFDE_VisualSetIterator::Create() { return new CFDE_VisualSetIterator; } diff --git a/xfa/src/fdp/src/fde/fde_object.cpp b/xfa/src/fdp/src/fde/fde_object.cpp index b033d0b4ee..47a1bb5efe 100644 --- a/xfa/src/fdp/src/fde/fde_object.cpp +++ b/xfa/src/fdp/src/fde/fde_object.cpp @@ -5,7 +5,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "fde_object.h" +#include "xfa/src/fdp/src/fde/fde_object.h" IFDE_Pen* IFDE_Pen::Create() { return new CFDE_Pen(); } diff --git a/xfa/src/fdp/src/fde/fde_render.cpp b/xfa/src/fdp/src/fde/fde_render.cpp index 564c31d480..30e208c387 100644 --- a/xfa/src/fdp/src/fde/fde_render.cpp +++ b/xfa/src/fdp/src/fde/fde_render.cpp @@ -5,7 +5,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "fde_render.h" +#include "xfa/src/fdp/src/fde/fde_render.h" void FDE_GetPageMatrix(CFX_Matrix& pageMatrix, const CFX_RectF& docPageRect, const CFX_Rect& devicePageRect, diff --git a/xfa/src/fdp/src/tto/fde_textout.cpp b/xfa/src/fdp/src/tto/fde_textout.cpp index a5c398a1f3..7150173dbb 100644 --- a/xfa/src/fdp/src/tto/fde_textout.cpp +++ b/xfa/src/fdp/src/tto/fde_textout.cpp @@ -7,7 +7,7 @@ #include <algorithm> #include "xfa/src/foxitlib.h" -#include "fde_textout.h" +#include "xfa/src/fdp/src/tto/fde_textout.h" IFDE_TextOut* IFDE_TextOut::Create() { return new CFDE_TextOut; } diff --git a/xfa/src/fdp/src/xml/fde_xml_imp.cpp b/xfa/src/fdp/src/xml/fde_xml_imp.cpp index 1f90f0d70a..e5250fde28 100644 --- a/xfa/src/fdp/src/xml/fde_xml_imp.cpp +++ b/xfa/src/fdp/src/xml/fde_xml_imp.cpp @@ -7,7 +7,7 @@ #include <algorithm> #include "xfa/src/foxitlib.h" -#include "fde_xml_imp.h" +#include "xfa/src/fdp/src/xml/fde_xml_imp.h" #ifdef __cplusplus extern "C" { #endif diff --git a/xfa/src/fee/src/fee/fde_txtedtblock.cpp b/xfa/src/fee/src/fee/fde_txtedtblock.cpp index 66777f9653..6a3a8abb89 100644 --- a/xfa/src/fee/src/fee/fde_txtedtblock.cpp +++ b/xfa/src/fee/src/fee/fde_txtedtblock.cpp @@ -5,7 +5,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "fde_txtedtblock.h" +#include "xfa/src/fee/src/fee/fde_txtedtblock.h" #ifdef FDE_USEFORMATBLOCK #define FDE_TXTEDT_FORMATBLOCK_BGN 0xFFF9 #define FDE_TXTEDT_FORMATBLOCK_END 0xFFFB diff --git a/xfa/src/fee/src/fee/fde_txtedtbuf.cpp b/xfa/src/fee/src/fee/fde_txtedtbuf.cpp index 2135b3613c..bd8eaea155 100644 --- a/xfa/src/fee/src/fee/fde_txtedtbuf.cpp +++ b/xfa/src/fee/src/fee/fde_txtedtbuf.cpp @@ -9,7 +9,7 @@ #include "xfa/src/foxitlib.h" #include "xfa/src/fee/include/ifde_txtedtbuf.h" #include "xfa/src/fee/include/ifde_txtedtengine.h" -#include "fde_txtedtbuf.h" +#include "xfa/src/fee/src/fee/fde_txtedtbuf.h" #define FDE_DEFCHUNKCOUNT 2 #define FDE_TXTEDT_FORMATBLOCK_BGN 0xFFF9 #define FDE_TXTEDT_FORMATBLOCK_END 0xFFFB diff --git a/xfa/src/fee/src/fee/fde_txtedtengine.cpp b/xfa/src/fee/src/fee/fde_txtedtengine.cpp index 6a289a61db..7610302ca2 100644 --- a/xfa/src/fee/src/fee/fde_txtedtengine.cpp +++ b/xfa/src/fee/src/fee/fde_txtedtengine.cpp @@ -10,11 +10,11 @@ #include "xfa/src/fee/include/ifde_txtedtengine.h" #include "xfa/src/fee/include/ifde_txtedtbuf.h" #include "xfa/src/fee/include/ifde_txtedtpage.h" -#include "fde_txtedtengine.h" -#include "fde_txtedtparag.h" -#include "fde_txtedtbuf.h" +#include "xfa/src/fee/src/fee/fde_txtedtengine.h" +#include "xfa/src/fee/src/fee/fde_txtedtparag.h" +#include "xfa/src/fee/src/fee/fde_txtedtbuf.h" #ifdef FDE_USEFORMATBLOCK -#include "fde_txtedtblock.h" +#include "xfa/src/fee/src/fee/fde_txtedtblock.h" #endif #define FDE_PAGEWIDTH_MAX 0xFFFF #define FDE_TXTPLATESIZE (1024 * 12) diff --git a/xfa/src/fee/src/fee/fde_txtedtpage.cpp b/xfa/src/fee/src/fee/fde_txtedtpage.cpp index 74356f2314..879c400328 100644 --- a/xfa/src/fee/src/fee/fde_txtedtpage.cpp +++ b/xfa/src/fee/src/fee/fde_txtedtpage.cpp @@ -11,10 +11,10 @@ #include "xfa/src/fee/include/ifde_txtedtengine.h" #include "xfa/src/fee/include/ifde_txtedtpage.h" #include "xfa/src/fee/include/fx_wordbreak.h" -#include "fde_txtedtpage.h" -#include "fde_txtedtengine.h" -#include "fde_txtedtparag.h" -#include "fde_txtedtbuf.h" +#include "xfa/src/fee/src/fee/fde_txtedtpage.h" +#include "xfa/src/fee/src/fee/fde_txtedtengine.h" +#include "xfa/src/fee/src/fee/fde_txtedtparag.h" +#include "xfa/src/fee/src/fee/fde_txtedtbuf.h" #define FDE_TXTEDT_TOLERANCE 0.1f IFDE_TxtEdtPage* IFDE_TxtEdtPage::Create(IFDE_TxtEdtEngine* pEngine, int32_t nIndex) { diff --git a/xfa/src/fee/src/fee/fde_txtedtparag.cpp b/xfa/src/fee/src/fee/fde_txtedtparag.cpp index a2b721c539..3e7e1ef0c0 100644 --- a/xfa/src/fee/src/fee/fde_txtedtparag.cpp +++ b/xfa/src/fee/src/fee/fde_txtedtparag.cpp @@ -8,9 +8,9 @@ #include "xfa/src/fee/include/ifde_txtedtbuf.h" #include "xfa/src/fee/include/ifde_txtedtengine.h" #include "xfa/src/fee/include/fx_wordbreak.h" -#include "fde_txtedtparag.h" -#include "fde_txtedtengine.h" -#include "fde_txtedtbuf.h" +#include "xfa/src/fee/src/fee/fde_txtedtparag.h" +#include "xfa/src/fee/src/fee/fde_txtedtengine.h" +#include "xfa/src/fee/src/fee/fde_txtedtbuf.h" CFDE_TxtEdtParag::CFDE_TxtEdtParag(CFDE_TxtEdtEngine* pEngine) : m_nCharStart(0), m_nCharCount(0), diff --git a/xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.cpp b/xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.cpp index 99045b43e7..b1f3a4cb62 100644 --- a/xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.cpp +++ b/xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.cpp @@ -5,7 +5,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "fx_wordbreak_impl.h" +#include "xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.h" #define FX_IsOdd(a) ((a)&1) FX_WordBreakProp FX_GetWordBreakProperty(FX_WCHAR wcCodePoint) { FX_DWORD dwProperty = diff --git a/xfa/src/fee/src/fx_wordbreak/fx_wordbreakdata.cpp b/xfa/src/fee/src/fx_wordbreak/fx_wordbreakdata.cpp index 2e7ee8fd61..114b843e4c 100644 --- a/xfa/src/fee/src/fx_wordbreak/fx_wordbreakdata.cpp +++ b/xfa/src/fee/src/fx_wordbreak/fx_wordbreakdata.cpp @@ -5,7 +5,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "fx_wordbreak_impl.h" +#include "xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.h" extern const FX_WORD gs_FX_WordBreak_Table[16] = { 0xFFFF, 0xFFF9, 0xFFFB, 0xFFFB, 0xFFFB, 0xFFFB, 0xEFBB, 0xE77B, 0xFFFB, 0xFFFB, 0xFFFB, 0xE77B, 0xE73B, 0xFFFB, 0xFFFB, 0xFFFB, diff --git a/xfa/src/fgas/include/fgas.h b/xfa/src/fgas/include/fgas.h index ba72ff3e25..8031269f1e 100644 --- a/xfa/src/fgas/include/fgas.h +++ b/xfa/src/fgas/include/fgas.h @@ -9,20 +9,20 @@ #ifndef XFA_SRC_FGAS_INCLUDE_FGAS_H_ #define XFA_SRC_FGAS_INCLUDE_FGAS_H_ -#include "fx_sys.h" -#include "fx_mem.h" -#include "fx_lgg.h" -#include "fx_utl.h" -#include "fx_alg.h" -#include "fx_cpg.h" -#include "fx_stm.h" -#include "fx_datetime.h" -#include "fx_locale.h" -#include "fx_sax.h" -#include "fx_fnt.h" -#include "fx_ucd.h" -#include "fx_lbk.h" -#include "fx_tbk.h" -#include "fx_rbk.h" +#include "xfa/src/fgas/include/fx_sys.h" +#include "xfa/src/fgas/include/fx_mem.h" +#include "xfa/src/fgas/include/fx_lgg.h" +#include "xfa/src/fgas/include/fx_utl.h" +#include "xfa/src/fgas/include/fx_alg.h" +#include "xfa/src/fgas/include/fx_cpg.h" +#include "xfa/src/fgas/include/fx_stm.h" +#include "xfa/src/fgas/include/fx_datetime.h" +#include "xfa/src/fgas/include/fx_locale.h" +#include "xfa/src/fgas/include/fx_sax.h" +#include "xfa/src/fgas/include/fx_fnt.h" +#include "xfa/src/fgas/include/fx_ucd.h" +#include "xfa/src/fgas/include/fx_lbk.h" +#include "xfa/src/fgas/include/fx_tbk.h" +#include "xfa/src/fgas/include/fx_rbk.h" #endif // XFA_SRC_FGAS_INCLUDE_FGAS_H_ diff --git a/xfa/src/fgas/include/fx_utl.h b/xfa/src/fgas/include/fx_utl.h index cd7f2a7ef2..c8d943e920 100644 --- a/xfa/src/fgas/include/fx_utl.h +++ b/xfa/src/fgas/include/fx_utl.h @@ -7,7 +7,7 @@ #ifndef XFA_SRC_FGAS_INCLUDE_FX_UTL_H_ #define XFA_SRC_FGAS_INCLUDE_FX_UTL_H_ -#include "fx_mem.h" +#include "xfa/src/fgas/include/fx_mem.h" #include "core/include/fxcrt/fx_coordinates.h" // For CFX_Rect. class CFX_ThreadLock; diff --git a/xfa/src/fgas/src/crt/fx_memory.cpp b/xfa/src/fgas/src/crt/fx_memory.cpp index 497512d8e2..6c0f98c382 100644 --- a/xfa/src/fgas/src/crt/fx_memory.cpp +++ b/xfa/src/fgas/src/crt/fx_memory.cpp @@ -7,7 +7,7 @@ #include <algorithm> #include "xfa/src/fgas/src/fgas_base.h" -#include "fx_memory.h" +#include "xfa/src/fgas/src/crt/fx_memory.h" #define FX_4BYTEALIGN(size) (((size) + 3) / 4 * 4) IFX_MEMAllocator* FX_CreateAllocator(FX_ALLOCTYPE eType, size_t chunkSize, diff --git a/xfa/src/fgas/src/crt/fx_stream.cpp b/xfa/src/fgas/src/crt/fx_stream.cpp index 243a5c3c43..93cdb5ec2c 100644 --- a/xfa/src/fgas/src/crt/fx_stream.cpp +++ b/xfa/src/fgas/src/crt/fx_stream.cpp @@ -7,7 +7,7 @@ #include <algorithm> #include "xfa/src/fgas/src/fgas_base.h" -#include "fx_stream.h" +#include "xfa/src/fgas/src/crt/fx_stream.h" IFX_Stream* IFX_Stream::CreateStream(IFX_BufferRead* pBufferRead, FX_DWORD dwAccess, int32_t iFileSize, diff --git a/xfa/src/fgas/src/crt/fx_utils.cpp b/xfa/src/fgas/src/crt/fx_utils.cpp index 7f62eb0993..2818e07035 100644 --- a/xfa/src/fgas/src/crt/fx_utils.cpp +++ b/xfa/src/fgas/src/crt/fx_utils.cpp @@ -8,7 +8,7 @@ #include "xfa/src/fgas/include/fx_utl.h" #include "xfa/src/fgas/src/fgas_base.h" -#include "fx_utils.h" +#include "xfa/src/fgas/src/crt/fx_utils.h" CFX_ThreadLock::CFX_ThreadLock() { } diff --git a/xfa/src/fgas/src/font/fx_fontutils.cpp b/xfa/src/fgas/src/font/fx_fontutils.cpp index 9372f6a572..0affb52ecf 100644 --- a/xfa/src/fgas/src/font/fx_fontutils.cpp +++ b/xfa/src/fgas/src/font/fx_fontutils.cpp @@ -5,7 +5,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/fgas/src/fgas_base.h" -#include "fx_fontutils.h" +#include "xfa/src/fgas/src/font/fx_fontutils.h" FX_DWORD FGAS_GetFontHashCode(FX_WORD wCodePage, FX_DWORD dwFontStyles) { FX_DWORD dwHash = wCodePage; if (dwFontStyles & FX_FONTSTYLE_FixedPitch) { diff --git a/xfa/src/fgas/src/font/fx_gdifont.cpp b/xfa/src/fgas/src/font/fx_gdifont.cpp index c14db35709..25365dd2a3 100644 --- a/xfa/src/fgas/src/font/fx_gdifont.cpp +++ b/xfa/src/fgas/src/font/fx_gdifont.cpp @@ -5,8 +5,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/fgas/src/fgas_base.h" -#include "fx_gdifont.h" -#include "fx_stdfontmgr.h" +#include "xfa/src/fgas/src/font/fx_gdifont.h" +#include "xfa/src/fgas/src/font/fx_stdfontmgr.h" #ifdef _FXPLUS #if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN32_MOBILE_ || \ _FX_OS_ == _FX_WIN64_ diff --git a/xfa/src/fgas/src/font/fx_gefont.cpp b/xfa/src/fgas/src/font/fx_gefont.cpp index 93f2b7bfc2..cc8421cd5d 100644 --- a/xfa/src/fgas/src/font/fx_gefont.cpp +++ b/xfa/src/fgas/src/font/fx_gefont.cpp @@ -5,8 +5,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/fgas/src/fgas_base.h" -#include "fx_gefont.h" -#include "fx_fontutils.h" +#include "xfa/src/fgas/src/font/fx_gefont.h" +#include "xfa/src/fgas/src/font/fx_fontutils.h" #ifndef _FXPLUS IFX_Font* IFX_Font::LoadFont(const FX_WCHAR* pszFontFamily, FX_DWORD dwFontStyles, diff --git a/xfa/src/fgas/src/layout/fx_unicode.cpp b/xfa/src/fgas/src/layout/fx_unicode.cpp index 3734d5f4a6..946b8d7049 100644 --- a/xfa/src/fgas/src/layout/fx_unicode.cpp +++ b/xfa/src/fgas/src/layout/fx_unicode.cpp @@ -5,7 +5,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/fgas/src/fgas_base.h" -#include "fx_unicode.h" +#include "xfa/src/fgas/src/layout/fx_unicode.h" void FX_TEXTLAYOUT_PieceSort(CFX_TPOArray& tpos, int32_t iStart, int32_t iEnd) { FXSYS_assert(iStart > -1 && iStart < tpos.GetSize()); FXSYS_assert(iEnd > -1 && iEnd < tpos.GetSize()); diff --git a/xfa/src/fgas/src/localization/fx_locale.cpp b/xfa/src/fgas/src/localization/fx_locale.cpp index 072d351a3a..13939f6433 100644 --- a/xfa/src/fgas/src/localization/fx_locale.cpp +++ b/xfa/src/fgas/src/localization/fx_locale.cpp @@ -8,7 +8,7 @@ #include "core/include/fxcrt/fx_xml.h" #include "xfa/src/fgas/src/fgas_base.h" -#include "fx_localeimp.h" +#include "xfa/src/fgas/src/localization/fx_localeimp.h" #define FX_LOCALECATEGORY_DateHash 0xbde9abde #define FX_LOCALECATEGORY_TimeHash 0x2d71b00f diff --git a/xfa/src/fgas/src/localization/fx_localemgr.cpp b/xfa/src/fgas/src/localization/fx_localemgr.cpp index b7362633c6..656be0a494 100644 --- a/xfa/src/fgas/src/localization/fx_localemgr.cpp +++ b/xfa/src/fgas/src/localization/fx_localemgr.cpp @@ -6,7 +6,7 @@ #include "core/include/fxcrt/fx_xml.h" #include "xfa/src/fgas/src/fgas_base.h" -#include "fx_localemgr.h" +#include "xfa/src/fgas/src/localization/fx_localemgr.h" IFX_LocaleMgr* FX_LocaleMgr_Create(const FX_WCHAR* pszLocalPath, FX_WORD wDefaultLCID) { diff --git a/xfa/src/fgas/src/xml/fx_sax_imp.cpp b/xfa/src/fgas/src/xml/fx_sax_imp.cpp index bb1602ca72..679df907f2 100644 --- a/xfa/src/fgas/src/xml/fx_sax_imp.cpp +++ b/xfa/src/fgas/src/xml/fx_sax_imp.cpp @@ -7,7 +7,7 @@ #include <algorithm> #include "xfa/src/fgas/src/fgas_base.h" -#include "fx_sax_imp.h" +#include "xfa/src/fgas/src/xml/fx_sax_imp.h" namespace { diff --git a/xfa/src/fxbarcode/BC_BufferedImageLuminanceSource.cpp b/xfa/src/fxbarcode/BC_BufferedImageLuminanceSource.cpp index 73eb6478c6..e11b1c1c82 100644 --- a/xfa/src/fxbarcode/BC_BufferedImageLuminanceSource.cpp +++ b/xfa/src/fxbarcode/BC_BufferedImageLuminanceSource.cpp @@ -20,9 +20,9 @@ * limitations under the License. */ -#include "barcode.h" -#include "BC_LuminanceSource.h" -#include "BC_BufferedImageLuminanceSource.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/BC_LuminanceSource.h" +#include "xfa/src/fxbarcode/BC_BufferedImageLuminanceSource.h" class CBC_Pause : public IFX_Pause { public: virtual FX_BOOL NeedToPauseNow() { return TRUE; } diff --git a/xfa/src/fxbarcode/BC_LuminanceSource.cpp b/xfa/src/fxbarcode/BC_LuminanceSource.cpp index 90586b2a1d..046bdcc4fc 100644 --- a/xfa/src/fxbarcode/BC_LuminanceSource.cpp +++ b/xfa/src/fxbarcode/BC_LuminanceSource.cpp @@ -20,8 +20,8 @@ * limitations under the License. */ -#include "barcode.h" -#include "BC_LuminanceSource.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/BC_LuminanceSource.h" CBC_LuminanceSource::CBC_LuminanceSource(int32_t width, int32_t height) : m_width(width), m_height(height) {} CBC_LuminanceSource::~CBC_LuminanceSource() {} diff --git a/xfa/src/fxbarcode/BC_Reader.cpp b/xfa/src/fxbarcode/BC_Reader.cpp index 868fafadf3..0f56137b42 100644 --- a/xfa/src/fxbarcode/BC_Reader.cpp +++ b/xfa/src/fxbarcode/BC_Reader.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "barcode.h" -#include "BC_Reader.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/BC_Reader.h" CBC_Reader::CBC_Reader() {} CBC_Reader::~CBC_Reader() {} diff --git a/xfa/src/fxbarcode/BC_ResultPoint.cpp b/xfa/src/fxbarcode/BC_ResultPoint.cpp index 57b6439bd0..47eb8aeb33 100644 --- a/xfa/src/fxbarcode/BC_ResultPoint.cpp +++ b/xfa/src/fxbarcode/BC_ResultPoint.cpp @@ -20,8 +20,8 @@ * limitations under the License. */ -#include "barcode.h" -#include "BC_ResultPoint.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/BC_ResultPoint.h" CBC_ResultPoint::CBC_ResultPoint(FX_FLOAT x, FX_FLOAT y) : m_x(x), m_y(y) {} FX_FLOAT CBC_ResultPoint::GetX() { return m_x; diff --git a/xfa/src/fxbarcode/BC_UtilCodingConvert.cpp b/xfa/src/fxbarcode/BC_UtilCodingConvert.cpp index 280d3a73b6..3dc08adbbf 100644 --- a/xfa/src/fxbarcode/BC_UtilCodingConvert.cpp +++ b/xfa/src/fxbarcode/BC_UtilCodingConvert.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "barcode.h" -#include "BC_UtilCodingConvert.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/BC_UtilCodingConvert.h" CBC_UtilCodingConvert::CBC_UtilCodingConvert() {} diff --git a/xfa/src/fxbarcode/BC_UtilRSS.cpp b/xfa/src/fxbarcode/BC_UtilRSS.cpp index fd74d5d7c5..d263074cc0 100644 --- a/xfa/src/fxbarcode/BC_UtilRSS.cpp +++ b/xfa/src/fxbarcode/BC_UtilRSS.cpp @@ -20,8 +20,8 @@ * limitations under the License. */ -#include "barcode.h" -#include "BC_UtilRSS.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/BC_UtilRSS.h" CBC_UtilRSS::CBC_UtilRSS() {} CBC_UtilRSS::~CBC_UtilRSS() {} CFX_Int32Array* CBC_UtilRSS::GetRssWidths(int32_t val, diff --git a/xfa/src/fxbarcode/BC_Utils.cpp b/xfa/src/fxbarcode/BC_Utils.cpp index 560340d4a6..ba1462d53f 100644 --- a/xfa/src/fxbarcode/BC_Utils.cpp +++ b/xfa/src/fxbarcode/BC_Utils.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "barcode.h" +#include "xfa/src/fxbarcode/barcode.h" FX_BOOL BC_FX_ByteString_Replace(CFX_ByteString& dst, FX_DWORD first, FX_DWORD last, diff --git a/xfa/src/fxbarcode/BC_Writer.cpp b/xfa/src/fxbarcode/BC_Writer.cpp index c23f9e2cef..7a279fa05c 100644 --- a/xfa/src/fxbarcode/BC_Writer.cpp +++ b/xfa/src/fxbarcode/BC_Writer.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "barcode.h" -#include "BC_Writer.h" +#include "xfa/src/fxbarcode/barcode.h" +#include "xfa/src/fxbarcode/BC_Writer.h" CBC_Writer::CBC_Writer() { m_CharEncoding = 0; m_ModuleHeight = 1; diff --git a/xfa/src/fxbarcode/barcode.h b/xfa/src/fxbarcode/barcode.h index 2228ca1ccb..f46ce86d00 100644 --- a/xfa/src/fxbarcode/barcode.h +++ b/xfa/src/fxbarcode/barcode.h @@ -10,6 +10,6 @@ #define XFA_SRC_FXBARCODE_BARCODE_H_ #include "xfa/src/foxitlib.h" -#include "utils.h" +#include "xfa/src/fxbarcode/utils.h" #endif // XFA_SRC_FXBARCODE_BARCODE_H_ diff --git a/xfa/src/fxbarcode/common/BC_CommonBitArray.cpp b/xfa/src/fxbarcode/common/BC_CommonBitArray.cpp index e9bb3b747a..7801746701 100644 --- a/xfa/src/fxbarcode/common/BC_CommonBitArray.cpp +++ b/xfa/src/fxbarcode/common/BC_CommonBitArray.cpp @@ -21,7 +21,7 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "BC_CommonBitArray.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitArray.h" CBC_CommonBitArray::CBC_CommonBitArray(CBC_CommonBitArray* array) { m_size = array->GetSize(); m_bits.Copy(array->GetBits()); diff --git a/xfa/src/fxbarcode/common/BC_CommonBitMatrix.cpp b/xfa/src/fxbarcode/common/BC_CommonBitMatrix.cpp index 42e07c3dee..aa4cb2c243 100644 --- a/xfa/src/fxbarcode/common/BC_CommonBitMatrix.cpp +++ b/xfa/src/fxbarcode/common/BC_CommonBitMatrix.cpp @@ -21,8 +21,8 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "BC_CommonBitArray.h" -#include "BC_CommonBitMatrix.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitArray.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" CBC_CommonBitMatrix::CBC_CommonBitMatrix() { m_width = 0; m_height = 0; diff --git a/xfa/src/fxbarcode/common/BC_CommonBitSource.cpp b/xfa/src/fxbarcode/common/BC_CommonBitSource.cpp index 7bf4bf61fd..19bfe3eab7 100644 --- a/xfa/src/fxbarcode/common/BC_CommonBitSource.cpp +++ b/xfa/src/fxbarcode/common/BC_CommonBitSource.cpp @@ -21,7 +21,7 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "BC_CommonBitSource.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitSource.h" CBC_CommonBitSource::CBC_CommonBitSource(CFX_ByteArray* bytes) { m_bytes.Copy((*bytes)); m_bitOffset = 0; diff --git a/xfa/src/fxbarcode/common/BC_CommonByteArray.cpp b/xfa/src/fxbarcode/common/BC_CommonByteArray.cpp index b3e2a636e5..7917dcc198 100644 --- a/xfa/src/fxbarcode/common/BC_CommonByteArray.cpp +++ b/xfa/src/fxbarcode/common/BC_CommonByteArray.cpp @@ -23,7 +23,7 @@ #include <algorithm> #include "xfa/src/fxbarcode/barcode.h" -#include "BC_CommonByteArray.h" +#include "xfa/src/fxbarcode/common/BC_CommonByteArray.h" CBC_CommonByteArray::CBC_CommonByteArray() { m_bytes = NULL; m_size = 0; diff --git a/xfa/src/fxbarcode/common/BC_CommonByteMatrix.cpp b/xfa/src/fxbarcode/common/BC_CommonByteMatrix.cpp index e075a5fab8..302dd99e55 100644 --- a/xfa/src/fxbarcode/common/BC_CommonByteMatrix.cpp +++ b/xfa/src/fxbarcode/common/BC_CommonByteMatrix.cpp @@ -21,7 +21,7 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "BC_CommonByteMatrix.h" +#include "xfa/src/fxbarcode/common/BC_CommonByteMatrix.h" CBC_CommonByteMatrix::CBC_CommonByteMatrix(int32_t width, int32_t height) { m_height = height; m_width = width; diff --git a/xfa/src/fxbarcode/common/BC_CommonCharacterSetECI.cpp b/xfa/src/fxbarcode/common/BC_CommonCharacterSetECI.cpp index 6bd7d70c49..af9b0bcb70 100644 --- a/xfa/src/fxbarcode/common/BC_CommonCharacterSetECI.cpp +++ b/xfa/src/fxbarcode/common/BC_CommonCharacterSetECI.cpp @@ -21,8 +21,8 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "BC_CommonECI.h" -#include "BC_CommonCharacterSetECI.h" +#include "xfa/src/fxbarcode/common/BC_CommonECI.h" +#include "xfa/src/fxbarcode/common/BC_CommonCharacterSetECI.h" void CBC_CommonCharacterSetECI::initialize() {} CBC_CommonCharacterSetECI::CBC_CommonCharacterSetECI( int32_t value, diff --git a/xfa/src/fxbarcode/common/BC_CommonDecoderResult.cpp b/xfa/src/fxbarcode/common/BC_CommonDecoderResult.cpp index 76219794df..4210cb8513 100644 --- a/xfa/src/fxbarcode/common/BC_CommonDecoderResult.cpp +++ b/xfa/src/fxbarcode/common/BC_CommonDecoderResult.cpp @@ -23,7 +23,7 @@ #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h" #include "xfa/src/fxbarcode/pdf417/BC_PDF417ResultMetadata.h" -#include "BC_CommonDecoderResult.h" +#include "xfa/src/fxbarcode/common/BC_CommonDecoderResult.h" CBC_CommonDecoderResult::CBC_CommonDecoderResult() {} void CBC_CommonDecoderResult::Init(const CFX_ByteArray& rawBytes, const CFX_ByteString& text, diff --git a/xfa/src/fxbarcode/common/BC_CommonECI.cpp b/xfa/src/fxbarcode/common/BC_CommonECI.cpp index c83980bb20..efb9e94657 100644 --- a/xfa/src/fxbarcode/common/BC_CommonECI.cpp +++ b/xfa/src/fxbarcode/common/BC_CommonECI.cpp @@ -21,8 +21,8 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "BC_CommonECI.h" -#include "BC_CommonCharacterSetECI.h" +#include "xfa/src/fxbarcode/common/BC_CommonECI.h" +#include "xfa/src/fxbarcode/common/BC_CommonCharacterSetECI.h" CBC_CommonECI::CBC_CommonECI(int32_t value) { m_value = value; } diff --git a/xfa/src/fxbarcode/common/BC_CommonPerspectiveTransform.cpp b/xfa/src/fxbarcode/common/BC_CommonPerspectiveTransform.cpp index e67041a50c..3f8bc44ae3 100644 --- a/xfa/src/fxbarcode/common/BC_CommonPerspectiveTransform.cpp +++ b/xfa/src/fxbarcode/common/BC_CommonPerspectiveTransform.cpp @@ -21,7 +21,7 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "BC_CommonPerspectiveTransform.h" +#include "xfa/src/fxbarcode/common/BC_CommonPerspectiveTransform.h" CBC_CommonPerspectiveTransform::CBC_CommonPerspectiveTransform(FX_FLOAT a11, FX_FLOAT a21, FX_FLOAT a31, diff --git a/xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.cpp b/xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.cpp index 42438978df..9f0d99a99d 100644 --- a/xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.cpp +++ b/xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.cpp @@ -23,9 +23,9 @@ #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/BC_Binarizer.h" #include "xfa/src/fxbarcode/BC_LuminanceSource.h" -#include "BC_CommonBitMatrix.h" -#include "BC_CommonBitArray.h" -#include "BC_GlobalHistogramBinarizer.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" +#include "xfa/src/fxbarcode/common/BC_CommonBitArray.h" +#include "xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.h" const int32_t LUMINANCE_BITS = 5; const int32_t LUMINANCE_SHIFT = 8 - LUMINANCE_BITS; const int32_t LUMINANCE_BUCKETS = 1 << LUMINANCE_BITS; diff --git a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.cpp b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.cpp index af526a7ead..f74b5ff331 100644 --- a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.cpp +++ b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.cpp @@ -21,9 +21,9 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "BC_ReedSolomonGF256.h" -#include "BC_ReedSolomonGF256Poly.h" -#include "BC_ReedSolomon.h" +#include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h" +#include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h" +#include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.h" CBC_ReedSolomonEncoder::CBC_ReedSolomonEncoder(CBC_ReedSolomonGF256* field) { m_field = field; } diff --git a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.cpp b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.cpp index b053f2a784..5bb30912d4 100644 --- a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.cpp +++ b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.cpp @@ -21,9 +21,9 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "BC_ReedSolomonGF256.h" -#include "BC_ReedSolomonGF256Poly.h" -#include "BC_ReedSolomonDecoder.h" +#include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h" +#include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h" +#include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.h" CBC_ReedSolomonDecoder::CBC_ReedSolomonDecoder(CBC_ReedSolomonGF256* field) { m_field = field; } diff --git a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.cpp b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.cpp index 97aa70d786..6c7bbf7dea 100644 --- a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.cpp +++ b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.cpp @@ -21,8 +21,8 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "BC_ReedSolomonGF256Poly.h" -#include "BC_ReedSolomonGF256.h" +#include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h" +#include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h" CBC_ReedSolomonGF256* CBC_ReedSolomonGF256::QRCodeFild = NULL; CBC_ReedSolomonGF256* CBC_ReedSolomonGF256::DataMatrixField = NULL; void CBC_ReedSolomonGF256::Initialize() { diff --git a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.cpp b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.cpp index b1eed008cf..f99cac81f5 100644 --- a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.cpp +++ b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.cpp @@ -21,8 +21,8 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "BC_ReedSolomonGF256.h" -#include "BC_ReedSolomonGF256Poly.h" +#include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h" +#include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h" CBC_ReedSolomonGF256Poly::CBC_ReedSolomonGF256Poly(CBC_ReedSolomonGF256* field, int32_t coefficients) { if (field == NULL) { diff --git a/xfa/src/fxbarcode/datamatrix/BC_ASCIIEncoder.cpp b/xfa/src/fxbarcode/datamatrix/BC_ASCIIEncoder.cpp index 307314038b..d2ae5f955f 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_ASCIIEncoder.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_ASCIIEncoder.cpp @@ -22,12 +22,12 @@ #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/BC_Dimension.h" -#include "BC_Encoder.h" -#include "BC_SymbolShapeHint.h" -#include "BC_SymbolInfo.h" -#include "BC_EncoderContext.h" -#include "BC_HighLevelEncoder.h" -#include "BC_ASCIIEncoder.h" +#include "xfa/src/fxbarcode/datamatrix/BC_Encoder.h" +#include "xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h" +#include "xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h" +#include "xfa/src/fxbarcode/datamatrix/BC_EncoderContext.h" +#include "xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.h" +#include "xfa/src/fxbarcode/datamatrix/BC_ASCIIEncoder.h" CBC_ASCIIEncoder::CBC_ASCIIEncoder() {} CBC_ASCIIEncoder::~CBC_ASCIIEncoder() {} int32_t CBC_ASCIIEncoder::getEncodingMode() { diff --git a/xfa/src/fxbarcode/datamatrix/BC_Base256Encoder.cpp b/xfa/src/fxbarcode/datamatrix/BC_Base256Encoder.cpp index 1b7b3f24d1..08d174d229 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_Base256Encoder.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_Base256Encoder.cpp @@ -22,12 +22,12 @@ #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/BC_Dimension.h" -#include "BC_Encoder.h" -#include "BC_SymbolShapeHint.h" -#include "BC_SymbolInfo.h" -#include "BC_EncoderContext.h" -#include "BC_HighLevelEncoder.h" -#include "BC_Base256Encoder.h" +#include "xfa/src/fxbarcode/datamatrix/BC_Encoder.h" +#include "xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h" +#include "xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h" +#include "xfa/src/fxbarcode/datamatrix/BC_EncoderContext.h" +#include "xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.h" +#include "xfa/src/fxbarcode/datamatrix/BC_Base256Encoder.h" CBC_Base256Encoder::CBC_Base256Encoder() {} CBC_Base256Encoder::~CBC_Base256Encoder() {} int32_t CBC_Base256Encoder::getEncodingMode() { diff --git a/xfa/src/fxbarcode/datamatrix/BC_C40Encoder.cpp b/xfa/src/fxbarcode/datamatrix/BC_C40Encoder.cpp index 05f33f1191..93851376d3 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_C40Encoder.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_C40Encoder.cpp @@ -23,12 +23,12 @@ #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/BC_Dimension.h" #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" -#include "BC_Encoder.h" -#include "BC_SymbolShapeHint.h" -#include "BC_SymbolInfo.h" -#include "BC_EncoderContext.h" -#include "BC_HighLevelEncoder.h" -#include "BC_C40Encoder.h" +#include "xfa/src/fxbarcode/datamatrix/BC_Encoder.h" +#include "xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h" +#include "xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h" +#include "xfa/src/fxbarcode/datamatrix/BC_EncoderContext.h" +#include "xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.h" +#include "xfa/src/fxbarcode/datamatrix/BC_C40Encoder.h" CBC_C40Encoder::CBC_C40Encoder() {} CBC_C40Encoder::~CBC_C40Encoder() {} int32_t CBC_C40Encoder::getEncodingMode() { diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.cpp index ac4803f785..0b5b430679 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.cpp @@ -22,8 +22,8 @@ #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" -#include "BC_DataMatrixVersion.h" -#include "BC_DataMatrixBitMatrixParser.h" +#include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.h" +#include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.h" CBC_DataMatrixBitMatrixParser::CBC_DataMatrixBitMatrixParser() { m_mappingBitMatrix = NULL; m_version = NULL; diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDataBlock.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDataBlock.cpp index 611a4509aa..e5c39fb929 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDataBlock.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDataBlock.cpp @@ -21,8 +21,8 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "BC_DataMatrixVersion.h" -#include "BC_DataMatrixDataBlock.h" +#include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.h" +#include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixDataBlock.h" CBC_DataMatrixDataBlock::~CBC_DataMatrixDataBlock() {} CBC_DataMatrixDataBlock::CBC_DataMatrixDataBlock(int32_t numDataCodewords, CFX_ByteArray* codewords) { diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.cpp index 22f81efc65..1838a03f1e 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.cpp @@ -23,7 +23,7 @@ #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/common/BC_CommonDecoderResult.h" #include "xfa/src/fxbarcode/common/BC_CommonBitSource.h" -#include "BC_DataMatrixDecodedBitStreamParser.h" +#include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.h" const FX_CHAR CBC_DataMatrixDecodedBitStreamParser::C40_BASIC_SET_CHARS[] = { '*', '*', '*', ' ', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecoder.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecoder.cpp index aa6ee72c29..b797e2f9f3 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecoder.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecoder.cpp @@ -24,11 +24,11 @@ #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" #include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.h" #include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h" -#include "BC_DataMatrixDecoder.h" -#include "BC_DataMatrixBitMatrixParser.h" -#include "BC_DataMatrixVersion.h" -#include "BC_DataMatrixDataBlock.h" -#include "BC_DataMatrixDecodedBitStreamParser.h" +#include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecoder.h" +#include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.h" +#include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.h" +#include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixDataBlock.h" +#include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.h" CBC_DataMatrixDecoder::CBC_DataMatrixDecoder() { m_rsDecoder = NULL; } diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.cpp index 9a769b05fe..f5adb06df4 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.cpp @@ -29,7 +29,7 @@ #include "xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.h" #include "xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.h" #include "xfa/src/fxbarcode/qrcode/BC_QRGridSampler.h" -#include "BC_DataMatrixDetector.h" +#include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.h" const int32_t CBC_DataMatrixDetector::INTEGERS[5] = {0, 1, 2, 3, 4}; CBC_DataMatrixDetector::CBC_DataMatrixDetector(CBC_CommonBitMatrix* image) : m_image(image), m_rectangleDetector(NULL) {} diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixReader.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixReader.cpp index cd772d0e83..75498f6bec 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixReader.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixReader.cpp @@ -25,9 +25,9 @@ #include "xfa/src/fxbarcode/BC_Reader.h" #include "xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.h" #include "xfa/src/fxbarcode/common/BC_CommonDecoderResult.h" -#include "BC_DataMatrixDecoder.h" -#include "BC_DataMatrixDetector.h" -#include "BC_DataMatrixReader.h" +#include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecoder.h" +#include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.h" +#include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixReader.h" CBC_DataMatrixReader::CBC_DataMatrixReader() { m_decoder = NULL; } diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.cpp index b06ebd2cb9..7348680be4 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.cpp @@ -21,10 +21,10 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "BC_Encoder.h" -#include "BC_SymbolShapeHint.h" -#include "BC_SymbolInfo.h" -#include "BC_DataMatrixSymbolInfo144.h" +#include "xfa/src/fxbarcode/datamatrix/BC_Encoder.h" +#include "xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h" +#include "xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h" +#include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.h" CBC_DataMatrixSymbolInfo144::CBC_DataMatrixSymbolInfo144() : CBC_SymbolInfo(FALSE, 1558, 620, 22, 22, 36) { m_rsBlockData = -1; diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.cpp index 117105e316..7994594c55 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.cpp @@ -21,7 +21,7 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "BC_DataMatrixVersion.h" +#include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.h" CFX_PtrArray* CBC_DataMatrixVersion::VERSIONS = NULL; void CBC_DataMatrixVersion::Initialize() { VERSIONS = new CFX_PtrArray(); diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp index 642537fbac..4b11a07742 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp @@ -28,21 +28,21 @@ #include "xfa/src/fxbarcode/BC_UtilCodingConvert.h" #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" #include "xfa/src/fxbarcode/common/BC_CommonByteMatrix.h" -#include "BC_Encoder.h" -#include "BC_DefaultPlacement.h" -#include "BC_SymbolShapeHint.h" -#include "BC_SymbolInfo.h" -#include "BC_DataMatrixSymbolInfo144.h" -#include "BC_ErrorCorrection.h" -#include "BC_EncoderContext.h" -#include "BC_C40Encoder.h" -#include "BC_TextEncoder.h" -#include "BC_X12Encoder.h" -#include "BC_EdifactEncoder.h" -#include "BC_Base256Encoder.h" -#include "BC_ASCIIEncoder.h" -#include "BC_HighLevelEncoder.h" -#include "BC_DataMatrixWriter.h" +#include "xfa/src/fxbarcode/datamatrix/BC_Encoder.h" +#include "xfa/src/fxbarcode/datamatrix/BC_DefaultPlacement.h" +#include "xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h" +#include "xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h" +#include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.h" +#include "xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.h" +#include "xfa/src/fxbarcode/datamatrix/BC_EncoderContext.h" +#include "xfa/src/fxbarcode/datamatrix/BC_C40Encoder.h" +#include "xfa/src/fxbarcode/datamatrix/BC_TextEncoder.h" +#include "xfa/src/fxbarcode/datamatrix/BC_X12Encoder.h" +#include "xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.h" +#include "xfa/src/fxbarcode/datamatrix/BC_Base256Encoder.h" +#include "xfa/src/fxbarcode/datamatrix/BC_ASCIIEncoder.h" +#include "xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.h" +#include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.h" CBC_DataMatrixWriter::CBC_DataMatrixWriter() {} CBC_DataMatrixWriter::~CBC_DataMatrixWriter() {} FX_BOOL CBC_DataMatrixWriter::SetErrorCorrectionLevel(int32_t level) { diff --git a/xfa/src/fxbarcode/datamatrix/BC_DefaultPlacement.cpp b/xfa/src/fxbarcode/datamatrix/BC_DefaultPlacement.cpp index 75432d110b..55437de91d 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_DefaultPlacement.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_DefaultPlacement.cpp @@ -21,8 +21,8 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "BC_Encoder.h" -#include "BC_DefaultPlacement.h" +#include "xfa/src/fxbarcode/datamatrix/BC_Encoder.h" +#include "xfa/src/fxbarcode/datamatrix/BC_DefaultPlacement.h" CBC_DefaultPlacement::CBC_DefaultPlacement(CFX_WideString codewords, int32_t numcols, int32_t numrows) { diff --git a/xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.cpp b/xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.cpp index 9a270bf4d9..1d0fc4ce50 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.cpp @@ -23,12 +23,12 @@ #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" #include "xfa/src/fxbarcode/BC_Dimension.h" -#include "BC_Encoder.h" -#include "BC_SymbolShapeHint.h" -#include "BC_SymbolInfo.h" -#include "BC_EncoderContext.h" -#include "BC_HighLevelEncoder.h" -#include "BC_EdifactEncoder.h" +#include "xfa/src/fxbarcode/datamatrix/BC_Encoder.h" +#include "xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h" +#include "xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h" +#include "xfa/src/fxbarcode/datamatrix/BC_EncoderContext.h" +#include "xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.h" +#include "xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.h" CBC_EdifactEncoder::CBC_EdifactEncoder() {} CBC_EdifactEncoder::~CBC_EdifactEncoder() {} int32_t CBC_EdifactEncoder::getEncodingMode() { diff --git a/xfa/src/fxbarcode/datamatrix/BC_Encoder.cpp b/xfa/src/fxbarcode/datamatrix/BC_Encoder.cpp index f79556ef2f..bb4d9492df 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_Encoder.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_Encoder.cpp @@ -5,6 +5,6 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/fxbarcode/barcode.h" -#include "BC_Encoder.h" +#include "xfa/src/fxbarcode/datamatrix/BC_Encoder.h" CBC_Encoder::CBC_Encoder() {} CBC_Encoder::~CBC_Encoder() {} diff --git a/xfa/src/fxbarcode/datamatrix/BC_EncoderContext.cpp b/xfa/src/fxbarcode/datamatrix/BC_EncoderContext.cpp index 237f902c92..6743e4387d 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_EncoderContext.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_EncoderContext.cpp @@ -24,10 +24,10 @@ #include "xfa/src/fxbarcode/BC_Dimension.h" #include "xfa/src/fxbarcode/BC_UtilCodingConvert.h" #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" -#include "BC_Encoder.h" -#include "BC_SymbolShapeHint.h" -#include "BC_SymbolInfo.h" -#include "BC_EncoderContext.h" +#include "xfa/src/fxbarcode/datamatrix/BC_Encoder.h" +#include "xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h" +#include "xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h" +#include "xfa/src/fxbarcode/datamatrix/BC_EncoderContext.h" CBC_EncoderContext::CBC_EncoderContext(const CFX_WideString msg, CFX_WideString ecLevel, int32_t& e) { diff --git a/xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.cpp b/xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.cpp index dc6a2ac451..7a83a2ac39 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.cpp @@ -21,10 +21,10 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "BC_Encoder.h" -#include "BC_SymbolShapeHint.h" -#include "BC_SymbolInfo.h" -#include "BC_ErrorCorrection.h" +#include "xfa/src/fxbarcode/datamatrix/BC_Encoder.h" +#include "xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h" +#include "xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h" +#include "xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.h" int32_t CBC_ErrorCorrection::FACTOR_SETS[] = {5, 7, 10, 11, 12, 14, 18, 20, 24, 28, 36, 42, 48, 56, 62, 68}; int32_t CBC_ErrorCorrection::FACTORS[][100] = { diff --git a/xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.cpp b/xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.cpp index 7d9ccd7724..7e1c2edc68 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.cpp @@ -24,17 +24,17 @@ #include "xfa/src/fxbarcode/BC_Dimension.h" #include "xfa/src/fxbarcode/BC_UtilCodingConvert.h" #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" -#include "BC_Encoder.h" -#include "BC_SymbolShapeHint.h" -#include "BC_SymbolInfo.h" -#include "BC_EncoderContext.h" -#include "BC_C40Encoder.h" -#include "BC_TextEncoder.h" -#include "BC_X12Encoder.h" -#include "BC_EdifactEncoder.h" -#include "BC_Base256Encoder.h" -#include "BC_ASCIIEncoder.h" -#include "BC_HighLevelEncoder.h" +#include "xfa/src/fxbarcode/datamatrix/BC_Encoder.h" +#include "xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h" +#include "xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h" +#include "xfa/src/fxbarcode/datamatrix/BC_EncoderContext.h" +#include "xfa/src/fxbarcode/datamatrix/BC_C40Encoder.h" +#include "xfa/src/fxbarcode/datamatrix/BC_TextEncoder.h" +#include "xfa/src/fxbarcode/datamatrix/BC_X12Encoder.h" +#include "xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.h" +#include "xfa/src/fxbarcode/datamatrix/BC_Base256Encoder.h" +#include "xfa/src/fxbarcode/datamatrix/BC_ASCIIEncoder.h" +#include "xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.h" #define Integer_MAX_VALUE 2147483647 FX_WCHAR CBC_HighLevelEncoder::LATCH_TO_C40 = 230; FX_WCHAR CBC_HighLevelEncoder::LATCH_TO_BASE256 = 231; diff --git a/xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.cpp b/xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.cpp index 482b83b5e1..8845225553 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.cpp @@ -23,10 +23,10 @@ #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/BC_Dimension.h" #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" -#include "BC_Encoder.h" -#include "BC_SymbolShapeHint.h" -#include "BC_SymbolInfo.h" -#include "BC_DataMatrixSymbolInfo144.h" +#include "xfa/src/fxbarcode/datamatrix/BC_Encoder.h" +#include "xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h" +#include "xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h" +#include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.h" #define SYMBOLS_COUNT 30 CBC_SymbolInfo* CBC_SymbolInfo::m_PROD_SYMBOLS[30] = { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, diff --git a/xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.cpp b/xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.cpp index 33645ff336..e5475a148a 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.cpp @@ -21,6 +21,6 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "BC_SymbolShapeHint.h" +#include "xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h" CBC_SymbolShapeHint::CBC_SymbolShapeHint() {} CBC_SymbolShapeHint::~CBC_SymbolShapeHint() {} diff --git a/xfa/src/fxbarcode/datamatrix/BC_TextEncoder.cpp b/xfa/src/fxbarcode/datamatrix/BC_TextEncoder.cpp index cecba137a6..1ed260d10b 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_TextEncoder.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_TextEncoder.cpp @@ -23,13 +23,13 @@ #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" #include "xfa/src/fxbarcode/BC_Dimension.h" -#include "BC_Encoder.h" -#include "BC_SymbolShapeHint.h" -#include "BC_SymbolInfo.h" -#include "BC_EncoderContext.h" -#include "BC_HighLevelEncoder.h" -#include "BC_C40Encoder.h" -#include "BC_TextEncoder.h" +#include "xfa/src/fxbarcode/datamatrix/BC_Encoder.h" +#include "xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h" +#include "xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h" +#include "xfa/src/fxbarcode/datamatrix/BC_EncoderContext.h" +#include "xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.h" +#include "xfa/src/fxbarcode/datamatrix/BC_C40Encoder.h" +#include "xfa/src/fxbarcode/datamatrix/BC_TextEncoder.h" CBC_TextEncoder::CBC_TextEncoder() {} CBC_TextEncoder::~CBC_TextEncoder() {} int32_t CBC_TextEncoder::getEncodingMode() { diff --git a/xfa/src/fxbarcode/datamatrix/BC_X12Encoder.cpp b/xfa/src/fxbarcode/datamatrix/BC_X12Encoder.cpp index 4c67ec0b72..91b917facf 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_X12Encoder.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_X12Encoder.cpp @@ -23,13 +23,13 @@ #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" #include "xfa/src/fxbarcode/BC_Dimension.h" -#include "BC_Encoder.h" -#include "BC_SymbolShapeHint.h" -#include "BC_SymbolInfo.h" -#include "BC_EncoderContext.h" -#include "BC_HighLevelEncoder.h" -#include "BC_C40Encoder.h" -#include "BC_X12Encoder.h" +#include "xfa/src/fxbarcode/datamatrix/BC_Encoder.h" +#include "xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h" +#include "xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h" +#include "xfa/src/fxbarcode/datamatrix/BC_EncoderContext.h" +#include "xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.h" +#include "xfa/src/fxbarcode/datamatrix/BC_C40Encoder.h" +#include "xfa/src/fxbarcode/datamatrix/BC_X12Encoder.h" CBC_X12Encoder::CBC_X12Encoder() {} CBC_X12Encoder::~CBC_X12Encoder() {} int32_t CBC_X12Encoder::getEncodingMode() { diff --git a/xfa/src/fxbarcode/oned/BC_OneDReader.cpp b/xfa/src/fxbarcode/oned/BC_OneDReader.cpp index 01f28f4f47..047506d337 100644 --- a/xfa/src/fxbarcode/oned/BC_OneDReader.cpp +++ b/xfa/src/fxbarcode/oned/BC_OneDReader.cpp @@ -26,7 +26,7 @@ #include "xfa/src/fxbarcode/BC_Reader.h" #include "xfa/src/fxbarcode/BC_BinaryBitmap.h" #include "xfa/src/fxbarcode/common/BC_CommonBitArray.h" -#include "BC_OneDReader.h" +#include "xfa/src/fxbarcode/oned/BC_OneDReader.h" const int32_t CBC_OneDReader::INTEGER_MATH_SHIFT = 8; const int32_t CBC_OneDReader::PATTERN_MATCH_RESULT_SCALE_FACTOR = 1 << 8; CBC_OneDReader::CBC_OneDReader() {} diff --git a/xfa/src/fxbarcode/oned/BC_OneDimReader.cpp b/xfa/src/fxbarcode/oned/BC_OneDimReader.cpp index e3c839b889..b11711a0ea 100644 --- a/xfa/src/fxbarcode/oned/BC_OneDimReader.cpp +++ b/xfa/src/fxbarcode/oned/BC_OneDimReader.cpp @@ -23,8 +23,8 @@ #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/BC_Reader.h" #include "xfa/src/fxbarcode/common/BC_CommonBitArray.h" -#include "BC_OneDReader.h" -#include "BC_OneDimReader.h" +#include "xfa/src/fxbarcode/oned/BC_OneDReader.h" +#include "xfa/src/fxbarcode/oned/BC_OneDimReader.h" const int32_t CBC_OneDimReader::MAX_AVG_VARIANCE = (int32_t)(256 * 0.48f); const int32_t CBC_OneDimReader::MAX_INDIVIDUAL_VARIANCE = (int32_t)(256 * 0.7f); const int32_t CBC_OneDimReader::START_END_PATTERN[3] = {1, 1, 1}; diff --git a/xfa/src/fxbarcode/oned/BC_OneDimWriter.cpp b/xfa/src/fxbarcode/oned/BC_OneDimWriter.cpp index acf82c6825..b7ad14d592 100644 --- a/xfa/src/fxbarcode/oned/BC_OneDimWriter.cpp +++ b/xfa/src/fxbarcode/oned/BC_OneDimWriter.cpp @@ -20,7 +20,7 @@ * limitations under the License. */ -#include "BC_OneDimWriter.h" +#include "xfa/src/fxbarcode/oned/BC_OneDimWriter.h" #include <algorithm> #include <memory> diff --git a/xfa/src/fxbarcode/oned/BC_OnedCodaBarWriter.cpp b/xfa/src/fxbarcode/oned/BC_OnedCodaBarWriter.cpp index 279561e9d7..187a9e8ab8 100644 --- a/xfa/src/fxbarcode/oned/BC_OnedCodaBarWriter.cpp +++ b/xfa/src/fxbarcode/oned/BC_OnedCodaBarWriter.cpp @@ -25,10 +25,10 @@ #include "xfa/src/fxbarcode/BC_Reader.h" #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" #include "xfa/src/fxbarcode/common/BC_CommonBitArray.h" -#include "BC_OneDReader.h" -#include "BC_OneDimWriter.h" -#include "BC_OnedCodaBarReader.h" -#include "BC_OnedCodaBarWriter.h" +#include "xfa/src/fxbarcode/oned/BC_OneDReader.h" +#include "xfa/src/fxbarcode/oned/BC_OneDimWriter.h" +#include "xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.h" +#include "xfa/src/fxbarcode/oned/BC_OnedCodaBarWriter.h" const FX_CHAR CBC_OnedCodaBarWriter::START_END_CHARS[] = { 'A', 'B', 'C', 'D', 'T', 'N', '*', 'E', 'a', 'b', 'c', 'd', 't', 'n', 'e'}; const FX_CHAR CBC_OnedCodaBarWriter::CONTENT_CHARS[] = { diff --git a/xfa/src/fxbarcode/oned/BC_OnedCode128Reader.cpp b/xfa/src/fxbarcode/oned/BC_OnedCode128Reader.cpp index b8cfb7be39..db2702968b 100644 --- a/xfa/src/fxbarcode/oned/BC_OnedCode128Reader.cpp +++ b/xfa/src/fxbarcode/oned/BC_OnedCode128Reader.cpp @@ -25,8 +25,8 @@ #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/BC_Reader.h" #include "xfa/src/fxbarcode/common/BC_CommonBitArray.h" -#include "BC_OneDReader.h" -#include "BC_OnedCode128Reader.h" +#include "xfa/src/fxbarcode/oned/BC_OneDReader.h" +#include "xfa/src/fxbarcode/oned/BC_OnedCode128Reader.h" const int32_t CBC_OnedCode128Reader::CODE_PATTERNS[107][7] = { {2, 1, 2, 2, 2, 2, 0}, {2, 2, 2, 1, 2, 2, 0}, {2, 2, 2, 2, 2, 1, 0}, {1, 2, 1, 2, 2, 3, 0}, {1, 2, 1, 3, 2, 2, 0}, {1, 3, 1, 2, 2, 2, 0}, diff --git a/xfa/src/fxbarcode/oned/BC_OnedCode128Writer.cpp b/xfa/src/fxbarcode/oned/BC_OnedCode128Writer.cpp index 0387977e61..cc923e6735 100644 --- a/xfa/src/fxbarcode/oned/BC_OnedCode128Writer.cpp +++ b/xfa/src/fxbarcode/oned/BC_OnedCode128Writer.cpp @@ -23,10 +23,10 @@ #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/BC_Writer.h" #include "xfa/src/fxbarcode/BC_Reader.h" -#include "BC_OneDReader.h" -#include "BC_OneDimWriter.h" -#include "BC_OnedCode128Reader.h" -#include "BC_OnedCode128Writer.h" +#include "xfa/src/fxbarcode/oned/BC_OneDReader.h" +#include "xfa/src/fxbarcode/oned/BC_OneDimWriter.h" +#include "xfa/src/fxbarcode/oned/BC_OnedCode128Reader.h" +#include "xfa/src/fxbarcode/oned/BC_OnedCode128Writer.h" const int32_t CBC_OnedCode128Writer::CODE_CODE_B = 100; const int32_t CBC_OnedCode128Writer::CODE_CODE_C = 99; const int32_t CBC_OnedCode128Writer::CODE_START_B = 104; diff --git a/xfa/src/fxbarcode/oned/BC_OnedCode39Reader.cpp b/xfa/src/fxbarcode/oned/BC_OnedCode39Reader.cpp index 9c1a264232..d171019f62 100644 --- a/xfa/src/fxbarcode/oned/BC_OnedCode39Reader.cpp +++ b/xfa/src/fxbarcode/oned/BC_OnedCode39Reader.cpp @@ -25,8 +25,8 @@ #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/BC_Reader.h" #include "xfa/src/fxbarcode/common/BC_CommonBitArray.h" -#include "BC_OneDReader.h" -#include "BC_OnedCode39Reader.h" +#include "xfa/src/fxbarcode/oned/BC_OneDReader.h" +#include "xfa/src/fxbarcode/oned/BC_OnedCode39Reader.h" const FX_CHAR* CBC_OnedCode39Reader::ALPHABET_STRING = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ-. *$/+%"; const FX_CHAR* CBC_OnedCode39Reader::CHECKSUM_STRING = diff --git a/xfa/src/fxbarcode/oned/BC_OnedCode39Writer.cpp b/xfa/src/fxbarcode/oned/BC_OnedCode39Writer.cpp index 297f2efc9f..10c2529337 100644 --- a/xfa/src/fxbarcode/oned/BC_OnedCode39Writer.cpp +++ b/xfa/src/fxbarcode/oned/BC_OnedCode39Writer.cpp @@ -24,10 +24,10 @@ #include "xfa/src/fxbarcode/BC_Writer.h" #include "xfa/src/fxbarcode/BC_Reader.h" #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" -#include "BC_OneDReader.h" -#include "BC_OneDimWriter.h" -#include "BC_OnedCode39Reader.h" -#include "BC_OnedCode39Writer.h" +#include "xfa/src/fxbarcode/oned/BC_OneDReader.h" +#include "xfa/src/fxbarcode/oned/BC_OneDimWriter.h" +#include "xfa/src/fxbarcode/oned/BC_OnedCode39Reader.h" +#include "xfa/src/fxbarcode/oned/BC_OnedCode39Writer.h" CBC_OnedCode39Writer::CBC_OnedCode39Writer() { m_extendedMode = FALSE; m_iWideNarrRatio = 3; diff --git a/xfa/src/fxbarcode/oned/BC_OnedEAN13Reader.cpp b/xfa/src/fxbarcode/oned/BC_OnedEAN13Reader.cpp index 6e0dc38ff5..0c94fb2b34 100644 --- a/xfa/src/fxbarcode/oned/BC_OnedEAN13Reader.cpp +++ b/xfa/src/fxbarcode/oned/BC_OnedEAN13Reader.cpp @@ -23,9 +23,9 @@ #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/BC_Reader.h" #include "xfa/src/fxbarcode/common/BC_CommonBitArray.h" -#include "BC_OneDReader.h" -#include "BC_OneDimReader.h" -#include "BC_OnedEAN13Reader.h" +#include "xfa/src/fxbarcode/oned/BC_OneDReader.h" +#include "xfa/src/fxbarcode/oned/BC_OneDimReader.h" +#include "xfa/src/fxbarcode/oned/BC_OnedEAN13Reader.h" const int32_t CBC_OnedEAN13Reader::FIRST_DIGIT_ENCODINGS[10] = { 0x00, 0x0B, 0x0D, 0xE, 0x13, 0x19, 0x1C, 0x15, 0x16, 0x1A}; CBC_OnedEAN13Reader::CBC_OnedEAN13Reader() {} diff --git a/xfa/src/fxbarcode/oned/BC_OnedEAN13Writer.cpp b/xfa/src/fxbarcode/oned/BC_OnedEAN13Writer.cpp index e9c92eaea4..62ffd7bc8e 100644 --- a/xfa/src/fxbarcode/oned/BC_OnedEAN13Writer.cpp +++ b/xfa/src/fxbarcode/oned/BC_OnedEAN13Writer.cpp @@ -23,11 +23,11 @@ #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/BC_Writer.h" #include "xfa/src/fxbarcode/BC_Reader.h" -#include "BC_OneDReader.h" -#include "BC_OneDimReader.h" -#include "BC_OneDimWriter.h" -#include "BC_OnedEAN13Reader.h" -#include "BC_OnedEAN13Writer.h" +#include "xfa/src/fxbarcode/oned/BC_OneDReader.h" +#include "xfa/src/fxbarcode/oned/BC_OneDimReader.h" +#include "xfa/src/fxbarcode/oned/BC_OneDimWriter.h" +#include "xfa/src/fxbarcode/oned/BC_OnedEAN13Reader.h" +#include "xfa/src/fxbarcode/oned/BC_OnedEAN13Writer.h" CBC_OnedEAN13Writer::CBC_OnedEAN13Writer() { m_bLeftPadding = TRUE; m_codeWidth = 3 + (7 * 6) + 5 + (7 * 6) + 3; diff --git a/xfa/src/fxbarcode/oned/BC_OnedEAN8Reader.cpp b/xfa/src/fxbarcode/oned/BC_OnedEAN8Reader.cpp index 42b46f245e..5dc1357f3a 100644 --- a/xfa/src/fxbarcode/oned/BC_OnedEAN8Reader.cpp +++ b/xfa/src/fxbarcode/oned/BC_OnedEAN8Reader.cpp @@ -23,9 +23,9 @@ #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/BC_Reader.h" #include "xfa/src/fxbarcode/common/BC_CommonBitArray.h" -#include "BC_OneDReader.h" -#include "BC_OneDimReader.h" -#include "BC_OnedEAN8Reader.h" +#include "xfa/src/fxbarcode/oned/BC_OneDReader.h" +#include "xfa/src/fxbarcode/oned/BC_OneDimReader.h" +#include "xfa/src/fxbarcode/oned/BC_OnedEAN8Reader.h" CBC_OnedEAN8Reader::CBC_OnedEAN8Reader() {} CBC_OnedEAN8Reader::~CBC_OnedEAN8Reader() {} int32_t CBC_OnedEAN8Reader::DecodeMiddle(CBC_CommonBitArray* row, diff --git a/xfa/src/fxbarcode/oned/BC_OnedEAN8Writer.cpp b/xfa/src/fxbarcode/oned/BC_OnedEAN8Writer.cpp index 2bc07d3764..d0aab2704d 100644 --- a/xfa/src/fxbarcode/oned/BC_OnedEAN8Writer.cpp +++ b/xfa/src/fxbarcode/oned/BC_OnedEAN8Writer.cpp @@ -24,10 +24,10 @@ #include "xfa/src/fxbarcode/BC_Writer.h" #include "xfa/src/fxbarcode/BC_Reader.h" #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" -#include "BC_OneDReader.h" -#include "BC_OneDimWriter.h" -#include "BC_OneDimReader.h" -#include "BC_OnedEAN8Writer.h" +#include "xfa/src/fxbarcode/oned/BC_OneDReader.h" +#include "xfa/src/fxbarcode/oned/BC_OneDimWriter.h" +#include "xfa/src/fxbarcode/oned/BC_OneDimReader.h" +#include "xfa/src/fxbarcode/oned/BC_OnedEAN8Writer.h" CBC_OnedEAN8Writer::CBC_OnedEAN8Writer() { m_iDataLenth = 8; m_codeWidth = 3 + (7 * 4) + 5 + (7 * 4) + 3; diff --git a/xfa/src/fxbarcode/oned/BC_OnedUPCAReader.cpp b/xfa/src/fxbarcode/oned/BC_OnedUPCAReader.cpp index b81273bb32..ac85853898 100644 --- a/xfa/src/fxbarcode/oned/BC_OnedUPCAReader.cpp +++ b/xfa/src/fxbarcode/oned/BC_OnedUPCAReader.cpp @@ -22,10 +22,10 @@ #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/BC_Reader.h" -#include "BC_OneDReader.h" -#include "BC_OneDimReader.h" -#include "BC_OnedEAN13Reader.h" -#include "BC_OnedUPCAReader.h" +#include "xfa/src/fxbarcode/oned/BC_OneDReader.h" +#include "xfa/src/fxbarcode/oned/BC_OneDimReader.h" +#include "xfa/src/fxbarcode/oned/BC_OnedEAN13Reader.h" +#include "xfa/src/fxbarcode/oned/BC_OnedUPCAReader.h" CBC_OnedUPCAReader::CBC_OnedUPCAReader() { m_ean13Reader = NULL; } diff --git a/xfa/src/fxbarcode/oned/BC_OnedUPCAWriter.cpp b/xfa/src/fxbarcode/oned/BC_OnedUPCAWriter.cpp index cad3f5de3f..bd18a95e7e 100644 --- a/xfa/src/fxbarcode/oned/BC_OnedUPCAWriter.cpp +++ b/xfa/src/fxbarcode/oned/BC_OnedUPCAWriter.cpp @@ -22,9 +22,9 @@ #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/BC_Writer.h" -#include "BC_OneDimWriter.h" -#include "BC_OnedEAN13Writer.h" -#include "BC_OnedUPCAWriter.h" +#include "xfa/src/fxbarcode/oned/BC_OneDimWriter.h" +#include "xfa/src/fxbarcode/oned/BC_OnedEAN13Writer.h" +#include "xfa/src/fxbarcode/oned/BC_OnedUPCAWriter.h" CBC_OnedUPCAWriter::CBC_OnedUPCAWriter() { m_subWriter = NULL; m_bLeftPadding = TRUE; diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417.cpp index f1d11785a1..c4e9463420 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417.cpp @@ -21,12 +21,12 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "BC_PDF417Compaction.h" -#include "BC_PDF417BarcodeRow.h" -#include "BC_PDF417BarcodeMatrix.h" -#include "BC_PDF417ErrorCorrection.h" -#include "BC_PDF417HighLevelEncoder.h" -#include "BC_PDF417.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417Compaction.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeRow.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417ErrorCorrection.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417.h" int32_t CBC_PDF417::START_PATTERN = 0x1fea8; int32_t CBC_PDF417::STOP_PATTERN = 0x3fa29; int32_t CBC_PDF417::CODEWORD_TABLE[][1000] = { diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.cpp index 137e335f38..76e8e18504 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.cpp @@ -21,8 +21,8 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "BC_PDF417BarcodeRow.h" -#include "BC_PDF417BarcodeMatrix.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeRow.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h" CBC_BarcodeMatrix::CBC_BarcodeMatrix(int32_t height, int32_t width) { m_matrix.SetSize(height + 2); for (int32_t i = 0, matrixLength = m_matrix.GetSize(); i < matrixLength; diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.cpp index 10fcf27f52..4b53e8c458 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.cpp @@ -21,7 +21,7 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "BC_PDF417BarcodeMetadata.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.h" CBC_BarcodeMetadata::CBC_BarcodeMetadata(int32_t columnCount, int32_t rowCountUpperPart, int32_t rowCountLowerPart, diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeRow.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeRow.cpp index c5e95e6695..0fcbb9c836 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeRow.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeRow.cpp @@ -21,7 +21,7 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "BC_PDF417BarcodeRow.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeRow.h" CBC_BarcodeRow::CBC_BarcodeRow(int32_t width) { m_row.SetSize(width); m_currentLocation = 0; diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.cpp index 8bb5b25750..4d9ea60a18 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.cpp @@ -21,8 +21,8 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "BC_PDF417Common.h" -#include "BC_PDF417BarcodeValue.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417Common.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.h" CBC_BarcodeValue::CBC_BarcodeValue() {} CBC_BarcodeValue::~CBC_BarcodeValue() {} void CBC_BarcodeValue::setValue(int32_t value) { diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.cpp index 73fa1327ef..1a999bbae4 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.cpp @@ -23,7 +23,7 @@ #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/BC_ResultPoint.h" #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" -#include "BC_PDF417BoundingBox.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.h" CBC_BoundingBox::CBC_BoundingBox(CBC_CommonBitMatrix* image, CBC_ResultPoint* topLeft, CBC_ResultPoint* bottomLeft, diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.cpp index 92b413f6d6..cd6787554e 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.cpp @@ -21,7 +21,7 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "BC_PDF417Codeword.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.h" int32_t CBC_Codeword::BARCODE_ROW_UNKNOWN = -1; CBC_Codeword::CBC_Codeword(int32_t startX, int32_t endX, diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.cpp index 821cf07825..d8adabbf58 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.cpp @@ -21,8 +21,8 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "BC_PDF417Common.h" -#include "BC_PDF417CodewordDecoder.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417Common.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.h" #define SYMBOL_TABLE_Length 2787 #define Float_MAX_VALUE 2147483647 FX_FLOAT CBC_PDF417CodewordDecoder::RATIOS_TABLE[2787][8] = {{0}}; diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417Common.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417Common.cpp index 62eaa7c25b..074325ec51 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417Common.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Common.cpp @@ -21,7 +21,7 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "BC_PDF417Common.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417Common.h" int32_t CBC_PDF417Common::NUMBER_OF_CODEWORDS = 929; int32_t CBC_PDF417Common::MAX_CODEWORDS_IN_BARCODE = NUMBER_OF_CODEWORDS - 1; int32_t CBC_PDF417Common::MIN_ROWS_IN_BARCODE = 3; diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417Compaction.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417Compaction.cpp index 2b61b0de32..22481c4d05 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417Compaction.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Compaction.cpp @@ -21,6 +21,6 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "BC_PDF417Compaction.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417Compaction.h" CBC_Compaction::CBC_Compaction() {} CBC_Compaction::~CBC_Compaction() {} diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.cpp index 4a3e2447f4..27d483be85 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.cpp @@ -20,14 +20,14 @@ * limitations under the License. */ -#include "BC_PDF417DecodedBitStreamParser.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h" #include <stdlib.h> #include "xfa/src/fxbarcode/BC_DecoderResult.h" #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/common/BC_CommonDecoderResult.h" -#include "BC_PDF417ResultMetadata.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417ResultMetadata.h" #include "third_party/bigint/BigIntegerLibrary.hh" #define TEXT_COMPACTION_MODE_LATCH 900 diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.cpp index ecb5f75134..bd92a06007 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.cpp @@ -21,13 +21,13 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "BC_PDF417Codeword.h" -#include "BC_PDF417BarcodeMetadata.h" -#include "BC_PDF417BoundingBox.h" -#include "BC_PDF417DetectionResultColumn.h" -#include "BC_PDF417Common.h" -#include "BC_PDF417DetectionResultRowIndicatorColumn.h" -#include "BC_PDF417DetectionResult.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417Common.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.h" int32_t CBC_DetectionResult::ADJUST_ROW_NUMBER_SKIP = 2; CBC_DetectionResult::CBC_DetectionResult(CBC_BarcodeMetadata* barcodeMetadata, CBC_BoundingBox* boundingBox) { diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.cpp index 53bdfbed9b..b03ef7d39e 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.cpp @@ -21,9 +21,9 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "BC_PDF417Codeword.h" -#include "BC_PDF417BoundingBox.h" -#include "BC_PDF417DetectionResultColumn.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.h" int32_t CBC_DetectionResultColumn::MAX_NEARBY_DISTANCE = 5; CBC_DetectionResultColumn::CBC_DetectionResultColumn( CBC_BoundingBox* boundingBox) { diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.cpp index 4f681d1e7d..ad3bd8e216 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.cpp @@ -22,13 +22,13 @@ #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/BC_ResultPoint.h" -#include "BC_PDF417BarcodeMetadata.h" -#include "BC_PDF417BoundingBox.h" -#include "BC_PDF417Codeword.h" -#include "BC_PDF417BarcodeValue.h" -#include "BC_PDF417Common.h" -#include "BC_PDF417DetectionResultColumn.h" -#include "BC_PDF417DetectionResultRowIndicatorColumn.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417Common.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.h" CBC_DetectionResultRowIndicatorColumn::CBC_DetectionResultRowIndicatorColumn( CBC_BoundingBox* boundingBox, FX_BOOL isLeft) diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417Detector.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417Detector.cpp index 4ad85ca479..40f00b42ee 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417Detector.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Detector.cpp @@ -25,8 +25,8 @@ #include "xfa/src/fxbarcode/BC_BinaryBitmap.h" #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" #include "xfa/src/fxbarcode/common/BC_CommonBitArray.h" -#include "BC_PDF417DetectorResult.h" -#include "BC_PDF417Detector.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417Detector.h" #define INTERGER_MAX 2147483647 int32_t CBC_Detector::INDEXES_START_PATTERN[] = {0, 4, 1, 5}; int32_t CBC_Detector::INDEXES_STOP_PATTERN[] = {6, 2, 7, 3}; diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.cpp index 7fe76e70be..7b1329e5ac 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.cpp @@ -23,7 +23,7 @@ #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" #include "xfa/src/fxbarcode/BC_ResultPoint.h" -#include "BC_PDF417DetectorResult.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.h" CBC_PDF417DetectorResult::CBC_PDF417DetectorResult(CBC_CommonBitMatrix* bits, CFX_PtrArray* points) { m_bits = bits; diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417Dimensions.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417Dimensions.cpp index 7bd5c2d2f2..d0d7fab8da 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417Dimensions.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Dimensions.cpp @@ -21,7 +21,7 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "BC_PDF417Dimensions.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417Dimensions.h" CBC_Dimensions::CBC_Dimensions(int32_t minCols, int32_t maxCols, int32_t minRows, diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.cpp index cf02449701..b814f32dca 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.cpp @@ -21,10 +21,10 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "BC_PDF417Common.h" -#include "BC_PDF417ECModulusPoly.h" -#include "BC_PDF417ECModulusGF.h" -#include "BC_PDF417ECErrorCorrection.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417Common.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.h" CBC_PDF417ECModulusGF* CBC_PDF417ECErrorCorrection::m_field = NULL; void CBC_PDF417ECErrorCorrection::Initialize(int32_t& e) { m_field = diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.cpp index 8f6a8cacc4..b0b3cb69e8 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.cpp @@ -21,9 +21,9 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "BC_PDF417Common.h" -#include "BC_PDF417ECModulusPoly.h" -#include "BC_PDF417ECModulusGF.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417Common.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.h" CBC_PDF417ECModulusGF* CBC_PDF417ECModulusGF::PDF417_GF = NULL; void CBC_PDF417ECModulusGF::Initialize(int32_t& e) { PDF417_GF = diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.cpp index 710b0c703d..aad247a615 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.cpp @@ -21,9 +21,9 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "BC_PDF417Common.h" -#include "BC_PDF417ECModulusGF.h" -#include "BC_PDF417ECModulusPoly.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417Common.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.h" CBC_PDF417ECModulusPoly::CBC_PDF417ECModulusPoly(CBC_PDF417ECModulusGF* field, CFX_Int32Array& coefficients, int32_t& e) { diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417ErrorCorrection.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417ErrorCorrection.cpp index 47fa4976d6..920860bb42 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417ErrorCorrection.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ErrorCorrection.cpp @@ -21,7 +21,7 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "BC_PDF417ErrorCorrection.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417ErrorCorrection.h" int32_t CBC_PDF417ErrorCorrection::EC_COEFFICIENTS[][2500] = { {27, 917}, {522, 568, 723, 809}, diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.cpp index 4025c26bb5..52b1f8a84c 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.cpp @@ -20,11 +20,11 @@ * limitations under the License. */ -#include "BC_PDF417HighLevelEncoder.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h" #include "xfa/src/fxbarcode/BC_UtilCodingConvert.h" #include "xfa/src/fxbarcode/barcode.h" -#include "BC_PDF417Compaction.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417Compaction.h" #include "third_party/bigint/BigIntegerLibrary.hh" #define SUBMODE_ALPHA 0 diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder_unittest.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder_unittest.cpp index 4e0f3c962b..57a12e222d 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder_unittest.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder_unittest.cpp @@ -5,7 +5,7 @@ #include "testing/gtest/include/gtest/gtest.h" #include "core/include/fxcrt/fx_basic.h" #include "testing/fx_string_testhelpers.h" -#include "BC_PDF417HighLevelEncoder.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h" TEST(PDF417HighLevelEncoder, EncodeHighLevel) { // TODO(tsepez): implement test cases. diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417Reader.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417Reader.cpp index 23595fbe03..556e6e1db8 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417Reader.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Reader.cpp @@ -30,26 +30,26 @@ #include "xfa/src/fxbarcode/common/BC_CommonBitArray.h" #include "xfa/src/fxbarcode/common/BC_CommonDecoderResult.h" #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" -#include "BC_PDF417DetectorResult.h" -#include "BC_PDF417Detector.h" -#include "BC_PDF417DetectorResult.h" -#include "BC_PDF417Codeword.h" -#include "BC_PDF417Common.h" -#include "BC_PDF417BarcodeValue.h" -#include "BC_PDF417BarcodeMetadata.h" -#include "BC_PDF417BoundingBox.h" -#include "BC_PDF417DetectionResultColumn.h" -#include "BC_PDF417DetectionResultRowIndicatorColumn.h" -#include "BC_PDF417DetectionResult.h" -#include "BC_PDF417DecodedBitStreamParser.h" -#include "BC_PDF417CodewordDecoder.h" -#include "BC_PDF417DecodedBitStreamParser.h" -#include "BC_PDF417ECModulusPoly.h" -#include "BC_PDF417ECModulusGF.h" -#include "BC_PDF417ECErrorCorrection.h" -#include "BC_PDF417DecodedBitStreamParser.h" -#include "BC_PDF417ScanningDecoder.h" -#include "BC_PDF417Reader.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417Detector.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417Common.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417ScanningDecoder.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417Reader.h" #define Integer_MAX_VALUE 2147483647 CBC_PDF417Reader::CBC_PDF417Reader() {} CBC_PDF417Reader::~CBC_PDF417Reader() {} diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417ResultMetadata.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417ResultMetadata.cpp index 5230f0b505..09fbcef2e3 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417ResultMetadata.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ResultMetadata.cpp @@ -21,7 +21,7 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "BC_PDF417ResultMetadata.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417ResultMetadata.h" CBC_PDF417ResultMetadata::CBC_PDF417ResultMetadata() {} CBC_PDF417ResultMetadata::~CBC_PDF417ResultMetadata() {} int32_t CBC_PDF417ResultMetadata::getSegmentIndex() { diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417ScanningDecoder.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417ScanningDecoder.cpp index 89b2d2865a..9ef37e6a14 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417ScanningDecoder.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ScanningDecoder.cpp @@ -24,22 +24,22 @@ #include "xfa/src/fxbarcode/BC_DecoderResult.h" #include "xfa/src/fxbarcode/BC_ResultPoint.h" #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" -#include "BC_PDF417Codeword.h" -#include "BC_PDF417Common.h" -#include "BC_PDF417BarcodeValue.h" -#include "BC_PDF417BarcodeMetadata.h" -#include "BC_PDF417BoundingBox.h" -#include "BC_PDF417DetectionResultColumn.h" -#include "BC_PDF417DetectionResultRowIndicatorColumn.h" -#include "BC_PDF417DetectionResult.h" -#include "BC_PDF417DecodedBitStreamParser.h" -#include "BC_PDF417CodewordDecoder.h" -#include "BC_PDF417DecodedBitStreamParser.h" -#include "BC_PDF417ECModulusPoly.h" -#include "BC_PDF417ECModulusGF.h" -#include "BC_PDF417ECErrorCorrection.h" -#include "BC_PDF417DecodedBitStreamParser.h" -#include "BC_PDF417ScanningDecoder.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417Common.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417ScanningDecoder.h" int32_t CBC_PDF417ScanningDecoder::CODEWORD_SKEW_SIZE = 2; int32_t CBC_PDF417ScanningDecoder::MAX_ERRORS = 3; int32_t CBC_PDF417ScanningDecoder::MAX_EC_CODEWORDS = 512; diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417Writer.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417Writer.cpp index 3a921dae83..b832c8a7c2 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417Writer.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Writer.cpp @@ -24,10 +24,10 @@ #include "xfa/src/fxbarcode/BC_TwoDimWriter.h" #include "xfa/src/fxbarcode/common/BC_CommonBitArray.h" #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" -#include "BC_PDF417Compaction.h" -#include "BC_PDF417.h" -#include "BC_PDF417BarcodeMatrix.h" -#include "BC_PDF417Writer.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417Compaction.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h" +#include "xfa/src/fxbarcode/pdf417/BC_PDF417Writer.h" CBC_PDF417Writer::CBC_PDF417Writer() { m_bFixedSize = FALSE; } diff --git a/xfa/src/fxbarcode/qrcode/BC_FinderPatternInfo.cpp b/xfa/src/fxbarcode/qrcode/BC_FinderPatternInfo.cpp index 0142458b99..680806eafb 100644 --- a/xfa/src/fxbarcode/qrcode/BC_FinderPatternInfo.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_FinderPatternInfo.cpp @@ -22,8 +22,8 @@ #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/BC_ResultPoint.h" -#include "BC_QRFinderPattern.h" -#include "BC_FinderPatternInfo.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRFinderPattern.h" +#include "xfa/src/fxbarcode/qrcode/BC_FinderPatternInfo.h" CBC_QRFinderPatternInfo::CBC_QRFinderPatternInfo(CFX_PtrArray* patternCenters) { m_bottomLeft = (CBC_QRFinderPattern*)(*patternCenters)[0]; m_topLeft = (CBC_QRFinderPattern*)(*patternCenters)[1]; diff --git a/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPattern.cpp b/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPattern.cpp index 960bdad64a..47e3197f76 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPattern.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPattern.cpp @@ -22,7 +22,7 @@ #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/BC_ResultPoint.h" -#include "BC_QRAlignmentPattern.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRAlignmentPattern.h" CBC_QRAlignmentPattern::CBC_QRAlignmentPattern(FX_FLOAT posX, FX_FLOAT posY, FX_FLOAT estimateModuleSize) diff --git a/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.cpp b/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.cpp index 396f272f3f..4e88215a58 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.cpp @@ -23,8 +23,8 @@ #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/BC_ResultPoint.h" #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" -#include "BC_QRAlignmentPattern.h" -#include "BC_QRAlignmentPatternFinder.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRAlignmentPattern.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.h" CBC_QRAlignmentPatternFinder::CBC_QRAlignmentPatternFinder( CBC_CommonBitMatrix* image, int32_t startX, diff --git a/xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.cpp b/xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.cpp index 339c5ab77c..db4f243fee 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.cpp @@ -22,10 +22,10 @@ #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" -#include "BC_QRCoderVersion.h" -#include "BC_QRCoderFormatInformation.h" -#include "BC_QRDataMask.h" -#include "BC_QRBitMatrixParser.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRDataMask.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.h" CBC_QRBitMatrixParser::CBC_QRBitMatrixParser() {} void CBC_QRBitMatrixParser::Init(CBC_CommonBitMatrix* bitMatrix, int32_t& e) { m_dimension = bitMatrix->GetDimension(e); diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCodeReader.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCodeReader.cpp index a09ac1e892..d5effa0b66 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCodeReader.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRCodeReader.cpp @@ -30,16 +30,16 @@ #include "xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.h" #include "xfa/src/fxbarcode/common/BC_CommonDecoderResult.h" #include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h" -#include "BC_QRCodeReader.h" -#include "BC_QRCodeReader.h" -#include "BC_QRCoderMode.h" -#include "BC_QRCoderDecoder.h" -#include "BC_QRDetector.h" -#include "BC_QRDetectorResult.h" -#include "BC_QRCoderErrorCorrectionLevel.h" -#include "BC_QRDataMask.h" -#include "BC_QRCodeReader.h" -#include "BC_QRCoderVersion.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCodeReader.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCodeReader.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderMode.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderDecoder.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRDetector.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRDataMask.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCodeReader.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.h" CBC_QRCodeReader::CBC_QRCodeReader() : m_decoder(NULL) {} void CBC_QRCodeReader::Init() { m_decoder = new CBC_QRCoderDecoder; diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.cpp index 39f9884d45..0506b4fb97 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.cpp @@ -24,11 +24,11 @@ #include "xfa/src/fxbarcode/BC_TwoDimWriter.h" #include "xfa/src/fxbarcode/BC_Reader.h" #include "xfa/src/fxbarcode/common/BC_CommonByteMatrix.h" -#include "BC_QRCodeWriter.h" -#include "BC_QRCoderEncoder.h" -#include "BC_QRCoder.h" -#include "BC_QRCodeReader.h" -#include "BC_QRCoderErrorCorrectionLevel.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoder.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCodeReader.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h" CBC_QRCodeWriter::CBC_QRCodeWriter() { m_bFixedSize = TRUE; m_iCorrectLevel = 1; diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoder.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoder.cpp index 9db8267280..fdc7a4e064 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCoder.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRCoder.cpp @@ -22,9 +22,9 @@ #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/common/BC_CommonByteMatrix.h" -#include "BC_QRCoderErrorCorrectionLevel.h" -#include "BC_QRCoderMode.h" -#include "BC_QRCoder.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderMode.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoder.h" CBC_QRCoder::CBC_QRCoder() { m_mode = NULL; m_ecLevel = NULL; diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.cpp index 605aacc79a..cfd50d135e 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.cpp @@ -21,7 +21,7 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "BC_QRCoderBitVector.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.h" CBC_QRCoderBitVector::CBC_QRCoderBitVector() { m_sizeInBits = 0; m_size = 32; diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderBlockPair.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderBlockPair.cpp index 59c1a637f3..ac20c03a6c 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCoderBlockPair.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderBlockPair.cpp @@ -22,7 +22,7 @@ #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/common/BC_CommonByteArray.h" -#include "BC_QRCoderBlockPair.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderBlockPair.h" CBC_QRCoderBlockPair::CBC_QRCoderBlockPair( CBC_CommonByteArray* data, CBC_CommonByteArray* errorCorrection) { diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderDecoder.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderDecoder.cpp index 81bd220389..676f7e4971 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCoderDecoder.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderDecoder.cpp @@ -25,12 +25,12 @@ #include "xfa/src/fxbarcode/common/BC_CommonDecoderResult.h" #include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.h" #include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h" -#include "BC_QRBitMatrixParser.h" -#include "BC_QRDataBlock.h" -#include "BC_QRDecodedBitStreamParser.h" -#include "BC_QRCoderVersion.h" -#include "BC_QRCoderFormatInformation.h" -#include "BC_QRCoderDecoder.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRDataBlock.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderDecoder.h" CBC_QRCoderDecoder::CBC_QRCoderDecoder() { m_rsDecoder = NULL; } diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderECB.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderECB.cpp index b3fc1f78ff..91e2ba7fa4 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCoderECB.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderECB.cpp @@ -21,7 +21,7 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "BC_QRCoderECB.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderECB.h" CBC_QRCoderECB::CBC_QRCoderECB(int32_t count, int32_t dataCodeWords) { m_dataCodeWords = dataCodeWords; m_count = count; diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderECBlocks.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderECBlocks.cpp index 0b2a2a6c28..c63ee63c5a 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCoderECBlocks.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderECBlocks.cpp @@ -21,8 +21,8 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "BC_QRCoderECB.h" -#include "BC_QRCoderECBlocks.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderECB.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderECBlocks.h" CBC_QRCoderECBlocks::CBC_QRCoderECBlocks(int32_t ecCodeWordsPerBlock, CBC_QRCoderECB* ecBlocks) { m_ecCodeWordsPerBlock = ecCodeWordsPerBlock; diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.cpp index bb496cb0e5..74ce5316a1 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.cpp @@ -28,16 +28,16 @@ #include "xfa/src/fxbarcode/common/BC_CommonByteMatrix.h" #include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.h" #include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h" -#include "BC_QRCoder.h" -#include "BC_QRCoderEncoder.h" -#include "BC_QRCoderMode.h" -#include "BC_QRCoderEncoder.h" -#include "BC_QRCoderECBlocks.h" -#include "BC_QRCoderVersion.h" -#include "BC_QRCoderBlockPair.h" -#include "BC_QRCoderMaskUtil.h" -#include "BC_QRCoderMatrixUtil.h" -#include "BC_QRCoderBitVector.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoder.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderMode.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderECBlocks.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderBlockPair.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderMaskUtil.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderMatrixUtil.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.h" const int32_t CBC_QRCoderEncoder::m_alphaNumbericTable[] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.cpp index 879351c40a..8d3f567cec 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.cpp @@ -21,7 +21,7 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "BC_QRCoderErrorCorrectionLevel.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h" CBC_QRCoderErrorCorrectionLevel* CBC_QRCoderErrorCorrectionLevel::L = NULL; CBC_QRCoderErrorCorrectionLevel* CBC_QRCoderErrorCorrectionLevel::M = NULL; CBC_QRCoderErrorCorrectionLevel* CBC_QRCoderErrorCorrectionLevel::Q = NULL; diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.cpp index 729f351f3d..b4d21e3a2d 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.cpp @@ -21,8 +21,8 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "BC_QRCoderErrorCorrectionLevel.h" -#include "BC_QRCoderFormatInformation.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.h" const int32_t CBC_QRCoderFormatInformation::FORMAT_INFO_MASK_QR = 0X5412; const int32_t CBC_QRCoderFormatInformation::FORMAT_INFO_DECODE_LOOKUP[32][2] = { {0x5412, 0x00}, {0x5125, 0x01}, {0x5E7C, 0x02}, {0x5B4B, 0x03}, diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderMaskUtil.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderMaskUtil.cpp index 8c4538a300..de2d428596 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCoderMaskUtil.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderMaskUtil.cpp @@ -22,9 +22,9 @@ #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/common/BC_CommonByteMatrix.h" -#include "BC_QRCoderErrorCorrectionLevel.h" -#include "BC_QRCoder.h" -#include "BC_QRCoderMaskUtil.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoder.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderMaskUtil.h" CBC_QRCoderMaskUtil::CBC_QRCoderMaskUtil() {} CBC_QRCoderMaskUtil::~CBC_QRCoderMaskUtil() {} int32_t CBC_QRCoderMaskUtil::ApplyMaskPenaltyRule1( diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderMatrixUtil.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderMatrixUtil.cpp index fd4d4b84ff..5bf02b9573 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCoderMatrixUtil.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderMatrixUtil.cpp @@ -22,11 +22,11 @@ #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/common/BC_CommonByteMatrix.h" -#include "BC_QRCoderErrorCorrectionLevel.h" -#include "BC_QRCoder.h" -#include "BC_QRCoderMaskUtil.h" -#include "BC_QRCoderMatrixUtil.h" -#include "BC_QRCoderBitVector.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoder.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderMaskUtil.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderMatrixUtil.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.h" const int32_t CBC_QRCoderMatrixUtil::POSITION_DETECTION_PATTERN[7][7] = { {1, 1, 1, 1, 1, 1, 1}, {1, 0, 0, 0, 0, 0, 1}, diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderMode.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderMode.cpp index 738193a2b5..3e24c72cd1 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCoderMode.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderMode.cpp @@ -21,8 +21,8 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "BC_QRCoderVersion.h" -#include "BC_QRCoderMode.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderMode.h" CBC_QRCoderMode* CBC_QRCoderMode::sBYTE = NULL; CBC_QRCoderMode* CBC_QRCoderMode::sNUMERIC = NULL; CBC_QRCoderMode* CBC_QRCoderMode::sALPHANUMERIC = NULL; diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.cpp index 1798db760a..06686a918b 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.cpp @@ -23,12 +23,12 @@ #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/utils.h" #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" -#include "BC_QRCoderECB.h" -#include "BC_QRCoderFormatInformation.h" -#include "BC_QRCoderErrorCorrectionLevel.h" -#include "BC_QRCoderBitVector.h" -#include "BC_QRCoderECBlocks.h" -#include "BC_QRCoderVersion.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderECB.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderECBlocks.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.h" const int32_t CBC_QRCoderVersion::VERSION_DECODE_INFO[] = { 0x07C94, 0x085BC, 0x09A99, 0x0A4D3, 0x0BBF6, 0x0C762, 0x0D847, 0x0E60D, 0x0F928, 0x10B78, 0x1145D, 0x12A17, 0x13532, 0x149A6, diff --git a/xfa/src/fxbarcode/qrcode/BC_QRDataBlock.cpp b/xfa/src/fxbarcode/qrcode/BC_QRDataBlock.cpp index cf85c33d5d..4fca780590 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRDataBlock.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRDataBlock.cpp @@ -21,10 +21,10 @@ */ #include "xfa/src/fxbarcode/barcode.h" -#include "BC_QRCoderECBlocks.h" -#include "BC_QRCoderECB.h" -#include "BC_QRDataBlock.h" -#include "BC_QRCoderVersion.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderECBlocks.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderECB.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRDataBlock.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.h" CBC_QRDataBlock::CBC_QRDataBlock(int32_t numDataCodewords, CFX_ByteArray* codewords) : m_numDataCodewords(numDataCodewords), m_codewords(codewords) {} diff --git a/xfa/src/fxbarcode/qrcode/BC_QRDataMask.cpp b/xfa/src/fxbarcode/qrcode/BC_QRDataMask.cpp index 846374e3b3..dc4fddbbea 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRDataMask.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRDataMask.cpp @@ -22,7 +22,7 @@ #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" -#include "BC_QRDataMask.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRDataMask.h" static int32_t N_DATA_MASKS = 0; CFX_PtrArray* CBC_QRDataMask::DATA_MASKS = NULL; void CBC_QRDataMask::Initialize() { diff --git a/xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.cpp b/xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.cpp index 3aba699bce..4297253ccd 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.cpp @@ -26,8 +26,8 @@ #include "xfa/src/fxbarcode/common/BC_CommonECI.h" #include "xfa/src/fxbarcode/common/BC_CommonCharacterSetECI.h" #include "xfa/src/fxbarcode/common/BC_CommonDecoderResult.h" -#include "BC_QRCoderMode.h" -#include "BC_QRDecodedBitStreamParser.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderMode.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.h" const FX_CHAR* CBC_QRDecodedBitStreamParser::UTF_8 = "utf8"; const FX_CHAR CBC_QRDecodedBitStreamParser::ALPHANUMERIC_CHARS[45] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', diff --git a/xfa/src/fxbarcode/qrcode/BC_QRDetector.cpp b/xfa/src/fxbarcode/qrcode/BC_QRDetector.cpp index 44bbce3aab..96c156a892 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRDetector.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRDetector.cpp @@ -25,14 +25,14 @@ #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" #include "xfa/src/fxbarcode/BC_ResultPoint.h" -#include "BC_QRFinderPattern.h" -#include "BC_QRCoderVersion.h" -#include "BC_FinderPatternInfo.h" -#include "BC_QRGridSampler.h" -#include "BC_QRAlignmentPatternFinder.h" -#include "BC_QRFinderPatternFinder.h" -#include "BC_QRDetectorResult.h" -#include "BC_QRDetector.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRFinderPattern.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.h" +#include "xfa/src/fxbarcode/qrcode/BC_FinderPatternInfo.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRGridSampler.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRDetector.h" CBC_QRDetector::CBC_QRDetector(CBC_CommonBitMatrix* image) : m_image(image) {} CBC_QRDetector::~CBC_QRDetector() {} CBC_QRDetectorResult* CBC_QRDetector::Detect(int32_t hints, int32_t& e) { diff --git a/xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.cpp b/xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.cpp index 894204ef97..0d0ae9f034 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.cpp @@ -23,7 +23,7 @@ #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/BC_ResultPoint.h" #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" -#include "BC_QRDetectorResult.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.h" CBC_QRDetectorResult::CBC_QRDetectorResult(CBC_CommonBitMatrix* bits, CFX_PtrArray* points) : m_bits(bits), m_points(points) {} diff --git a/xfa/src/fxbarcode/qrcode/BC_QRFinderPattern.cpp b/xfa/src/fxbarcode/qrcode/BC_QRFinderPattern.cpp index 7d3e98feaa..205abe348a 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRFinderPattern.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRFinderPattern.cpp @@ -22,7 +22,7 @@ #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/BC_ResultPoint.h" -#include "BC_QRFinderPattern.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRFinderPattern.h" CBC_QRFinderPattern::CBC_QRFinderPattern(FX_FLOAT x, FX_FLOAT posY, FX_FLOAT estimatedModuleSize) diff --git a/xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.cpp b/xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.cpp index 72edb53db7..5242f2c1e0 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.cpp @@ -23,9 +23,9 @@ #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/BC_ResultPoint.h" #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" -#include "BC_QRFinderPatternFinder.h" -#include "BC_FinderPatternInfo.h" -#include "BC_QRFinderPattern.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.h" +#include "xfa/src/fxbarcode/qrcode/BC_FinderPatternInfo.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRFinderPattern.h" const int32_t CBC_QRFinderPatternFinder::CENTER_QUORUM = 2; const int32_t CBC_QRFinderPatternFinder::MIN_SKIP = 3; const int32_t CBC_QRFinderPatternFinder::MAX_MODULES = 57; diff --git a/xfa/src/fxbarcode/qrcode/BC_QRGridSampler.cpp b/xfa/src/fxbarcode/qrcode/BC_QRGridSampler.cpp index e762171a3f..088b3cbd7c 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRGridSampler.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRGridSampler.cpp @@ -23,7 +23,7 @@ #include "xfa/src/fxbarcode/barcode.h" #include "xfa/src/fxbarcode/common/BC_CommonPerspectiveTransform.h" #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h" -#include "BC_QRGridSampler.h" +#include "xfa/src/fxbarcode/qrcode/BC_QRGridSampler.h" CBC_QRGridSampler CBC_QRGridSampler::m_gridSampler; CBC_QRGridSampler::CBC_QRGridSampler() {} CBC_QRGridSampler::~CBC_QRGridSampler() {} diff --git a/xfa/src/fxfa/src/app/xfa_checksum.cpp b/xfa/src/fxfa/src/app/xfa_checksum.cpp index a62f8a4b40..9ec9223986 100644 --- a/xfa/src/fxfa/src/app/xfa_checksum.cpp +++ b/xfa/src/fxfa/src/app/xfa_checksum.cpp @@ -6,7 +6,7 @@ #include "xfa/src/foxitlib.h" #include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa_checksum.h" +#include "xfa/src/fxfa/src/app/xfa_checksum.h" CXFA_SAXReaderHandler::CXFA_SAXReaderHandler(CXFA_ChecksumContext* pContext) : m_pContext(pContext) { FXSYS_assert(m_pContext); diff --git a/xfa/src/fxfa/src/app/xfa_ffConfigAcc.cpp b/xfa/src/fxfa/src/app/xfa_ffConfigAcc.cpp index b88c05973e..1b10c3ab63 100644 --- a/xfa/src/fxfa/src/app/xfa_ffConfigAcc.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffConfigAcc.cpp @@ -6,7 +6,7 @@ #include "xfa/src/foxitlib.h" #include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa_ffConfigAcc.h" +#include "xfa/src/fxfa/src/app/xfa_ffConfigAcc.h" CXFA_FFConfigAcc::CXFA_FFConfigAcc(CXFA_Node* pNode) : m_pNode(pNode), m_pPsMapNode(NULL) {} CXFA_FFConfigAcc::~CXFA_FFConfigAcc() {} diff --git a/xfa/src/fxfa/src/app/xfa_ffapp.cpp b/xfa/src/fxfa/src/app/xfa_ffapp.cpp index e153d956c5..e487c5d9cf 100644 --- a/xfa/src/fxfa/src/app/xfa_ffapp.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffapp.cpp @@ -8,13 +8,13 @@ #include "xfa/src/foxitlib.h" #include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa_ffdochandler.h" -#include "xfa_fwladapter.h" -#include "xfa_ffdoc.h" -#include "xfa_ffapp.h" -#include "xfa_fwltheme.h" -#include "xfa_fontmgr.h" -#include "xfa_ffwidgethandler.h" +#include "xfa/src/fxfa/src/app/xfa_ffdochandler.h" +#include "xfa/src/fxfa/src/app/xfa_fwladapter.h" +#include "xfa/src/fxfa/src/app/xfa_ffdoc.h" +#include "xfa/src/fxfa/src/app/xfa_ffapp.h" +#include "xfa/src/fxfa/src/app/xfa_fwltheme.h" +#include "xfa/src/fxfa/src/app/xfa_fontmgr.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidgethandler.h" CXFA_FileRead::CXFA_FileRead(const CFX_ArrayTemplate<CPDF_Stream*>& streams) { int32_t iCount = streams.GetSize(); diff --git a/xfa/src/fxfa/src/app/xfa_ffbarcode.cpp b/xfa/src/fxfa/src/app/xfa_ffbarcode.cpp index 952e7f5648..4abb20d6d0 100644 --- a/xfa/src/fxfa/src/app/xfa_ffbarcode.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffbarcode.cpp @@ -6,12 +6,12 @@ #include "xfa/src/foxitlib.h" #include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa_fwladapter.h" -#include "xfa_ffwidget.h" -#include "xfa_fffield.h" -#include "xfa_ffpageview.h" -#include "xfa_fftextedit.h" -#include "xfa_ffbarcode.h" +#include "xfa/src/fxfa/src/app/xfa_fwladapter.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" +#include "xfa/src/fxfa/src/app/xfa_fffield.h" +#include "xfa/src/fxfa/src/app/xfa_ffpageview.h" +#include "xfa/src/fxfa/src/app/xfa_fftextedit.h" +#include "xfa/src/fxfa/src/app/xfa_ffbarcode.h" static XFA_LPCBARCODETYPEENUMINFO XFA_GetBarcodeTypeByName( const CFX_WideStringC& wsName); CXFA_FFBarcode::CXFA_FFBarcode(CXFA_FFPageView* pPageView, diff --git a/xfa/src/fxfa/src/app/xfa_ffcheckbutton.cpp b/xfa/src/fxfa/src/app/xfa_ffcheckbutton.cpp index d18b84aff8..2824086f8a 100644 --- a/xfa/src/fxfa/src/app/xfa_ffcheckbutton.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffcheckbutton.cpp @@ -6,14 +6,14 @@ #include "xfa/src/foxitlib.h" #include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa_ffwidget.h" -#include "xfa_fffield.h" -#include "xfa_ffpageview.h" -#include "xfa_ffcheckbutton.h" -#include "xfa_ffexclgroup.h" -#include "xfa_ffdocview.h" -#include "xfa_ffapp.h" -#include "xfa_ffdoc.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" +#include "xfa/src/fxfa/src/app/xfa_fffield.h" +#include "xfa/src/fxfa/src/app/xfa_ffpageview.h" +#include "xfa/src/fxfa/src/app/xfa_ffcheckbutton.h" +#include "xfa/src/fxfa/src/app/xfa_ffexclgroup.h" +#include "xfa/src/fxfa/src/app/xfa_ffdocview.h" +#include "xfa/src/fxfa/src/app/xfa_ffapp.h" +#include "xfa/src/fxfa/src/app/xfa_ffdoc.h" CXFA_FFCheckButton::CXFA_FFCheckButton(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc) : CXFA_FFField(pPageView, pDataAcc), m_pOldDelegate(NULL) { diff --git a/xfa/src/fxfa/src/app/xfa_ffchoicelist.cpp b/xfa/src/fxfa/src/app/xfa_ffchoicelist.cpp index 270ea86174..49c262af1a 100644 --- a/xfa/src/fxfa/src/app/xfa_ffchoicelist.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffchoicelist.cpp @@ -6,13 +6,13 @@ #include "xfa/src/foxitlib.h" #include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa_fwladapter.h" -#include "xfa_ffwidget.h" -#include "xfa_fffield.h" -#include "xfa_ffpageview.h" -#include "xfa_ffdocview.h" -#include "xfa_ffchoicelist.h" -#include "xfa_ffdoc.h" +#include "xfa/src/fxfa/src/app/xfa_fwladapter.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" +#include "xfa/src/fxfa/src/app/xfa_fffield.h" +#include "xfa/src/fxfa/src/app/xfa_ffpageview.h" +#include "xfa/src/fxfa/src/app/xfa_ffdocview.h" +#include "xfa/src/fxfa/src/app/xfa_ffchoicelist.h" +#include "xfa/src/fxfa/src/app/xfa_ffdoc.h" CXFA_FFListBox::CXFA_FFListBox(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc) : CXFA_FFField(pPageView, pDataAcc), m_pOldDelegate(NULL) {} diff --git a/xfa/src/fxfa/src/app/xfa_ffdoc.cpp b/xfa/src/fxfa/src/app/xfa_ffdoc.cpp index 513098c7a9..9611a945e6 100644 --- a/xfa/src/fxfa/src/app/xfa_ffdoc.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffdoc.cpp @@ -6,12 +6,12 @@ #include "xfa/src/foxitlib.h" #include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa_ffapp.h" -#include "xfa_ffdoc.h" -#include "xfa_ffdocview.h" -#include "xfa_ffwidget.h" -#include "xfa_ffnotify.h" -#include "xfa_fontmgr.h" +#include "xfa/src/fxfa/src/app/xfa_ffapp.h" +#include "xfa/src/fxfa/src/app/xfa_ffdoc.h" +#include "xfa/src/fxfa/src/app/xfa_ffdocview.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" +#include "xfa/src/fxfa/src/app/xfa_ffnotify.h" +#include "xfa/src/fxfa/src/app/xfa_fontmgr.h" CXFA_FFDoc::CXFA_FFDoc(CXFA_FFApp* pApp, IXFA_DocProvider* pDocProvider) : m_pDocProvider(pDocProvider), m_pDocument(nullptr), diff --git a/xfa/src/fxfa/src/app/xfa_ffdochandler.cpp b/xfa/src/fxfa/src/app/xfa_ffdochandler.cpp index 3bb4bfdc58..db2e840f0a 100644 --- a/xfa/src/fxfa/src/app/xfa_ffdochandler.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffdochandler.cpp @@ -6,8 +6,8 @@ #include "xfa/src/foxitlib.h" #include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa_ffdochandler.h" -#include "xfa_ffdoc.h" +#include "xfa/src/fxfa/src/app/xfa_ffdochandler.h" +#include "xfa/src/fxfa/src/app/xfa_ffdoc.h" CXFA_FFDocHandler::CXFA_FFDocHandler() {} CXFA_FFDocHandler::~CXFA_FFDocHandler() {} void CXFA_FFDocHandler::ReleaseDoc(IXFA_Doc* hDoc) { diff --git a/xfa/src/fxfa/src/app/xfa_ffdocview.cpp b/xfa/src/fxfa/src/app/xfa_ffdocview.cpp index 9d8e049787..bf382c156a 100644 --- a/xfa/src/fxfa/src/app/xfa_ffdocview.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffdocview.cpp @@ -6,29 +6,29 @@ #include "xfa/src/foxitlib.h" #include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa_fwladapter.h" -#include "xfa_ffdocview.h" -#include "xfa_ffpageview.h" -#include "xfa_ffwidgethandler.h" -#include "xfa_ffdoc.h" -#include "xfa_ffwidget.h" -#include "xfa_fffield.h" -#include "xfa_ffpushbutton.h" -#include "xfa_ffcheckbutton.h" -#include "xfa_ffchoicelist.h" -#include "xfa_ffimageedit.h" -#include "xfa_fftextedit.h" -#include "xfa_ffbarcode.h" -#include "xfa_ffdraw.h" -#include "xfa_fftext.h" -#include "xfa_ffpath.h" -#include "xfa_ffimage.h" -#include "xfa_ffexclgroup.h" -#include "xfa_ffsubform.h" -#include "xfa_ffsignature.h" -#include "xfa_ffapp.h" -#include "xfa_textlayout.h" -#include "xfa_ffwidgetacc.h" +#include "xfa/src/fxfa/src/app/xfa_fwladapter.h" +#include "xfa/src/fxfa/src/app/xfa_ffdocview.h" +#include "xfa/src/fxfa/src/app/xfa_ffpageview.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidgethandler.h" +#include "xfa/src/fxfa/src/app/xfa_ffdoc.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" +#include "xfa/src/fxfa/src/app/xfa_fffield.h" +#include "xfa/src/fxfa/src/app/xfa_ffpushbutton.h" +#include "xfa/src/fxfa/src/app/xfa_ffcheckbutton.h" +#include "xfa/src/fxfa/src/app/xfa_ffchoicelist.h" +#include "xfa/src/fxfa/src/app/xfa_ffimageedit.h" +#include "xfa/src/fxfa/src/app/xfa_fftextedit.h" +#include "xfa/src/fxfa/src/app/xfa_ffbarcode.h" +#include "xfa/src/fxfa/src/app/xfa_ffdraw.h" +#include "xfa/src/fxfa/src/app/xfa_fftext.h" +#include "xfa/src/fxfa/src/app/xfa_ffpath.h" +#include "xfa/src/fxfa/src/app/xfa_ffimage.h" +#include "xfa/src/fxfa/src/app/xfa_ffexclgroup.h" +#include "xfa/src/fxfa/src/app/xfa_ffsubform.h" +#include "xfa/src/fxfa/src/app/xfa_ffsignature.h" +#include "xfa/src/fxfa/src/app/xfa_ffapp.h" +#include "xfa/src/fxfa/src/app/xfa_textlayout.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidgetacc.h" extern const XFA_ATTRIBUTEENUM gs_EventActivity[] = { XFA_ATTRIBUTEENUM_Click, XFA_ATTRIBUTEENUM_Change, XFA_ATTRIBUTEENUM_DocClose, XFA_ATTRIBUTEENUM_DocReady, diff --git a/xfa/src/fxfa/src/app/xfa_ffdocview.h b/xfa/src/fxfa/src/app/xfa_ffdocview.h index 511302119d..6aec6a4ecc 100644 --- a/xfa/src/fxfa/src/app/xfa_ffdocview.h +++ b/xfa/src/fxfa/src/app/xfa_ffdocview.h @@ -7,7 +7,7 @@ #ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFDOCVIEW_H_ #define XFA_SRC_FXFA_SRC_APP_XFA_FFDOCVIEW_H_ -#include "xfa_ffdoc.h" +#include "xfa/src/fxfa/src/app/xfa_ffdoc.h" class CXFA_FFPageView; class CXFA_FFWidgetHandler; diff --git a/xfa/src/fxfa/src/app/xfa_ffdraw.cpp b/xfa/src/fxfa/src/app/xfa_ffdraw.cpp index 61e294ea05..3de0dd8656 100644 --- a/xfa/src/fxfa/src/app/xfa_ffdraw.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffdraw.cpp @@ -6,11 +6,11 @@ #include "xfa/src/foxitlib.h" #include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa_ffwidget.h" -#include "xfa_ffdraw.h" -#include "xfa_ffpageview.h" -#include "xfa_ffapp.h" -#include "xfa_ffdoc.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" +#include "xfa/src/fxfa/src/app/xfa_ffdraw.h" +#include "xfa/src/fxfa/src/app/xfa_ffpageview.h" +#include "xfa/src/fxfa/src/app/xfa_ffapp.h" +#include "xfa/src/fxfa/src/app/xfa_ffdoc.h" CXFA_FFDraw::CXFA_FFDraw(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc) : CXFA_FFWidget(pPageView, pDataAcc) {} CXFA_FFDraw::~CXFA_FFDraw() {} diff --git a/xfa/src/fxfa/src/app/xfa_ffexclgroup.cpp b/xfa/src/fxfa/src/app/xfa_ffexclgroup.cpp index 716842f3fb..b634a69b5e 100644 --- a/xfa/src/fxfa/src/app/xfa_ffexclgroup.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffexclgroup.cpp @@ -6,11 +6,11 @@ #include "xfa/src/foxitlib.h" #include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa_ffwidget.h" -#include "xfa_ffexclgroup.h" -#include "xfa_ffpageview.h" -#include "xfa_ffapp.h" -#include "xfa_ffdoc.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" +#include "xfa/src/fxfa/src/app/xfa_ffexclgroup.h" +#include "xfa/src/fxfa/src/app/xfa_ffpageview.h" +#include "xfa/src/fxfa/src/app/xfa_ffapp.h" +#include "xfa/src/fxfa/src/app/xfa_ffdoc.h" CXFA_FFExclGroup::CXFA_FFExclGroup(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc) : CXFA_FFWidget(pPageView, pDataAcc) {} diff --git a/xfa/src/fxfa/src/app/xfa_fffield.cpp b/xfa/src/fxfa/src/app/xfa_fffield.cpp index e21b5fd260..c3331f2870 100644 --- a/xfa/src/fxfa/src/app/xfa_fffield.cpp +++ b/xfa/src/fxfa/src/app/xfa_fffield.cpp @@ -6,14 +6,14 @@ #include "xfa/src/foxitlib.h" #include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa_ffwidget.h" -#include "xfa_fffield.h" -#include "xfa_ffpageview.h" -#include "xfa_ffapp.h" -#include "xfa_ffdoc.h" -#include "xfa_fwltheme.h" -#include "xfa_textlayout.h" -#include "xfa_ffdocview.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" +#include "xfa/src/fxfa/src/app/xfa_fffield.h" +#include "xfa/src/fxfa/src/app/xfa_ffpageview.h" +#include "xfa/src/fxfa/src/app/xfa_ffapp.h" +#include "xfa/src/fxfa/src/app/xfa_ffdoc.h" +#include "xfa/src/fxfa/src/app/xfa_fwltheme.h" +#include "xfa/src/fxfa/src/app/xfa_textlayout.h" +#include "xfa/src/fxfa/src/app/xfa_ffdocview.h" CXFA_FFField::CXFA_FFField(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc) : CXFA_FFWidget(pPageView, pDataAcc), m_pNormalWidget(NULL) { m_rtUI.Set(0, 0, 0, 0); diff --git a/xfa/src/fxfa/src/app/xfa_ffimage.cpp b/xfa/src/fxfa/src/app/xfa_ffimage.cpp index 61affae6d2..1a79b32b06 100644 --- a/xfa/src/fxfa/src/app/xfa_ffimage.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffimage.cpp @@ -6,12 +6,12 @@ #include "xfa/src/foxitlib.h" #include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa_ffwidget.h" -#include "xfa_ffdraw.h" -#include "xfa_ffimage.h" -#include "xfa_ffpageview.h" -#include "xfa_ffdoc.h" -#include "xfa_ffapp.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" +#include "xfa/src/fxfa/src/app/xfa_ffdraw.h" +#include "xfa/src/fxfa/src/app/xfa_ffimage.h" +#include "xfa/src/fxfa/src/app/xfa_ffpageview.h" +#include "xfa/src/fxfa/src/app/xfa_ffdoc.h" +#include "xfa/src/fxfa/src/app/xfa_ffapp.h" CXFA_FFImage::CXFA_FFImage(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc) : CXFA_FFDraw(pPageView, pDataAcc) {} CXFA_FFImage::~CXFA_FFImage() { diff --git a/xfa/src/fxfa/src/app/xfa_ffimageedit.cpp b/xfa/src/fxfa/src/app/xfa_ffimageedit.cpp index e3329a9869..8cc99a5ca4 100644 --- a/xfa/src/fxfa/src/app/xfa_ffimageedit.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffimageedit.cpp @@ -6,12 +6,12 @@ #include "xfa/src/foxitlib.h" #include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa_ffwidget.h" -#include "xfa_fffield.h" -#include "xfa_ffpageview.h" -#include "xfa_ffimageedit.h" -#include "xfa_ffdocview.h" -#include "xfa_ffdoc.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" +#include "xfa/src/fxfa/src/app/xfa_fffield.h" +#include "xfa/src/fxfa/src/app/xfa_ffpageview.h" +#include "xfa/src/fxfa/src/app/xfa_ffimageedit.h" +#include "xfa/src/fxfa/src/app/xfa_ffdocview.h" +#include "xfa/src/fxfa/src/app/xfa_ffdoc.h" CXFA_FFImageEdit::CXFA_FFImageEdit(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc) : CXFA_FFField(pPageView, pDataAcc), m_pOldDelegate(NULL) {} diff --git a/xfa/src/fxfa/src/app/xfa_ffnotify.cpp b/xfa/src/fxfa/src/app/xfa_ffnotify.cpp index ebd9d06a6e..03ab097276 100644 --- a/xfa/src/fxfa/src/app/xfa_ffnotify.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffnotify.cpp @@ -6,30 +6,30 @@ #include "xfa/src/foxitlib.h" #include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa_fwladapter.h" -#include "xfa_ffdocview.h" -#include "xfa_ffpageview.h" -#include "xfa_ffwidgethandler.h" -#include "xfa_ffdoc.h" -#include "xfa_ffwidget.h" -#include "xfa_fffield.h" -#include "xfa_ffpushbutton.h" -#include "xfa_ffcheckbutton.h" -#include "xfa_ffchoicelist.h" -#include "xfa_ffimageedit.h" -#include "xfa_fftextedit.h" -#include "xfa_ffbarcode.h" -#include "xfa_ffdraw.h" -#include "xfa_fftext.h" -#include "xfa_ffpath.h" -#include "xfa_ffimage.h" -#include "xfa_ffexclgroup.h" -#include "xfa_ffsubform.h" -#include "xfa_ffsignature.h" -#include "xfa_ffapp.h" -#include "xfa_textlayout.h" -#include "xfa_ffwidgetacc.h" -#include "xfa_ffnotify.h" +#include "xfa/src/fxfa/src/app/xfa_fwladapter.h" +#include "xfa/src/fxfa/src/app/xfa_ffdocview.h" +#include "xfa/src/fxfa/src/app/xfa_ffpageview.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidgethandler.h" +#include "xfa/src/fxfa/src/app/xfa_ffdoc.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" +#include "xfa/src/fxfa/src/app/xfa_fffield.h" +#include "xfa/src/fxfa/src/app/xfa_ffpushbutton.h" +#include "xfa/src/fxfa/src/app/xfa_ffcheckbutton.h" +#include "xfa/src/fxfa/src/app/xfa_ffchoicelist.h" +#include "xfa/src/fxfa/src/app/xfa_ffimageedit.h" +#include "xfa/src/fxfa/src/app/xfa_fftextedit.h" +#include "xfa/src/fxfa/src/app/xfa_ffbarcode.h" +#include "xfa/src/fxfa/src/app/xfa_ffdraw.h" +#include "xfa/src/fxfa/src/app/xfa_fftext.h" +#include "xfa/src/fxfa/src/app/xfa_ffpath.h" +#include "xfa/src/fxfa/src/app/xfa_ffimage.h" +#include "xfa/src/fxfa/src/app/xfa_ffexclgroup.h" +#include "xfa/src/fxfa/src/app/xfa_ffsubform.h" +#include "xfa/src/fxfa/src/app/xfa_ffsignature.h" +#include "xfa/src/fxfa/src/app/xfa_ffapp.h" +#include "xfa/src/fxfa/src/app/xfa_textlayout.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidgetacc.h" +#include "xfa/src/fxfa/src/app/xfa_ffnotify.h" static void XFA_FFDeleteWidgetAcc(void* pData) { delete static_cast<CXFA_WidgetAcc*>(pData); diff --git a/xfa/src/fxfa/src/app/xfa_ffpageview.cpp b/xfa/src/fxfa/src/app/xfa_ffpageview.cpp index aa108a2625..2fa2b3f4ec 100644 --- a/xfa/src/fxfa/src/app/xfa_ffpageview.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffpageview.cpp @@ -6,17 +6,17 @@ #include "xfa/src/foxitlib.h" #include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa_fwladapter.h" -#include "xfa_ffpageview.h" -#include "xfa_ffwidget.h" -#include "xfa_ffdoc.h" -#include "xfa_ffdocview.h" -#include "xfa_fffield.h" -#include "xfa_ffpushbutton.h" -#include "xfa_ffcheckbutton.h" -#include "xfa_ffchoicelist.h" -#include "xfa_ffimageedit.h" -#include "xfa_fftextedit.h" +#include "xfa/src/fxfa/src/app/xfa_fwladapter.h" +#include "xfa/src/fxfa/src/app/xfa_ffpageview.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" +#include "xfa/src/fxfa/src/app/xfa_ffdoc.h" +#include "xfa/src/fxfa/src/app/xfa_ffdocview.h" +#include "xfa/src/fxfa/src/app/xfa_fffield.h" +#include "xfa/src/fxfa/src/app/xfa_ffpushbutton.h" +#include "xfa/src/fxfa/src/app/xfa_ffcheckbutton.h" +#include "xfa/src/fxfa/src/app/xfa_ffchoicelist.h" +#include "xfa/src/fxfa/src/app/xfa_ffimageedit.h" +#include "xfa/src/fxfa/src/app/xfa_fftextedit.h" CXFA_FFPageView::CXFA_FFPageView(CXFA_FFDocView* pDocView, CXFA_Node* pPageArea) : CXFA_ContainerLayoutItem(pPageArea), m_pDocView(pDocView), diff --git a/xfa/src/fxfa/src/app/xfa_ffpath.cpp b/xfa/src/fxfa/src/app/xfa_ffpath.cpp index 8217af29a7..fd6947a8b0 100644 --- a/xfa/src/fxfa/src/app/xfa_ffpath.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffpath.cpp @@ -6,12 +6,12 @@ #include "xfa/src/foxitlib.h" #include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa_ffwidget.h" -#include "xfa_ffdraw.h" -#include "xfa_ffpath.h" -#include "xfa_ffpageview.h" -#include "xfa_ffdoc.h" -#include "xfa_ffapp.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" +#include "xfa/src/fxfa/src/app/xfa_ffdraw.h" +#include "xfa/src/fxfa/src/app/xfa_ffpath.h" +#include "xfa/src/fxfa/src/app/xfa_ffpageview.h" +#include "xfa/src/fxfa/src/app/xfa_ffdoc.h" +#include "xfa/src/fxfa/src/app/xfa_ffapp.h" CXFA_FFLine::CXFA_FFLine(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc) : CXFA_FFDraw(pPageView, pDataAcc) {} CXFA_FFLine::~CXFA_FFLine() {} diff --git a/xfa/src/fxfa/src/app/xfa_ffpushbutton.cpp b/xfa/src/fxfa/src/app/xfa_ffpushbutton.cpp index 2b9f1eeb95..12c1a2a30d 100644 --- a/xfa/src/fxfa/src/app/xfa_ffpushbutton.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffpushbutton.cpp @@ -6,13 +6,13 @@ #include "xfa/src/foxitlib.h" #include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa_ffwidget.h" -#include "xfa_ffwidgetacc.h" -#include "xfa_fffield.h" -#include "xfa_ffpageview.h" -#include "xfa_ffpushbutton.h" -#include "xfa_textlayout.h" -#include "xfa_ffapp.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidgetacc.h" +#include "xfa/src/fxfa/src/app/xfa_fffield.h" +#include "xfa/src/fxfa/src/app/xfa_ffpageview.h" +#include "xfa/src/fxfa/src/app/xfa_ffpushbutton.h" +#include "xfa/src/fxfa/src/app/xfa_textlayout.h" +#include "xfa/src/fxfa/src/app/xfa_ffapp.h" CXFA_FFPushButton::CXFA_FFPushButton(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc) : CXFA_FFField(pPageView, pDataAcc), diff --git a/xfa/src/fxfa/src/app/xfa_ffsignature.cpp b/xfa/src/fxfa/src/app/xfa_ffsignature.cpp index 1dc7ed68b5..138036c01c 100644 --- a/xfa/src/fxfa/src/app/xfa_ffsignature.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffsignature.cpp @@ -6,11 +6,11 @@ #include "xfa/src/foxitlib.h" #include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa_ffwidget.h" -#include "xfa_fffield.h" -#include "xfa_ffpageview.h" -#include "xfa_ffsignature.h" -#include "xfa_ffdoc.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" +#include "xfa/src/fxfa/src/app/xfa_fffield.h" +#include "xfa/src/fxfa/src/app/xfa_ffpageview.h" +#include "xfa/src/fxfa/src/app/xfa_ffsignature.h" +#include "xfa/src/fxfa/src/app/xfa_ffdoc.h" CXFA_FFSignature::CXFA_FFSignature(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc) : CXFA_FFField(pPageView, pDataAcc) {} diff --git a/xfa/src/fxfa/src/app/xfa_ffsubform.cpp b/xfa/src/fxfa/src/app/xfa_ffsubform.cpp index c4280b6087..97b37c32c7 100644 --- a/xfa/src/fxfa/src/app/xfa_ffsubform.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffsubform.cpp @@ -6,11 +6,11 @@ #include "xfa/src/foxitlib.h" #include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa_ffwidget.h" -#include "xfa_ffsubform.h" -#include "xfa_ffpageview.h" -#include "xfa_ffapp.h" -#include "xfa_ffdoc.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" +#include "xfa/src/fxfa/src/app/xfa_ffsubform.h" +#include "xfa/src/fxfa/src/app/xfa_ffpageview.h" +#include "xfa/src/fxfa/src/app/xfa_ffapp.h" +#include "xfa/src/fxfa/src/app/xfa_ffdoc.h" CXFA_FFSubForm::CXFA_FFSubForm(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc) : CXFA_FFWidget(pPageView, pDataAcc) {} diff --git a/xfa/src/fxfa/src/app/xfa_fftext.cpp b/xfa/src/fxfa/src/app/xfa_fftext.cpp index 854c72175a..a7630aca2d 100644 --- a/xfa/src/fxfa/src/app/xfa_fftext.cpp +++ b/xfa/src/fxfa/src/app/xfa_fftext.cpp @@ -6,13 +6,13 @@ #include "xfa/src/foxitlib.h" #include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa_ffwidget.h" -#include "xfa_ffdraw.h" -#include "xfa_fftext.h" -#include "xfa_textlayout.h" -#include "xfa_ffpageview.h" -#include "xfa_ffdoc.h" -#include "xfa_ffapp.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" +#include "xfa/src/fxfa/src/app/xfa_ffdraw.h" +#include "xfa/src/fxfa/src/app/xfa_fftext.h" +#include "xfa/src/fxfa/src/app/xfa_textlayout.h" +#include "xfa/src/fxfa/src/app/xfa_ffpageview.h" +#include "xfa/src/fxfa/src/app/xfa_ffdoc.h" +#include "xfa/src/fxfa/src/app/xfa_ffapp.h" CXFA_FFText::CXFA_FFText(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc) : CXFA_FFDraw(pPageView, pDataAcc) {} CXFA_FFText::~CXFA_FFText() {} diff --git a/xfa/src/fxfa/src/app/xfa_fftextedit.cpp b/xfa/src/fxfa/src/app/xfa_fftextedit.cpp index 2d2177b670..cab1c0d782 100644 --- a/xfa/src/fxfa/src/app/xfa_fftextedit.cpp +++ b/xfa/src/fxfa/src/app/xfa_fftextedit.cpp @@ -6,15 +6,15 @@ #include "xfa/src/foxitlib.h" #include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa_fwladapter.h" -#include "xfa_ffwidget.h" -#include "xfa_fffield.h" -#include "xfa_ffpageview.h" -#include "xfa_fftextedit.h" -#include "xfa_textlayout.h" -#include "xfa_ffapp.h" -#include "xfa_ffdocview.h" -#include "xfa_ffdoc.h" +#include "xfa/src/fxfa/src/app/xfa_fwladapter.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" +#include "xfa/src/fxfa/src/app/xfa_fffield.h" +#include "xfa/src/fxfa/src/app/xfa_ffpageview.h" +#include "xfa/src/fxfa/src/app/xfa_fftextedit.h" +#include "xfa/src/fxfa/src/app/xfa_textlayout.h" +#include "xfa/src/fxfa/src/app/xfa_ffapp.h" +#include "xfa/src/fxfa/src/app/xfa_ffdocview.h" +#include "xfa/src/fxfa/src/app/xfa_ffdoc.h" CXFA_FFTextEdit::CXFA_FFTextEdit(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc) : CXFA_FFField(pPageView, pDataAcc), m_pOldDelegate(NULL) {} diff --git a/xfa/src/fxfa/src/app/xfa_ffwidget.cpp b/xfa/src/fxfa/src/app/xfa_ffwidget.cpp index 0af2ede0e6..4e31a27ca5 100644 --- a/xfa/src/fxfa/src/app/xfa_ffwidget.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffwidget.cpp @@ -8,12 +8,12 @@ #include "xfa/src/foxitlib.h" #include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa_ffapp.h" -#include "xfa_ffdoc.h" -#include "xfa_ffdocview.h" -#include "xfa_ffwidget.h" -#include "xfa_ffpageview.h" -#include "xfa_textlayout.h" +#include "xfa/src/fxfa/src/app/xfa_ffapp.h" +#include "xfa/src/fxfa/src/app/xfa_ffdoc.h" +#include "xfa/src/fxfa/src/app/xfa_ffdocview.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" +#include "xfa/src/fxfa/src/app/xfa_ffpageview.h" +#include "xfa/src/fxfa/src/app/xfa_textlayout.h" CXFA_FFWidget::CXFA_FFWidget(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc) : CXFA_ContentLayoutItem(pDataAcc->GetNode()), diff --git a/xfa/src/fxfa/src/app/xfa_ffwidgetacc.cpp b/xfa/src/fxfa/src/app/xfa_ffwidgetacc.cpp index 04123588b4..f3c8e15c1f 100644 --- a/xfa/src/fxfa/src/app/xfa_ffwidgetacc.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffwidgetacc.cpp @@ -8,18 +8,18 @@ #include "xfa/src/foxitlib.h" #include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa_ffwidget.h" -#include "xfa_ffdoc.h" -#include "xfa_ffdocview.h" -#include "xfa_ffpageview.h" -#include "xfa_ffapp.h" -#include "xfa_textlayout.h" -#include "xfa_fwladapter.h" -#include "xfa_fffield.h" -#include "xfa_ffchoicelist.h" -#include "xfa_ffcheckbutton.h" -#include "xfa_ffwidgetacc.h" -#include "xfa_fontmgr.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" +#include "xfa/src/fxfa/src/app/xfa_ffdoc.h" +#include "xfa/src/fxfa/src/app/xfa_ffdocview.h" +#include "xfa/src/fxfa/src/app/xfa_ffpageview.h" +#include "xfa/src/fxfa/src/app/xfa_ffapp.h" +#include "xfa/src/fxfa/src/app/xfa_textlayout.h" +#include "xfa/src/fxfa/src/app/xfa_fwladapter.h" +#include "xfa/src/fxfa/src/app/xfa_fffield.h" +#include "xfa/src/fxfa/src/app/xfa_ffchoicelist.h" +#include "xfa/src/fxfa/src/app/xfa_ffcheckbutton.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidgetacc.h" +#include "xfa/src/fxfa/src/app/xfa_fontmgr.h" static void XFA_FFDeleteCalcData(void* pData) { if (pData) { delete ((CXFA_CalcData*)pData); diff --git a/xfa/src/fxfa/src/app/xfa_ffwidgetacc.h b/xfa/src/fxfa/src/app/xfa_ffwidgetacc.h index 7a8dd94bfe..6768502a9e 100644 --- a/xfa/src/fxfa/src/app/xfa_ffwidgetacc.h +++ b/xfa/src/fxfa/src/app/xfa_ffwidgetacc.h @@ -7,7 +7,7 @@ #ifndef XFA_SRC_FXFA_SRC_APP_XFA_FFWIDGETACC_H_ #define XFA_SRC_FXFA_SRC_APP_XFA_FFWIDGETACC_H_ -#include "xfa_textlayout.h" +#include "xfa/src/fxfa/src/app/xfa_textlayout.h" enum XFA_TEXTPROVIDERTYPE { XFA_TEXTPROVIDERTYPE_Text, diff --git a/xfa/src/fxfa/src/app/xfa_ffwidgethandler.cpp b/xfa/src/fxfa/src/app/xfa_ffwidgethandler.cpp index 6d3af0ec37..6b718526a9 100644 --- a/xfa/src/fxfa/src/app/xfa_ffwidgethandler.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffwidgethandler.cpp @@ -6,13 +6,13 @@ #include "xfa/src/foxitlib.h" #include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa_fwladapter.h" -#include "xfa_ffwidgethandler.h" -#include "xfa_ffwidget.h" -#include "xfa_fffield.h" -#include "xfa_ffchoicelist.h" -#include "xfa_ffdoc.h" -#include "xfa_ffdocview.h" +#include "xfa/src/fxfa/src/app/xfa_fwladapter.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidgethandler.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" +#include "xfa/src/fxfa/src/app/xfa_fffield.h" +#include "xfa/src/fxfa/src/app/xfa_ffchoicelist.h" +#include "xfa/src/fxfa/src/app/xfa_ffdoc.h" +#include "xfa/src/fxfa/src/app/xfa_ffdocview.h" CXFA_FFWidgetHandler::CXFA_FFWidgetHandler(CXFA_FFDocView* pDocView) : m_pDocView(pDocView) {} CXFA_FFWidgetHandler::~CXFA_FFWidgetHandler() {} diff --git a/xfa/src/fxfa/src/app/xfa_fontmgr.cpp b/xfa/src/fxfa/src/app/xfa_fontmgr.cpp index 57061deb1f..7bc8029f46 100644 --- a/xfa/src/fxfa/src/app/xfa_fontmgr.cpp +++ b/xfa/src/fxfa/src/app/xfa_fontmgr.cpp @@ -8,10 +8,10 @@ #include "xfa/src/foxitlib.h" #include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa_fontmgr.h" -#include "xfa_ffdoc.h" -#include "xfa_ffConfigAcc.h" -#include "xfa_ffapp.h" +#include "xfa/src/fxfa/src/app/xfa_fontmgr.h" +#include "xfa/src/fxfa/src/app/xfa_ffdoc.h" +#include "xfa/src/fxfa/src/app/xfa_ffConfigAcc.h" +#include "xfa/src/fxfa/src/app/xfa_ffapp.h" #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ static const XFA_FONTINFO g_XFAFontsMap[] = { {0x01d5d33e, L"SimSun", L"Arial", 0, 936}, diff --git a/xfa/src/fxfa/src/app/xfa_fwladapter.cpp b/xfa/src/fxfa/src/app/xfa_fwladapter.cpp index 517c491a0e..2ef612516f 100644 --- a/xfa/src/fxfa/src/app/xfa_fwladapter.cpp +++ b/xfa/src/fxfa/src/app/xfa_fwladapter.cpp @@ -6,10 +6,10 @@ #include "xfa/src/foxitlib.h" #include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa_fwladapter.h" -#include "xfa_ffwidget.h" -#include "xfa_fffield.h" -#include "xfa_ffdoc.h" +#include "xfa/src/fxfa/src/app/xfa_fwladapter.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" +#include "xfa/src/fxfa/src/app/xfa_fffield.h" +#include "xfa/src/fxfa/src/app/xfa_ffdoc.h" void FWL_PostMessageToMainRoop(CFWL_Message* pMessage) {} FX_BOOL FWL_ShowCaret(IFWL_Widget* pWidget, diff --git a/xfa/src/fxfa/src/app/xfa_fwltheme.cpp b/xfa/src/fxfa/src/app/xfa_fwltheme.cpp index 69b9e5f481..1d061567d5 100644 --- a/xfa/src/fxfa/src/app/xfa_fwltheme.cpp +++ b/xfa/src/fxfa/src/app/xfa_fwltheme.cpp @@ -6,9 +6,9 @@ #include "xfa/src/foxitlib.h" #include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa_fwltheme.h" -#include "xfa_ffwidget.h" -#include "xfa_ffapp.h" +#include "xfa/src/fxfa/src/app/xfa_fwltheme.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" +#include "xfa/src/fxfa/src/app/xfa_ffapp.h" CXFA_FFWidget* XFA_ThemeGetOuterWidget(IFWL_Widget* pWidget) { IFWL_Widget* pOuter = pWidget; while (pOuter->GetOuter()) { diff --git a/xfa/src/fxfa/src/app/xfa_rendercontext.cpp b/xfa/src/fxfa/src/app/xfa_rendercontext.cpp index 8a8aeb63b2..d658e8dd36 100644 --- a/xfa/src/fxfa/src/app/xfa_rendercontext.cpp +++ b/xfa/src/fxfa/src/app/xfa_rendercontext.cpp @@ -6,8 +6,8 @@ #include "xfa/src/foxitlib.h" #include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa_rendercontext.h" -#include "xfa_ffwidget.h" +#include "xfa/src/fxfa/src/app/xfa_rendercontext.h" +#include "xfa/src/fxfa/src/app/xfa_ffwidget.h" #define XFA_RENDERCONTEXT_MaxCount 30 IXFA_RenderContext* XFA_RenderContext_Create() { return new CXFA_RenderContext; diff --git a/xfa/src/fxfa/src/app/xfa_textlayout.cpp b/xfa/src/fxfa/src/app/xfa_textlayout.cpp index 8cef856224..637e7b848a 100644 --- a/xfa/src/fxfa/src/app/xfa_textlayout.cpp +++ b/xfa/src/fxfa/src/app/xfa_textlayout.cpp @@ -8,10 +8,10 @@ #include "xfa/src/foxitlib.h" #include "xfa/src/fxfa/src/common/xfa_common.h" -#include "xfa_textlayout.h" -#include "xfa_ffapp.h" -#include "xfa_ffdoc.h" -#include "xfa_fontmgr.h" +#include "xfa/src/fxfa/src/app/xfa_textlayout.h" +#include "xfa/src/fxfa/src/app/xfa_ffapp.h" +#include "xfa/src/fxfa/src/app/xfa_ffdoc.h" +#include "xfa/src/fxfa/src/app/xfa_fontmgr.h" CXFA_CSSTagProvider::~CXFA_CSSTagProvider() { FX_POSITION pos = m_Attributes.GetStartPosition(); while (pos) { diff --git a/xfa/src/fxfa/src/common/xfa_common.h b/xfa/src/fxfa/src/common/xfa_common.h index 269cab605e..ce7f4d211c 100644 --- a/xfa/src/fxfa/src/common/xfa_common.h +++ b/xfa/src/fxfa/src/common/xfa_common.h @@ -9,14 +9,14 @@ #ifndef XFA_SRC_FXFA_SRC_COMMON_XFA_COMMON_H_ #define XFA_SRC_FXFA_SRC_COMMON_XFA_COMMON_H_ -#include "xfa_utils.h" -#include "xfa_object.h" -#include "xfa_document.h" -#include "xfa_parser.h" -#include "xfa_script.h" -#include "xfa_docdata.h" -#include "xfa_doclayout.h" -#include "xfa_localemgr.h" -#include "xfa_fm2jsapi.h" +#include "xfa/src/fxfa/src/common/xfa_utils.h" +#include "xfa/src/fxfa/src/common/xfa_object.h" +#include "xfa/src/fxfa/src/common/xfa_document.h" +#include "xfa/src/fxfa/src/common/xfa_parser.h" +#include "xfa/src/fxfa/src/common/xfa_script.h" +#include "xfa/src/fxfa/src/common/xfa_docdata.h" +#include "xfa/src/fxfa/src/common/xfa_doclayout.h" +#include "xfa/src/fxfa/src/common/xfa_localemgr.h" +#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" #endif // XFA_SRC_FXFA_SRC_COMMON_XFA_COMMON_H_ diff --git a/xfa/src/fxfa/src/common/xfa_utils.h b/xfa/src/fxfa/src/common/xfa_utils.h index 4ebc59b4fa..14ea7e5e65 100644 --- a/xfa/src/fxfa/src/common/xfa_utils.h +++ b/xfa/src/fxfa/src/common/xfa_utils.h @@ -7,6 +7,8 @@ #ifndef XFA_SRC_FXFA_SRC_COMMON_XFA_UTILS_H_ #define XFA_SRC_FXFA_SRC_COMMON_XFA_UTILS_H_ +#include "xfa/src/fxfa/src/common/fxfa_localevalue.h" + FX_BOOL XFA_FDEExtension_ResolveNamespaceQualifier( IFDE_XMLElement* pNode, const CFX_WideStringC& wsQualifier, @@ -185,7 +187,7 @@ class CXFA_PtrSetTemplate : private CFX_MapPtrToPtr { }; class CXFA_Node; class CXFA_WidgetData; -#include "fxfa_localevalue.h" + CXFA_Node* XFA_CreateUIChild(CXFA_Node* pNode, XFA_ELEMENT& eWidgetType); CXFA_LocaleValue XFA_GetLocaleValue(CXFA_WidgetData* pWidgetData); CFX_WideString XFA_NumericLimit(const CFX_WideString& wsValue, diff --git a/xfa/src/fxfa/src/fm2js/xfa_error.cpp b/xfa/src/fxfa/src/fm2js/xfa_error.cpp index 4bcf3b2398..a7d061f1e9 100644 --- a/xfa/src/fxfa/src/fm2js/xfa_error.cpp +++ b/xfa/src/fxfa/src/fm2js/xfa_error.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa_fm2js.h" +#include "xfa/src/fxfa/src/fm2js/xfa_fm2js.h" static const FX_WCHAR* gs_lpStrErrorMsgInfo[] = { L"unsupported char '%c'", L"bad suffix on number", L"invalidate char '%c'", L"expected identifier instead of '%s'", diff --git a/xfa/src/fxfa/src/fm2js/xfa_expression.cpp b/xfa/src/fxfa/src/fm2js/xfa_expression.cpp index eff1eba3d8..95bd809bad 100644 --- a/xfa/src/fxfa/src/fm2js/xfa_expression.cpp +++ b/xfa/src/fxfa/src/fm2js/xfa_expression.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa_fm2js.h" +#include "xfa/src/fxfa/src/fm2js/xfa_fm2js.h" static CFX_WideStringC RUNTIMEBLOCKTEMPARRAY = FX_WSTRC(L"foxit_xfa_formcalc_runtime_block_temp_array"); static CFX_WideStringC RUNTIMEBLOCKTEMPARRAYINDEX = diff --git a/xfa/src/fxfa/src/fm2js/xfa_fm2js.h b/xfa/src/fxfa/src/fm2js/xfa_fm2js.h index cb10391517..998a5627e0 100644 --- a/xfa/src/fxfa/src/fm2js/xfa_fm2js.h +++ b/xfa/src/fxfa/src/fm2js/xfa_fm2js.h @@ -22,12 +22,12 @@ #define EXCLAMATION_IN_IDENTIFIER \ (FX_WSTRC(L"foxit_xfa_formcalc__exclamation__")) typedef CFX_ArrayTemplate<CFX_WideStringC> CFX_WideStringCArray; -#include "xfa_error.h" -#include "xfa_lexer.h" -#include "xfa_simpleexpression.h" -#include "xfa_expression.h" -#include "xfa_fmparse.h" -#include "xfa_program.h" -#include "xfa_fm2jscontext.h" +#include "xfa/src/fxfa/src/fm2js/xfa_error.h" +#include "xfa/src/fxfa/src/fm2js/xfa_lexer.h" +#include "xfa/src/fxfa/src/fm2js/xfa_simpleexpression.h" +#include "xfa/src/fxfa/src/fm2js/xfa_expression.h" +#include "xfa/src/fxfa/src/fm2js/xfa_fmparse.h" +#include "xfa/src/fxfa/src/fm2js/xfa_program.h" +#include "xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.h" #endif // XFA_SRC_FXFA_SRC_FM2JS_XFA_FM2JS_H_ diff --git a/xfa/src/fxfa/src/fm2js/xfa_fm2jsapi.cpp b/xfa/src/fxfa/src/fm2js/xfa_fm2jsapi.cpp index f9759a8ba9..4aa39d8f09 100644 --- a/xfa/src/fxfa/src/fm2js/xfa_fm2jsapi.cpp +++ b/xfa/src/fxfa/src/fm2js/xfa_fm2jsapi.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa_fm2js.h" +#include "xfa/src/fxfa/src/fm2js/xfa_fm2js.h" #ifdef __cplusplus extern "C" { #endif diff --git a/xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.cpp b/xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.cpp index 77cf79bd7b..15d9531d8b 100644 --- a/xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.cpp +++ b/xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.cpp @@ -4,8 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa_fm2js.h" #include <time.h> + +#include "xfa/src/fxfa/src/fm2js/xfa_fm2js.h" + #define FINANCIAL_PRECISION 0.00000001 struct XFA_FMHtmlReserveCode { uint32_t m_uCode; diff --git a/xfa/src/fxfa/src/fm2js/xfa_fmparse.cpp b/xfa/src/fxfa/src/fm2js/xfa_fmparse.cpp index 105c5144ca..c8eb962325 100644 --- a/xfa/src/fxfa/src/fm2js/xfa_fmparse.cpp +++ b/xfa/src/fxfa/src/fm2js/xfa_fmparse.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa_fm2js.h" +#include "xfa/src/fxfa/src/fm2js/xfa_fm2js.h" CXFA_FMParse::CXFA_FMParse() : m_pToken(nullptr), m_pErrorInfo(0) {} diff --git a/xfa/src/fxfa/src/fm2js/xfa_lexer.cpp b/xfa/src/fxfa/src/fm2js/xfa_lexer.cpp index 2902f8c70b..b4af01f0c0 100644 --- a/xfa/src/fxfa/src/fm2js/xfa_lexer.cpp +++ b/xfa/src/fxfa/src/fm2js/xfa_lexer.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa_fm2js.h" +#include "xfa/src/fxfa/src/fm2js/xfa_fm2js.h" namespace { diff --git a/xfa/src/fxfa/src/fm2js/xfa_program.cpp b/xfa/src/fxfa/src/fm2js/xfa_program.cpp index b3aa475093..03462d2f01 100644 --- a/xfa/src/fxfa/src/fm2js/xfa_program.cpp +++ b/xfa/src/fxfa/src/fm2js/xfa_program.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa_fm2js.h" +#include "xfa/src/fxfa/src/fm2js/xfa_fm2js.h" CXFA_FMProgram::CXFA_FMProgram() : m_globalFunction(0) {} CXFA_FMProgram::~CXFA_FMProgram() { if (m_globalFunction != 0) { diff --git a/xfa/src/fxfa/src/fm2js/xfa_simpleexpression.cpp b/xfa/src/fxfa/src/fm2js/xfa_simpleexpression.cpp index 7048c38d5a..b0ce3ad4ca 100644 --- a/xfa/src/fxfa/src/fm2js/xfa_simpleexpression.cpp +++ b/xfa/src/fxfa/src/fm2js/xfa_simpleexpression.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa_fm2js.h" +#include "xfa/src/fxfa/src/fm2js/xfa_fm2js.h" static CFX_WideStringC gs_lpStrExpFuncName[] = { FX_WSTRC(L"foxit_xfa_formcalc_runtime.assign_value_operator"), FX_WSTRC(L"foxit_xfa_formcalc_runtime.logical_or_operator"), diff --git a/xfa/src/fxfa/src/parser/xfa_basic_data.cpp b/xfa/src/fxfa/src/parser/xfa_basic_data.cpp index 4216c25a14..6ee9259ceb 100644 --- a/xfa/src/fxfa/src/parser/xfa_basic_data.cpp +++ b/xfa/src/fxfa/src/parser/xfa_basic_data.cpp @@ -14,13 +14,13 @@ #include "xfa/src/fxfa/src/common/xfa_doclayout.h" #include "xfa/src/fxfa/src/common/xfa_localemgr.h" #include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" -#include "xfa_basic_imp.h" -#include "xfa_script_datawindow.h" -#include "xfa_script_eventpseudomodel.h" -#include "xfa_script_hostpseudomodel.h" -#include "xfa_script_logpseudomodel.h" -#include "xfa_script_layoutpseudomodel.h" -#include "xfa_script_signaturepseudomodel.h" +#include "xfa/src/fxfa/src/parser/xfa_basic_imp.h" +#include "xfa/src/fxfa/src/parser/xfa_script_datawindow.h" +#include "xfa/src/fxfa/src/parser/xfa_script_eventpseudomodel.h" +#include "xfa/src/fxfa/src/parser/xfa_script_hostpseudomodel.h" +#include "xfa/src/fxfa/src/parser/xfa_script_logpseudomodel.h" +#include "xfa/src/fxfa/src/parser/xfa_script_layoutpseudomodel.h" +#include "xfa/src/fxfa/src/parser/xfa_script_signaturepseudomodel.h" extern const XFA_ATTRIBUTEENUMINFO g_XFAEnumData[] = { {0x2a, L"*", XFA_ATTRIBUTEENUM_Asterisk}, {0x2f, L"/", XFA_ATTRIBUTEENUM_Slash}, diff --git a/xfa/src/fxfa/src/parser/xfa_basic_imp.cpp b/xfa/src/fxfa/src/parser/xfa_basic_imp.cpp index f06daa4021..83449b9f1f 100644 --- a/xfa/src/fxfa/src/parser/xfa_basic_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_basic_imp.cpp @@ -14,7 +14,7 @@ #include "xfa/src/fxfa/src/common/xfa_doclayout.h" #include "xfa/src/fxfa/src/common/xfa_localemgr.h" #include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" -#include "xfa_basic_imp.h" +#include "xfa/src/fxfa/src/parser/xfa_basic_imp.h" extern const XFA_PACKETINFO g_XFAPacketData[]; extern const int32_t g_iXFAPacketCount; extern const XFA_ATTRIBUTEENUMINFO g_XFAEnumData[]; diff --git a/xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.cpp b/xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.cpp index 5bf63449f7..37b5cc070a 100644 --- a/xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.cpp @@ -14,10 +14,10 @@ #include "xfa/src/fxfa/src/common/xfa_doclayout.h" #include "xfa/src/fxfa/src/common/xfa_localemgr.h" #include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" -#include "xfa_basic_imp.h" -#include "xfa_document_datadescription_imp.h" -#include "xfa_document_datamerger_imp.h" -#include "xfa_document_layout_imp.h" +#include "xfa/src/fxfa/src/parser/xfa_basic_imp.h" +#include "xfa/src/fxfa/src/parser/xfa_document_datadescription_imp.h" +#include "xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.h" +#include "xfa/src/fxfa/src/parser/xfa_document_layout_imp.h" static FX_BOOL XFA_GetOccurInfo(CXFA_Node* pOccurNode, int32_t& iMin, int32_t& iMax, diff --git a/xfa/src/fxfa/src/parser/xfa_document_imp.cpp b/xfa/src/fxfa/src/parser/xfa_document_imp.cpp index 6b7a0350e6..f010920685 100644 --- a/xfa/src/fxfa/src/parser/xfa_document_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_document_imp.cpp @@ -14,14 +14,14 @@ #include "xfa/src/fxfa/src/common/xfa_doclayout.h" #include "xfa/src/fxfa/src/common/xfa_localemgr.h" #include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" -#include "xfa_basic_imp.h" -#include "xfa_document_layout_imp.h" -#include "xfa_script_datawindow.h" -#include "xfa_script_eventpseudomodel.h" -#include "xfa_script_hostpseudomodel.h" -#include "xfa_script_logpseudomodel.h" -#include "xfa_script_layoutpseudomodel.h" -#include "xfa_script_signaturepseudomodel.h" +#include "xfa/src/fxfa/src/parser/xfa_basic_imp.h" +#include "xfa/src/fxfa/src/parser/xfa_document_layout_imp.h" +#include "xfa/src/fxfa/src/parser/xfa_script_datawindow.h" +#include "xfa/src/fxfa/src/parser/xfa_script_eventpseudomodel.h" +#include "xfa/src/fxfa/src/parser/xfa_script_hostpseudomodel.h" +#include "xfa/src/fxfa/src/parser/xfa_script_logpseudomodel.h" +#include "xfa/src/fxfa/src/parser/xfa_script_layoutpseudomodel.h" +#include "xfa/src/fxfa/src/parser/xfa_script_signaturepseudomodel.h" CXFA_Document::CXFA_Document(IXFA_DocParser* pParser) : m_pParser(pParser), m_pScriptContext(nullptr), diff --git a/xfa/src/fxfa/src/parser/xfa_document_layout_imp.cpp b/xfa/src/fxfa/src/parser/xfa_document_layout_imp.cpp index 1c47ccb009..179e85ce22 100644 --- a/xfa/src/fxfa/src/parser/xfa_document_layout_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_document_layout_imp.cpp @@ -14,12 +14,12 @@ #include "xfa/src/fxfa/src/common/xfa_doclayout.h" #include "xfa/src/fxfa/src/common/xfa_localemgr.h" #include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" -#include "xfa_basic_imp.h" -#include "xfa_document_layout_imp.h" -#include "xfa_document_datamerger_imp.h" -#include "xfa_layout_itemlayout.h" -#include "xfa_layout_pagemgr_new.h" -#include "xfa_layout_appadapter.h" +#include "xfa/src/fxfa/src/parser/xfa_basic_imp.h" +#include "xfa/src/fxfa/src/parser/xfa_document_layout_imp.h" +#include "xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.h" +#include "xfa/src/fxfa/src/parser/xfa_layout_itemlayout.h" +#include "xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.h" +#include "xfa/src/fxfa/src/parser/xfa_layout_appadapter.h" CXFA_LayoutProcessor* CXFA_Document::GetLayoutProcessor() { if (!m_pLayoutProcessor) { m_pLayoutProcessor = new CXFA_LayoutProcessor(this); diff --git a/xfa/src/fxfa/src/parser/xfa_document_serialize.cpp b/xfa/src/fxfa/src/parser/xfa_document_serialize.cpp index bba10ba74e..6624bc338f 100644 --- a/xfa/src/fxfa/src/parser/xfa_document_serialize.cpp +++ b/xfa/src/fxfa/src/parser/xfa_document_serialize.cpp @@ -14,7 +14,7 @@ #include "xfa/src/fxfa/src/common/xfa_doclayout.h" #include "xfa/src/fxfa/src/common/xfa_localemgr.h" #include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" -#include "xfa_document_serialize.h" +#include "xfa/src/fxfa/src/parser/xfa_document_serialize.h" IXFA_PacketImport* IXFA_PacketImport::Create(CXFA_Document* pDocument) { return new CXFA_DataImporter(pDocument); } diff --git a/xfa/src/fxfa/src/parser/xfa_layout_appadapter.cpp b/xfa/src/fxfa/src/parser/xfa_layout_appadapter.cpp index 855483bbae..5b4f87a693 100644 --- a/xfa/src/fxfa/src/parser/xfa_layout_appadapter.cpp +++ b/xfa/src/fxfa/src/parser/xfa_layout_appadapter.cpp @@ -14,10 +14,10 @@ #include "xfa/src/fxfa/src/common/xfa_doclayout.h" #include "xfa/src/fxfa/src/common/xfa_localemgr.h" #include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" -#include "xfa_document_layout_imp.h" -#include "xfa_layout_itemlayout.h" -#include "xfa_layout_pagemgr_new.h" -#include "xfa_layout_appadapter.h" +#include "xfa/src/fxfa/src/parser/xfa_document_layout_imp.h" +#include "xfa/src/fxfa/src/parser/xfa_layout_itemlayout.h" +#include "xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.h" +#include "xfa/src/fxfa/src/parser/xfa_layout_appadapter.h" FX_DWORD XFA_GetRelevant(CXFA_Node* pFormItem, FX_DWORD dwParentRelvant) { FX_DWORD dwRelevant = XFA_LAYOUTSTATUS_Viewable | XFA_LAYOUTSTATUS_Printable; CFX_WideStringC wsRelevant; diff --git a/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.cpp b/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.cpp index 6f2a5010a1..7e17b77213 100644 --- a/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.cpp +++ b/xfa/src/fxfa/src/parser/xfa_layout_itemlayout.cpp @@ -17,10 +17,10 @@ #include "xfa/src/fxfa/src/common/xfa_doclayout.h" #include "xfa/src/fxfa/src/common/xfa_localemgr.h" #include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" -#include "xfa_document_layout_imp.h" -#include "xfa_layout_itemlayout.h" -#include "xfa_layout_pagemgr_new.h" -#include "xfa_layout_appadapter.h" +#include "xfa/src/fxfa/src/parser/xfa_document_layout_imp.h" +#include "xfa/src/fxfa/src/parser/xfa_layout_itemlayout.h" +#include "xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.h" +#include "xfa/src/fxfa/src/parser/xfa_layout_appadapter.h" CXFA_ItemLayoutProcessor::CXFA_ItemLayoutProcessor(CXFA_Node* pNode, CXFA_LayoutPageMgr* pPageMgr) : m_bKeepBreakFinish(FALSE), diff --git a/xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.cpp b/xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.cpp index 5f30d75ad4..832e1ba5d1 100644 --- a/xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.cpp +++ b/xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.cpp @@ -14,11 +14,11 @@ #include "xfa/src/fxfa/src/common/xfa_doclayout.h" #include "xfa/src/fxfa/src/common/xfa_localemgr.h" #include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" -#include "xfa_document_datamerger_imp.h" -#include "xfa_document_layout_imp.h" -#include "xfa_layout_itemlayout.h" -#include "xfa_layout_pagemgr_new.h" -#include "xfa_layout_appadapter.h" +#include "xfa/src/fxfa/src/parser/xfa_document_datamerger_imp.h" +#include "xfa/src/fxfa/src/parser/xfa_document_layout_imp.h" +#include "xfa/src/fxfa/src/parser/xfa_layout_itemlayout.h" +#include "xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.h" +#include "xfa/src/fxfa/src/parser/xfa_layout_appadapter.h" CXFA_LayoutPageMgr::CXFA_LayoutPageMgr(CXFA_LayoutProcessor* pLayoutProcessor) : m_pLayoutProcessor(pLayoutProcessor), m_pTemplatePageSetRoot(nullptr), diff --git a/xfa/src/fxfa/src/parser/xfa_locale.cpp b/xfa/src/fxfa/src/parser/xfa_locale.cpp index b67a158f80..91e6dac2b7 100644 --- a/xfa/src/fxfa/src/parser/xfa_locale.cpp +++ b/xfa/src/fxfa/src/parser/xfa_locale.cpp @@ -15,7 +15,7 @@ #include "xfa/src/fxfa/src/common/xfa_doclayout.h" #include "xfa/src/fxfa/src/common/xfa_localemgr.h" #include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" -#include "xfa_locale.h" +#include "xfa/src/fxfa/src/parser/xfa_locale.h" static const FX_WCHAR* g_FX_Percent = L"z,zzz,zzz,zzz,zzz,zzz%"; static const FX_WCHAR* g_FX_Currency = L"$z,zzz,zzz,zzz,zzz,zz9.99"; diff --git a/xfa/src/fxfa/src/parser/xfa_localemgr.cpp b/xfa/src/fxfa/src/parser/xfa_localemgr.cpp index 82091e8f2e..fae2753b61 100644 --- a/xfa/src/fxfa/src/parser/xfa_localemgr.cpp +++ b/xfa/src/fxfa/src/parser/xfa_localemgr.cpp @@ -15,7 +15,7 @@ #include "xfa/src/fxfa/src/common/xfa_doclayout.h" #include "xfa/src/fxfa/src/common/xfa_localemgr.h" #include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" -#include "xfa_locale.h" +#include "xfa/src/fxfa/src/parser/xfa_locale.h" const uint8_t g_enUS_Locale[] = { 0x78, 0x9C, 0x95, 0x56, 0xD1, 0x6E, 0x9B, 0x30, 0x14, 0x7D, 0x9F, 0xB4, diff --git a/xfa/src/fxfa/src/parser/xfa_object_imp.cpp b/xfa/src/fxfa/src/parser/xfa_object_imp.cpp index 278ad85324..5329a358bd 100644 --- a/xfa/src/fxfa/src/parser/xfa_object_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_object_imp.cpp @@ -14,8 +14,8 @@ #include "xfa/src/fxfa/src/common/xfa_doclayout.h" #include "xfa/src/fxfa/src/common/xfa_localemgr.h" #include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" -#include "xfa_basic_imp.h" -#include "xfa_document_layout_imp.h" +#include "xfa/src/fxfa/src/parser/xfa_basic_imp.h" +#include "xfa/src/fxfa/src/parser/xfa_document_layout_imp.h" CXFA_Object::CXFA_Object(CXFA_Document* pDocument, FX_DWORD uFlags) : m_pDocument(pDocument), m_uFlags(uFlags) {} void CXFA_Object::GetClassName(CFX_WideStringC& wsName) const { diff --git a/xfa/src/fxfa/src/parser/xfa_parser_imp.cpp b/xfa/src/fxfa/src/parser/xfa_parser_imp.cpp index 01b12d5cae..a2c05044a8 100644 --- a/xfa/src/fxfa/src/parser/xfa_parser_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_parser_imp.cpp @@ -14,8 +14,8 @@ #include "xfa/src/fxfa/src/common/xfa_doclayout.h" #include "xfa/src/fxfa/src/common/xfa_localemgr.h" #include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" -#include "xfa_basic_imp.h" -#include "xfa_parser_imp.h" +#include "xfa/src/fxfa/src/parser/xfa_basic_imp.h" +#include "xfa/src/fxfa/src/parser/xfa_parser_imp.h" IXFA_Parser* IXFA_Parser::Create(IXFA_ObjFactory* pFactory, FX_BOOL bDocumentParser) { return new CXFA_SimpleParser(pFactory, bDocumentParser); diff --git a/xfa/src/fxfa/src/parser/xfa_script_datawindow.cpp b/xfa/src/fxfa/src/parser/xfa_script_datawindow.cpp index d81c558102..03fbaf8b26 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_datawindow.cpp +++ b/xfa/src/fxfa/src/parser/xfa_script_datawindow.cpp @@ -14,7 +14,7 @@ #include "xfa/src/fxfa/src/common/xfa_doclayout.h" #include "xfa/src/fxfa/src/common/xfa_localemgr.h" #include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" -#include "xfa_script_datawindow.h" +#include "xfa/src/fxfa/src/parser/xfa_script_datawindow.h" CScript_DataWindow::CScript_DataWindow(CXFA_Document* pDocument) : CXFA_OrdinaryObject(pDocument, XFA_ELEMENT_DataWindow) { m_uScriptHash = XFA_HASHCODE_DataWindow; diff --git a/xfa/src/fxfa/src/parser/xfa_script_eventpseudomodel.cpp b/xfa/src/fxfa/src/parser/xfa_script_eventpseudomodel.cpp index 0c2fb8b6b0..b5c5f0126d 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_eventpseudomodel.cpp +++ b/xfa/src/fxfa/src/parser/xfa_script_eventpseudomodel.cpp @@ -14,7 +14,7 @@ #include "xfa/src/fxfa/src/common/xfa_doclayout.h" #include "xfa/src/fxfa/src/common/xfa_localemgr.h" #include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" -#include "xfa_script_eventpseudomodel.h" +#include "xfa/src/fxfa/src/parser/xfa_script_eventpseudomodel.h" CScript_EventPseudoModel::CScript_EventPseudoModel(CXFA_Document* pDocument) : CXFA_OrdinaryObject(pDocument, XFA_ELEMENT_EventPseudoModel) { m_uScriptHash = XFA_HASHCODE_Event; diff --git a/xfa/src/fxfa/src/parser/xfa_script_hostpseudomodel.cpp b/xfa/src/fxfa/src/parser/xfa_script_hostpseudomodel.cpp index ee42d5a4fc..9f65c52d3e 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_hostpseudomodel.cpp +++ b/xfa/src/fxfa/src/parser/xfa_script_hostpseudomodel.cpp @@ -14,7 +14,7 @@ #include "xfa/src/fxfa/src/common/xfa_doclayout.h" #include "xfa/src/fxfa/src/common/xfa_localemgr.h" #include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" -#include "xfa_script_hostpseudomodel.h" +#include "xfa/src/fxfa/src/parser/xfa_script_hostpseudomodel.h" CScript_HostPseudoModel::CScript_HostPseudoModel(CXFA_Document* pDocument) : CXFA_OrdinaryObject(pDocument, XFA_ELEMENT_HostPseudoModel) { m_uScriptHash = XFA_HASHCODE_Host; diff --git a/xfa/src/fxfa/src/parser/xfa_script_imp.cpp b/xfa/src/fxfa/src/parser/xfa_script_imp.cpp index 4b808a4739..f5c1673460 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_script_imp.cpp @@ -14,9 +14,9 @@ #include "xfa/src/fxfa/src/common/xfa_doclayout.h" #include "xfa/src/fxfa/src/common/xfa_localemgr.h" #include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" -#include "xfa_script_imp.h" -#include "xfa_script_resolveprocessor.h" -#include "xfa_script_nodehelper.h" +#include "xfa/src/fxfa/src/parser/xfa_script_imp.h" +#include "xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.h" +#include "xfa/src/fxfa/src/parser/xfa_script_nodehelper.h" CXFA_ScriptContext::CXFA_ScriptContext(CXFA_Document* pDocument) : m_pDocument(pDocument), m_hJsContext(nullptr), diff --git a/xfa/src/fxfa/src/parser/xfa_script_layoutpseudomodel.cpp b/xfa/src/fxfa/src/parser/xfa_script_layoutpseudomodel.cpp index d2a9212b05..fdeb0de167 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_layoutpseudomodel.cpp +++ b/xfa/src/fxfa/src/parser/xfa_script_layoutpseudomodel.cpp @@ -14,9 +14,9 @@ #include "xfa/src/fxfa/src/common/xfa_doclayout.h" #include "xfa/src/fxfa/src/common/xfa_localemgr.h" #include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" -#include "xfa_script_layoutpseudomodel.h" -#include "xfa_document_layout_imp.h" -#include "xfa_layout_appadapter.h" +#include "xfa/src/fxfa/src/parser/xfa_script_layoutpseudomodel.h" +#include "xfa/src/fxfa/src/parser/xfa_document_layout_imp.h" +#include "xfa/src/fxfa/src/parser/xfa_layout_appadapter.h" CScript_LayoutPseudoModel::CScript_LayoutPseudoModel(CXFA_Document* pDocument) : CXFA_OrdinaryObject(pDocument, XFA_ELEMENT_LayoutPseudoModel) { m_uScriptHash = XFA_HASHCODE_Layout; diff --git a/xfa/src/fxfa/src/parser/xfa_script_logpseudomodel.cpp b/xfa/src/fxfa/src/parser/xfa_script_logpseudomodel.cpp index fe1d9bc0c4..94c0f0b3a7 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_logpseudomodel.cpp +++ b/xfa/src/fxfa/src/parser/xfa_script_logpseudomodel.cpp @@ -14,7 +14,7 @@ #include "xfa/src/fxfa/src/common/xfa_doclayout.h" #include "xfa/src/fxfa/src/common/xfa_localemgr.h" #include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" -#include "xfa_script_logpseudomodel.h" +#include "xfa/src/fxfa/src/parser/xfa_script_logpseudomodel.h" CScript_LogPseudoModel::CScript_LogPseudoModel(CXFA_Document* pDocument) : CXFA_OrdinaryObject(pDocument, XFA_ELEMENT_LogPseudoModel) { m_uScriptHash = XFA_HASHCODE_Log; diff --git a/xfa/src/fxfa/src/parser/xfa_script_nodehelper.cpp b/xfa/src/fxfa/src/parser/xfa_script_nodehelper.cpp index 7ef7382f69..f5e5b726f7 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_nodehelper.cpp +++ b/xfa/src/fxfa/src/parser/xfa_script_nodehelper.cpp @@ -14,8 +14,8 @@ #include "xfa/src/fxfa/src/common/xfa_doclayout.h" #include "xfa/src/fxfa/src/common/xfa_localemgr.h" #include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" -#include "xfa_script_nodehelper.h" -#include "xfa_script_imp.h" +#include "xfa/src/fxfa/src/parser/xfa_script_nodehelper.h" +#include "xfa/src/fxfa/src/parser/xfa_script_imp.h" CXFA_NodeHelper::CXFA_NodeHelper(void) : m_eLastCreateType(XFA_ELEMENT_DataValue), m_pCreateParent(NULL), diff --git a/xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.cpp b/xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.cpp index 6df0866a0b..d54846fc29 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.cpp +++ b/xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.cpp @@ -14,9 +14,9 @@ #include "xfa/src/fxfa/src/common/xfa_doclayout.h" #include "xfa/src/fxfa/src/common/xfa_localemgr.h" #include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" -#include "xfa_script_resolveprocessor.h" -#include "xfa_script_nodehelper.h" -#include "xfa_script_imp.h" +#include "xfa/src/fxfa/src/parser/xfa_script_resolveprocessor.h" +#include "xfa/src/fxfa/src/parser/xfa_script_nodehelper.h" +#include "xfa/src/fxfa/src/parser/xfa_script_imp.h" CXFA_ResolveProcessor::CXFA_ResolveProcessor(void) : m_pNodeHelper(NULL), m_iCurStart(0) { m_pNodeHelper = new CXFA_NodeHelper; diff --git a/xfa/src/fxfa/src/parser/xfa_script_signaturepseudomodel.cpp b/xfa/src/fxfa/src/parser/xfa_script_signaturepseudomodel.cpp index b0f112ae90..68dbc16b9b 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_signaturepseudomodel.cpp +++ b/xfa/src/fxfa/src/parser/xfa_script_signaturepseudomodel.cpp @@ -14,7 +14,7 @@ #include "xfa/src/fxfa/src/common/xfa_doclayout.h" #include "xfa/src/fxfa/src/common/xfa_localemgr.h" #include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h" -#include "xfa_script_signaturepseudomodel.h" +#include "xfa/src/fxfa/src/parser/xfa_script_signaturepseudomodel.h" CScript_SignaturePseudoModel::CScript_SignaturePseudoModel( CXFA_Document* pDocument) : CXFA_OrdinaryObject(pDocument, XFA_ELEMENT_SignaturePseudoModel) { diff --git a/xfa/src/fxgraphics/src/fx_graphics.cpp b/xfa/src/fxgraphics/src/fx_graphics.cpp index fae8aab006..03873398de 100644 --- a/xfa/src/fxgraphics/src/fx_graphics.cpp +++ b/xfa/src/fxgraphics/src/fx_graphics.cpp @@ -6,8 +6,8 @@ #include <memory> -#include "fx_path_generator.h" -#include "pre.h" +#include "xfa/src/fxgraphics/src/fx_path_generator.h" +#include "xfa/src/fxgraphics/src/pre.h" class CAGG_Graphics { public: diff --git a/xfa/src/fxgraphics/src/fx_path_generator.cpp b/xfa/src/fxgraphics/src/fx_path_generator.cpp index 3df5532309..630059cd3e 100644 --- a/xfa/src/fxgraphics/src/fx_path_generator.cpp +++ b/xfa/src/fxgraphics/src/fx_path_generator.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "pre.h" -#include "fx_path_generator.h" +#include "xfa/src/fxgraphics/src/pre.h" +#include "xfa/src/fxgraphics/src/fx_path_generator.h" CFX_PathGenerator::CFX_PathGenerator() { m_pPathData = NULL; } diff --git a/xfa/src/fxjse/src/class.cpp b/xfa/src/fxjse/src/class.cpp index 844241ab30..6cf90efb1a 100644 --- a/xfa/src/fxjse/src/class.cpp +++ b/xfa/src/fxjse/src/class.cpp @@ -5,12 +5,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "fxv8.h" -#include "context.h" -#include "class.h" -#include "value.h" -#include "scope_inline.h" -#include "util_inline.h" +#include "xfa/src/fxjse/src/fxv8.h" +#include "xfa/src/fxjse/src/context.h" +#include "xfa/src/fxjse/src/class.h" +#include "xfa/src/fxjse/src/value.h" +#include "xfa/src/fxjse/src/scope_inline.h" +#include "xfa/src/fxjse/src/util_inline.h" static void FXJSE_V8ConstructorCallback_Wrapper( const v8::FunctionCallbackInfo<v8::Value>& info); static void FXJSE_V8FunctionCallback_Wrapper( diff --git a/xfa/src/fxjse/src/context.cpp b/xfa/src/fxjse/src/context.cpp index 7e214d5b89..6161802e08 100644 --- a/xfa/src/fxjse/src/context.cpp +++ b/xfa/src/fxjse/src/context.cpp @@ -5,12 +5,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "fxv8.h" -#include "context.h" -#include "class.h" -#include "value.h" -#include "scope_inline.h" -#include "util_inline.h" +#include "xfa/src/fxjse/src/fxv8.h" +#include "xfa/src/fxjse/src/context.h" +#include "xfa/src/fxjse/src/class.h" +#include "xfa/src/fxjse/src/value.h" +#include "xfa/src/fxjse/src/scope_inline.h" +#include "xfa/src/fxjse/src/util_inline.h" FXJSE_HCONTEXT FXJSE_Context_Create(FXJSE_HRUNTIME hRuntime, const FXJSE_CLASS* lpGlobalClass, void* lpGlobalObject) { diff --git a/xfa/src/fxjse/src/dynprop.cpp b/xfa/src/fxjse/src/dynprop.cpp index 10f90a4ea5..3ae5279345 100644 --- a/xfa/src/fxjse/src/dynprop.cpp +++ b/xfa/src/fxjse/src/dynprop.cpp @@ -5,9 +5,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "xfa/src/foxitlib.h" -#include "fxv8.h" -#include "class.h" -#include "value.h" +#include "xfa/src/fxjse/src/fxv8.h" +#include "xfa/src/fxjse/src/class.h" +#include "xfa/src/fxjse/src/value.h" static void FXJSE_DynPropGetterAdapter_MethodCallback( const v8::FunctionCallbackInfo<v8::Value>& info) { v8::Local<v8::Object> hCallBackInfo = info.Data().As<v8::Object>(); diff --git a/xfa/src/fxjse/src/runtime.cpp b/xfa/src/fxjse/src/runtime.cpp index 72e221226d..3553a9a443 100644 --- a/xfa/src/fxjse/src/runtime.cpp +++ b/xfa/src/fxjse/src/runtime.cpp @@ -6,9 +6,9 @@ #include "fpdfsdk/include/jsapi/fxjs_v8.h" // For per-isolate data. #include "xfa/src/foxitlib.h" -#include "fxv8.h" -#include "runtime.h" -#include "scope_inline.h" +#include "xfa/src/fxjse/src/fxv8.h" +#include "xfa/src/fxjse/src/runtime.h" +#include "xfa/src/fxjse/src/scope_inline.h" // Duplicates fpdfsdk's JS_Runtime.h, but keeps XFA from depending on it. // TODO(tsepez): make a single version of this. diff --git a/xfa/src/fxjse/src/scope_inline.h b/xfa/src/fxjse/src/scope_inline.h index fdce7b37b5..77ddfa369e 100644 --- a/xfa/src/fxjse/src/scope_inline.h +++ b/xfa/src/fxjse/src/scope_inline.h @@ -7,8 +7,8 @@ #ifndef XFA_SRC_FXJSE_SRC_SCOPE_INLINE_H_ #define XFA_SRC_FXJSE_SRC_SCOPE_INLINE_H_ -#include "runtime.h" -#include "context.h" +#include "xfa/src/fxjse/src/runtime.h" +#include "xfa/src/fxjse/src/context.h" class CFXJSE_ScopeUtil_IsolateHandle { protected: diff --git a/xfa/src/fxjse/src/value.cpp b/xfa/src/fxjse/src/value.cpp index 35c6169332..325996ff11 100644 --- a/xfa/src/fxjse/src/value.cpp +++ b/xfa/src/fxjse/src/value.cpp @@ -4,12 +4,14 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/foxitlib.h" -#include "fxv8.h" -#include "value.h" -#include "class.h" #include <math.h> -#include "util_inline.h" + +#include "xfa/src/foxitlib.h" +#include "xfa/src/fxjse/src/fxv8.h" +#include "xfa/src/fxjse/src/value.h" +#include "xfa/src/fxjse/src/class.h" +#include "xfa/src/fxjse/src/util_inline.h" + FX_BOOL FXJSE_Value_IsUndefined(FXJSE_HVALUE hValue) { CFXJSE_Value* lpValue = reinterpret_cast<CFXJSE_Value*>(hValue); return lpValue && lpValue->IsUndefined(); diff --git a/xfa/src/fxjse/src/value.h b/xfa/src/fxjse/src/value.h index ad79e9f0c0..4bda30d6df 100644 --- a/xfa/src/fxjse/src/value.h +++ b/xfa/src/fxjse/src/value.h @@ -7,7 +7,7 @@ #ifndef XFA_SRC_FXJSE_SRC_VALUE_H_ #define XFA_SRC_FXJSE_SRC_VALUE_H_ -#include "scope_inline.h" +#include "xfa/src/fxjse/src/scope_inline.h" class CFXJSE_Value { public: |