summaryrefslogtreecommitdiff
path: root/core/fxge/dib
diff options
context:
space:
mode:
authordsinclair <dsinclair@chromium.org>2016-09-29 16:41:42 -0700
committerCommit bot <commit-bot@chromium.org>2016-09-29 16:41:42 -0700
commit74a34fc71ab02400a4c958709138302a1ab4c0e7 (patch)
treeab987bfd6c92679843c030654f62e2fb9ecf45b3 /core/fxge/dib
parenta52ab741019342fbca0468e43a01deb44fa5f1bd (diff)
downloadpdfium-74a34fc71ab02400a4c958709138302a1ab4c0e7.tar.xz
Move core/fxge/include to core/fxge
BUG=pdfium:611 Review-Url: https://codereview.chromium.org/2377393002
Diffstat (limited to 'core/fxge/dib')
-rw-r--r--core/fxge/dib/dib_int.h2
-rw-r--r--core/fxge/dib/fx_dib_composite.cpp2
-rw-r--r--core/fxge/dib/fx_dib_convert.cpp2
-rw-r--r--core/fxge/dib/fx_dib_engine.cpp2
-rw-r--r--core/fxge/dib/fx_dib_engine_unittest.cpp2
-rw-r--r--core/fxge/dib/fx_dib_main.cpp4
-rw-r--r--core/fxge/dib/fx_dib_transform.cpp2
7 files changed, 8 insertions, 8 deletions
diff --git a/core/fxge/dib/dib_int.h b/core/fxge/dib/dib_int.h
index 0a679e2f5f..aa79b73154 100644
--- a/core/fxge/dib/dib_int.h
+++ b/core/fxge/dib/dib_int.h
@@ -10,7 +10,7 @@
#include <stdint.h>
#include "core/fxcrt/fx_coordinates.h"
-#include "core/fxge/include/fx_dib.h"
+#include "core/fxge/fx_dib.h"
class IFX_ScanlineComposer;
diff --git a/core/fxge/dib/fx_dib_composite.cpp b/core/fxge/dib/fx_dib_composite.cpp
index fa4cc783df..d180b7a831 100644
--- a/core/fxge/dib/fx_dib_composite.cpp
+++ b/core/fxge/dib/fx_dib_composite.cpp
@@ -5,9 +5,9 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
#include "core/fxcodec/fx_codec.h"
+#include "core/fxge/cfx_gemodule.h"
#include "core/fxge/dib/dib_int.h"
#include "core/fxge/ge/cfx_cliprgn.h"
-#include "core/fxge/include/cfx_gemodule.h"
namespace {
diff --git a/core/fxge/dib/fx_dib_convert.cpp b/core/fxge/dib/fx_dib_convert.cpp
index 829c2113f1..e3ee626fff 100644
--- a/core/fxge/dib/fx_dib_convert.cpp
+++ b/core/fxge/dib/fx_dib_convert.cpp
@@ -5,7 +5,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
#include "core/fxcodec/fx_codec.h"
-#include "core/fxge/include/fx_dib.h"
+#include "core/fxge/fx_dib.h"
class CFX_Palette {
public:
diff --git a/core/fxge/dib/fx_dib_engine.cpp b/core/fxge/dib/fx_dib_engine.cpp
index e8401d7663..c8e9558888 100644
--- a/core/fxge/dib/fx_dib_engine.cpp
+++ b/core/fxge/dib/fx_dib_engine.cpp
@@ -9,7 +9,7 @@
#include <algorithm>
#include "core/fxge/dib/dib_int.h"
-#include "core/fxge/include/fx_dib.h"
+#include "core/fxge/fx_dib.h"
namespace {
diff --git a/core/fxge/dib/fx_dib_engine_unittest.cpp b/core/fxge/dib/fx_dib_engine_unittest.cpp
index eed6b52194..105c342a0f 100644
--- a/core/fxge/dib/fx_dib_engine_unittest.cpp
+++ b/core/fxge/dib/fx_dib_engine_unittest.cpp
@@ -10,7 +10,7 @@
#include "core/fpdfapi/fpdf_render/render_int.h"
#include "core/fxcrt/fx_memory.h"
#include "core/fxge/dib/dib_int.h"
-#include "core/fxge/include/fx_dib.h"
+#include "core/fxge/fx_dib.h"
#include "testing/gtest/include/gtest/gtest.h"
TEST(CStretchEngine, OverflowInCtor) {
diff --git a/core/fxge/dib/fx_dib_main.cpp b/core/fxge/dib/fx_dib_main.cpp
index 5b40b850b9..14cd0f4da6 100644
--- a/core/fxge/dib/fx_dib_main.cpp
+++ b/core/fxge/dib/fx_dib_main.cpp
@@ -4,15 +4,15 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "core/fxge/include/fx_dib.h"
+#include "core/fxge/fx_dib.h"
#include <limits.h>
#include <algorithm>
#include "core/fxcodec/fx_codec.h"
+#include "core/fxge/cfx_gemodule.h"
#include "core/fxge/dib/dib_int.h"
#include "core/fxge/ge/cfx_cliprgn.h"
-#include "core/fxge/include/cfx_gemodule.h"
void CmykDecode(uint32_t cmyk, int& c, int& m, int& y, int& k) {
c = FXSYS_GetCValue(cmyk);
diff --git a/core/fxge/dib/fx_dib_transform.cpp b/core/fxge/dib/fx_dib_transform.cpp
index 27dbb82fab..a559fee55d 100644
--- a/core/fxge/dib/fx_dib_transform.cpp
+++ b/core/fxge/dib/fx_dib_transform.cpp
@@ -6,7 +6,7 @@
#include "core/fxge/dib/dib_int.h"
-#include "core/fxge/include/fx_dib.h"
+#include "core/fxge/fx_dib.h"
namespace {