summaryrefslogtreecommitdiff
path: root/core/fpdfapi/fpdf_font
diff options
context:
space:
mode:
authordsinclair <dsinclair@chromium.org>2016-09-29 11:58:38 -0700
committerCommit bot <commit-bot@chromium.org>2016-09-29 11:58:38 -0700
commit166bc16e15a5be72fe19da97504b4837967333ff (patch)
treeec6d5e2e997840e51fc10d7bc9f709448bdb9152 /core/fpdfapi/fpdf_font
parent1771a71f8140944eafa66f0e1f0779de4c0631af (diff)
downloadpdfium-166bc16e15a5be72fe19da97504b4837967333ff.tar.xz
Move core/fpdfapi/fpdf_font/include to core/fpdfapi/fpdf_font
BUG=pdfium:611 Review-Url: https://codereview.chromium.org/2375283003
Diffstat (limited to 'core/fpdfapi/fpdf_font')
-rw-r--r--core/fpdfapi/fpdf_font/cpdf_cidfont.cpp2
-rw-r--r--core/fpdfapi/fpdf_font/cpdf_cidfont.h2
-rw-r--r--core/fpdfapi/fpdf_font/cpdf_font.cpp4
-rw-r--r--core/fpdfapi/fpdf_font/cpdf_font.h (renamed from core/fpdfapi/fpdf_font/include/cpdf_font.h)6
-rw-r--r--core/fpdfapi/fpdf_font/cpdf_fontencoding.cpp2
-rw-r--r--core/fpdfapi/fpdf_font/cpdf_fontencoding.h (renamed from core/fpdfapi/fpdf_font/include/cpdf_fontencoding.h)6
-rw-r--r--core/fpdfapi/fpdf_font/cpdf_simplefont.h4
7 files changed, 13 insertions, 13 deletions
diff --git a/core/fpdfapi/fpdf_font/cpdf_cidfont.cpp b/core/fpdfapi/fpdf_font/cpdf_cidfont.cpp
index dbad4e547a..03bf2c45fc 100644
--- a/core/fpdfapi/fpdf_font/cpdf_cidfont.cpp
+++ b/core/fpdfapi/fpdf_font/cpdf_cidfont.cpp
@@ -10,8 +10,8 @@
#include <vector>
#include "core/fpdfapi/fpdf_cmaps/cmap_int.h"
+#include "core/fpdfapi/fpdf_font/cpdf_fontencoding.h"
#include "core/fpdfapi/fpdf_font/font_int.h"
-#include "core/fpdfapi/fpdf_font/include/cpdf_fontencoding.h"
#include "core/fpdfapi/fpdf_font/ttgsubtable.h"
#include "core/fpdfapi/fpdf_page/cpdf_pagemodule.h"
#include "core/fpdfapi/fpdf_parser/include/cpdf_array.h"
diff --git a/core/fpdfapi/fpdf_font/cpdf_cidfont.h b/core/fpdfapi/fpdf_font/cpdf_cidfont.h
index 400bcca8c6..c79e97bdf2 100644
--- a/core/fpdfapi/fpdf_font/cpdf_cidfont.h
+++ b/core/fpdfapi/fpdf_font/cpdf_cidfont.h
@@ -9,7 +9,7 @@
#include <memory>
-#include "core/fpdfapi/fpdf_font/include/cpdf_font.h"
+#include "core/fpdfapi/fpdf_font/cpdf_font.h"
#include "core/fxcrt/include/fx_string.h"
#include "core/fxcrt/include/fx_system.h"
diff --git a/core/fpdfapi/fpdf_font/cpdf_font.cpp b/core/fpdfapi/fpdf_font/cpdf_font.cpp
index 5d89752714..15fb4c5add 100644
--- a/core/fpdfapi/fpdf_font/cpdf_font.cpp
+++ b/core/fpdfapi/fpdf_font/cpdf_font.cpp
@@ -4,16 +4,16 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "core/fpdfapi/fpdf_font/include/cpdf_font.h"
+#include "core/fpdfapi/fpdf_font/cpdf_font.h"
#include <memory>
#include <vector>
+#include "core/fpdfapi/fpdf_font/cpdf_fontencoding.h"
#include "core/fpdfapi/fpdf_font/cpdf_truetypefont.h"
#include "core/fpdfapi/fpdf_font/cpdf_type1font.h"
#include "core/fpdfapi/fpdf_font/cpdf_type3font.h"
#include "core/fpdfapi/fpdf_font/font_int.h"
-#include "core/fpdfapi/fpdf_font/include/cpdf_fontencoding.h"
#include "core/fpdfapi/fpdf_page/cpdf_pagemodule.h"
#include "core/fpdfapi/fpdf_page/pageint.h"
#include "core/fpdfapi/fpdf_parser/include/cpdf_array.h"
diff --git a/core/fpdfapi/fpdf_font/include/cpdf_font.h b/core/fpdfapi/fpdf_font/cpdf_font.h
index f3985546fe..f94758c309 100644
--- a/core/fpdfapi/fpdf_font/include/cpdf_font.h
+++ b/core/fpdfapi/fpdf_font/cpdf_font.h
@@ -4,8 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef CORE_FPDFAPI_FPDF_FONT_INCLUDE_CPDF_FONT_H_
-#define CORE_FPDFAPI_FPDF_FONT_INCLUDE_CPDF_FONT_H_
+#ifndef CORE_FPDFAPI_FPDF_FONT_CPDF_FONT_H_
+#define CORE_FPDFAPI_FPDF_FONT_CPDF_FONT_H_
#include <memory>
#include <vector>
@@ -129,4 +129,4 @@ class CPDF_Font {
int m_ItalicAngle;
};
-#endif // CORE_FPDFAPI_FPDF_FONT_INCLUDE_CPDF_FONT_H_
+#endif // CORE_FPDFAPI_FPDF_FONT_CPDF_FONT_H_
diff --git a/core/fpdfapi/fpdf_font/cpdf_fontencoding.cpp b/core/fpdfapi/fpdf_font/cpdf_fontencoding.cpp
index d0e5f16aea..dbe31b57c5 100644
--- a/core/fpdfapi/fpdf_font/cpdf_fontencoding.cpp
+++ b/core/fpdfapi/fpdf_font/cpdf_fontencoding.cpp
@@ -4,7 +4,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "core/fpdfapi/fpdf_font/include/cpdf_fontencoding.h"
+#include "core/fpdfapi/fpdf_font/cpdf_fontencoding.h"
#include "core/fpdfapi/fpdf_parser/include/cpdf_array.h"
#include "core/fpdfapi/fpdf_parser/include/cpdf_dictionary.h"
diff --git a/core/fpdfapi/fpdf_font/include/cpdf_fontencoding.h b/core/fpdfapi/fpdf_font/cpdf_fontencoding.h
index 8ded0ac708..da0f262fc4 100644
--- a/core/fpdfapi/fpdf_font/include/cpdf_fontencoding.h
+++ b/core/fpdfapi/fpdf_font/cpdf_fontencoding.h
@@ -4,8 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef CORE_FPDFAPI_FPDF_FONT_INCLUDE_CPDF_FONTENCODING_H_
-#define CORE_FPDFAPI_FPDF_FONT_INCLUDE_CPDF_FONTENCODING_H_
+#ifndef CORE_FPDFAPI_FPDF_FONT_CPDF_FONTENCODING_H_
+#define CORE_FPDFAPI_FPDF_FONT_CPDF_FONTENCODING_H_
#include "core/fxcrt/include/cfx_string_pool_template.h"
#include "core/fxcrt/include/cfx_weak_ptr.h"
@@ -58,4 +58,4 @@ class CPDF_FontEncoding {
FX_WCHAR m_Unicodes[256];
};
-#endif // CORE_FPDFAPI_FPDF_FONT_INCLUDE_CPDF_FONTENCODING_H_
+#endif // CORE_FPDFAPI_FPDF_FONT_CPDF_FONTENCODING_H_
diff --git a/core/fpdfapi/fpdf_font/cpdf_simplefont.h b/core/fpdfapi/fpdf_font/cpdf_simplefont.h
index 40a4baeeb8..0d4da46351 100644
--- a/core/fpdfapi/fpdf_font/cpdf_simplefont.h
+++ b/core/fpdfapi/fpdf_font/cpdf_simplefont.h
@@ -9,8 +9,8 @@
#include <vector>
-#include "core/fpdfapi/fpdf_font/include/cpdf_font.h"
-#include "core/fpdfapi/fpdf_font/include/cpdf_fontencoding.h"
+#include "core/fpdfapi/fpdf_font/cpdf_font.h"
+#include "core/fpdfapi/fpdf_font/cpdf_fontencoding.h"
#include "core/fxcrt/include/fx_string.h"
#include "core/fxcrt/include/fx_system.h"