diff options
| -rw-r--r-- | BUILD.gn | 8 | ||||
| -rw-r--r-- | xfa.gyp | 8 | ||||
| -rw-r--r-- | xfa/src/fxgraphics/fx_graphics.cpp (renamed from xfa/src/fxgraphics/src/fx_graphics.cpp) | 7 | ||||
| -rw-r--r-- | xfa/src/fxgraphics/fx_path_generator.cpp (renamed from xfa/src/fxgraphics/src/fx_path_generator.cpp) | 6 | ||||
| -rw-r--r-- | xfa/src/fxgraphics/fx_path_generator.h (renamed from xfa/src/fxgraphics/src/fx_path_generator.h) | 6 | ||||
| -rw-r--r-- | xfa/src/fxgraphics/pre.h (renamed from xfa/src/fxgraphics/src/pre.h) | 6 |
6 files changed, 22 insertions, 19 deletions
@@ -1375,10 +1375,10 @@ if (pdf_enable_xfa) { "xfa/src/fxfa/parser/xfa_script_signaturepseudomodel.h", "xfa/src/fxfa/parser/xfa_utils.h", "xfa/src/fxfa/parser/xfa_utils_imp.cpp", - "xfa/src/fxgraphics/src/fx_graphics.cpp", - "xfa/src/fxgraphics/src/fx_path_generator.cpp", - "xfa/src/fxgraphics/src/fx_path_generator.h", - "xfa/src/fxgraphics/src/pre.h", + "xfa/src/fxgraphics/fx_graphics.cpp", + "xfa/src/fxgraphics/fx_path_generator.cpp", + "xfa/src/fxgraphics/fx_path_generator.h", + "xfa/src/fxgraphics/pre.h", ] include_dirs = [ "." ] if (pdf_enable_v8) { @@ -649,10 +649,10 @@ "xfa/src/fxfa/parser/xfa_script_signaturepseudomodel.h", "xfa/src/fxfa/parser/xfa_utils.h", "xfa/src/fxfa/parser/xfa_utils_imp.cpp", - "xfa/src/fxgraphics/src/fx_graphics.cpp", - "xfa/src/fxgraphics/src/fx_path_generator.cpp", - "xfa/src/fxgraphics/src/fx_path_generator.h", - "xfa/src/fxgraphics/src/pre.h", + "xfa/src/fxgraphics/fx_graphics.cpp", + "xfa/src/fxgraphics/fx_path_generator.cpp", + "xfa/src/fxgraphics/fx_path_generator.h", + "xfa/src/fxgraphics/pre.h", ], "conditions": [ ["clang==1" , { diff --git a/xfa/src/fxgraphics/src/fx_graphics.cpp b/xfa/src/fxgraphics/fx_graphics.cpp index 602382725f..249c72e73f 100644 --- a/xfa/src/fxgraphics/src/fx_graphics.cpp +++ b/xfa/src/fxgraphics/fx_graphics.cpp @@ -4,11 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "xfa/include/fxgraphics/fx_graphics.h" + #include <memory> -#include "xfa/include/fxgraphics/fx_graphics.h" -#include "xfa/src/fxgraphics/src/fx_path_generator.h" -#include "xfa/src/fxgraphics/src/pre.h" +#include "xfa/src/fxgraphics/fx_path_generator.h" +#include "xfa/src/fxgraphics/pre.h" class CAGG_Graphics { public: diff --git a/xfa/src/fxgraphics/src/fx_path_generator.cpp b/xfa/src/fxgraphics/fx_path_generator.cpp index 1174a5fb45..8b0bab00da 100644 --- a/xfa/src/fxgraphics/src/fx_path_generator.cpp +++ b/xfa/src/fxgraphics/fx_path_generator.cpp @@ -4,8 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/src/fxgraphics/src/fx_path_generator.h" -#include "xfa/src/fxgraphics/src/pre.h" +#include "xfa/src/fxgraphics/fx_path_generator.h" + +#include "xfa/src/fxgraphics/pre.h" + CFX_PathGenerator::CFX_PathGenerator() { m_pPathData = NULL; } diff --git a/xfa/src/fxgraphics/src/fx_path_generator.h b/xfa/src/fxgraphics/fx_path_generator.h index 76e416fd55..b8253961de 100644 --- a/xfa/src/fxgraphics/src/fx_path_generator.h +++ b/xfa/src/fxgraphics/fx_path_generator.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef XFA_SRC_FXGRAPHICS_SRC_FX_PATH_GENERATOR_H_ -#define XFA_SRC_FXGRAPHICS_SRC_FX_PATH_GENERATOR_H_ +#ifndef XFA_SRC_FXGRAPHICS_FX_PATH_GENERATOR_H_ +#define XFA_SRC_FXGRAPHICS_FX_PATH_GENERATOR_H_ #include "core/include/fxge/fx_ge.h" @@ -61,4 +61,4 @@ class CFX_PathGenerator { CFX_PathData* m_pPathData; }; -#endif // XFA_SRC_FXGRAPHICS_SRC_FX_PATH_GENERATOR_H_ +#endif // XFA_SRC_FXGRAPHICS_FX_PATH_GENERATOR_H_ diff --git a/xfa/src/fxgraphics/src/pre.h b/xfa/src/fxgraphics/pre.h index 582d999d7e..625df394d7 100644 --- a/xfa/src/fxgraphics/src/pre.h +++ b/xfa/src/fxgraphics/pre.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef XFA_SRC_FXGRAPHICS_SRC_PRE_H_ -#define XFA_SRC_FXGRAPHICS_SRC_PRE_H_ +#ifndef XFA_SRC_FXGRAPHICS_PRE_H_ +#define XFA_SRC_FXGRAPHICS_PRE_H_ enum { FX_CONTEXT_None = 0, @@ -583,4 +583,4 @@ static const FX_HATCHDATA hatchBitmapData[FX_HATCHSTYLE_Total] = { #else #endif -#endif // XFA_SRC_FXGRAPHICS_SRC_PRE_H_ +#endif // XFA_SRC_FXGRAPHICS_PRE_H_ |