summaryrefslogtreecommitdiff
path: root/core/fxcodec
diff options
context:
space:
mode:
authordsinclair <dsinclair@chromium.org>2016-04-06 10:00:40 -0700
committerCommit bot <commit-bot@chromium.org>2016-04-06 10:00:40 -0700
commit48baa5f230a886b0579a9626711e7d71376b085e (patch)
tree62212bf5d496228e50df09cf4e437a1308f821a7 /core/fxcodec
parent392f1022a3c525a053a7d143d2b23a76526a1aea (diff)
downloadpdfium-48baa5f230a886b0579a9626711e7d71376b085e.tar.xz
Move core/include/fxge to core/fxge/include.
This CL is a straight move of the fxge includes into core/fxge/include. Review URL: https://codereview.chromium.org/1868533002
Diffstat (limited to 'core/fxcodec')
-rw-r--r--core/fxcodec/codec/fx_codec_bmp.cpp2
-rw-r--r--core/fxcodec/codec/fx_codec_gif.cpp2
-rw-r--r--core/fxcodec/codec/fx_codec_jpeg.cpp2
-rw-r--r--core/fxcodec/codec/fx_codec_png.cpp2
-rw-r--r--core/fxcodec/codec/fx_codec_progress.cpp2
-rw-r--r--core/fxcodec/codec/fx_codec_progress.h2
-rw-r--r--core/fxcodec/codec/fx_codec_tiff.cpp2
7 files changed, 7 insertions, 7 deletions
diff --git a/core/fxcodec/codec/fx_codec_bmp.cpp b/core/fxcodec/codec/fx_codec_bmp.cpp
index 31383774aa..2dc537161b 100644
--- a/core/fxcodec/codec/fx_codec_bmp.cpp
+++ b/core/fxcodec/codec/fx_codec_bmp.cpp
@@ -6,8 +6,8 @@
#include "core/fxcodec/codec/codec_int.h"
#include "core/fxcodec/lbmp/fx_bmp.h"
+#include "core/fxge/include/fx_dib.h"
#include "core/include/fxcodec/fx_codec.h"
-#include "core/include/fxge/fx_dib.h"
struct FXBMP_Context {
bmp_decompress_struct_p bmp_ptr;
void* parent_ptr;
diff --git a/core/fxcodec/codec/fx_codec_gif.cpp b/core/fxcodec/codec/fx_codec_gif.cpp
index 1657d7257e..e1806a4001 100644
--- a/core/fxcodec/codec/fx_codec_gif.cpp
+++ b/core/fxcodec/codec/fx_codec_gif.cpp
@@ -6,8 +6,8 @@
#include "core/fxcodec/codec/codec_int.h"
#include "core/fxcodec/lgif/fx_gif.h"
+#include "core/fxge/include/fx_dib.h"
#include "core/include/fxcodec/fx_codec.h"
-#include "core/include/fxge/fx_dib.h"
struct FXGIF_Context {
gif_decompress_struct_p gif_ptr;
void* parent_ptr;
diff --git a/core/fxcodec/codec/fx_codec_jpeg.cpp b/core/fxcodec/codec/fx_codec_jpeg.cpp
index 553e237b32..ce39038438 100644
--- a/core/fxcodec/codec/fx_codec_jpeg.cpp
+++ b/core/fxcodec/codec/fx_codec_jpeg.cpp
@@ -8,8 +8,8 @@
#include "core/fxcodec/codec/codec_int.h"
#include "core/fxcrt/include/fx_safe_types.h"
+#include "core/fxge/include/fx_dib.h"
#include "core/include/fxcodec/fx_codec.h"
-#include "core/include/fxge/fx_dib.h"
extern "C" {
#undef FAR
diff --git a/core/fxcodec/codec/fx_codec_png.cpp b/core/fxcodec/codec/fx_codec_png.cpp
index f8621001b6..e625737e34 100644
--- a/core/fxcodec/codec/fx_codec_png.cpp
+++ b/core/fxcodec/codec/fx_codec_png.cpp
@@ -7,8 +7,8 @@
#include <algorithm>
#include "core/fxcodec/codec/codec_int.h"
+#include "core/fxge/include/fx_dib.h"
#include "core/include/fxcodec/fx_codec.h"
-#include "core/include/fxge/fx_dib.h"
extern "C" {
#undef FAR
diff --git a/core/fxcodec/codec/fx_codec_progress.cpp b/core/fxcodec/codec/fx_codec_progress.cpp
index 9e113c695c..ebd69ae1e3 100644
--- a/core/fxcodec/codec/fx_codec_progress.cpp
+++ b/core/fxcodec/codec/fx_codec_progress.cpp
@@ -6,8 +6,8 @@
#include "core/fxcodec/codec/fx_codec_progress.h"
+#include "core/fxge/include/fx_dib.h"
#include "core/include/fxcodec/fx_codec.h"
-#include "core/include/fxge/fx_dib.h"
void CFXCODEC_WeightTable::Calc(int dest_len,
int dest_min,
diff --git a/core/fxcodec/codec/fx_codec_progress.h b/core/fxcodec/codec/fx_codec_progress.h
index ccd52a95b1..2b2ba28e16 100644
--- a/core/fxcodec/codec/fx_codec_progress.h
+++ b/core/fxcodec/codec/fx_codec_progress.h
@@ -9,8 +9,8 @@
#include "core/fxcrt/include/fx_memory.h"
#include "core/fxcrt/include/fx_system.h"
+#include "core/fxge/include/fx_dib.h"
#include "core/include/fxcodec/fx_codec.h"
-#include "core/include/fxge/fx_dib.h"
#define FXCODEC_BLOCK_SIZE 4096
#define FXCODEC_PNG_GAMMA 2.2
diff --git a/core/fxcodec/codec/fx_codec_tiff.cpp b/core/fxcodec/codec/fx_codec_tiff.cpp
index 96249f9d14..d445769714 100644
--- a/core/fxcodec/codec/fx_codec_tiff.cpp
+++ b/core/fxcodec/codec/fx_codec_tiff.cpp
@@ -5,8 +5,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
#include "core/fxcodec/codec/codec_int.h"
+#include "core/fxge/include/fx_dib.h"
#include "core/include/fxcodec/fx_codec.h"
-#include "core/include/fxge/fx_dib.h"
extern "C" {
#include "third_party/libtiff/tiffiop.h"