summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorRyan Harrison <rharrison@chromium.org>2018-02-06 15:31:04 +0000
committerChromium commit bot <commit-bot@chromium.org>2018-02-06 15:31:04 +0000
commitb105152222f9dfb387efa6a70dedf3dd0ceb2cd5 (patch)
tree8d1421a7f40b094315bd87ad26deedd457f3e890 /core
parent980beeb5b06facc5bf178c03394ad9487b9b4b69 (diff)
downloadpdfium-b105152222f9dfb387efa6a70dedf3dd0ceb2cd5.tar.xz
Move core/fxcodec/lbmp/ -> core/fxcodec/bmp/
BUG=chromium:808336 Change-Id: Id721787dd77d1bcac6daf6e3c149f79e8d1d9fe4 Reviewed-on: https://pdfium-review.googlesource.com/25610 Reviewed-by: dsinclair <dsinclair@chromium.org> Commit-Queue: Ryan Harrison <rharrison@chromium.org>
Diffstat (limited to 'core')
-rw-r--r--core/fxcodec/bmp/fx_bmp.cpp (renamed from core/fxcodec/lbmp/fx_bmp.cpp)2
-rw-r--r--core/fxcodec/bmp/fx_bmp.h (renamed from core/fxcodec/lbmp/fx_bmp.h)6
-rw-r--r--core/fxcodec/codec/ccodec_bmpmodule.cpp2
-rw-r--r--core/fxcodec/gif/cfx_lzwdecompressor.cpp2
4 files changed, 6 insertions, 6 deletions
diff --git a/core/fxcodec/lbmp/fx_bmp.cpp b/core/fxcodec/bmp/fx_bmp.cpp
index 5e02c46ef8..31a93287f1 100644
--- a/core/fxcodec/lbmp/fx_bmp.cpp
+++ b/core/fxcodec/bmp/fx_bmp.cpp
@@ -4,7 +4,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "core/fxcodec/lbmp/fx_bmp.h"
+#include "core/fxcodec/bmp/fx_bmp.h"
#include <algorithm>
#include <limits>
diff --git a/core/fxcodec/lbmp/fx_bmp.h b/core/fxcodec/bmp/fx_bmp.h
index 5f970c458e..4033e510a6 100644
--- a/core/fxcodec/lbmp/fx_bmp.h
+++ b/core/fxcodec/bmp/fx_bmp.h
@@ -4,8 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef CORE_FXCODEC_LBMP_FX_BMP_H_
-#define CORE_FXCODEC_LBMP_FX_BMP_H_
+#ifndef CORE_FXCODEC_BMP_FX_BMP_H_
+#define CORE_FXCODEC_BMP_FX_BMP_H_
#include <setjmp.h>
@@ -133,4 +133,4 @@ class CBmpContext : public CCodec_BmpModule::Context {
UnownedPtr<CCodec_BmpModule::Delegate> const m_pDelegate;
};
-#endif // CORE_FXCODEC_LBMP_FX_BMP_H_
+#endif // CORE_FXCODEC_BMP_FX_BMP_H_
diff --git a/core/fxcodec/codec/ccodec_bmpmodule.cpp b/core/fxcodec/codec/ccodec_bmpmodule.cpp
index 46e2cf8f65..9fbb557008 100644
--- a/core/fxcodec/codec/ccodec_bmpmodule.cpp
+++ b/core/fxcodec/codec/ccodec_bmpmodule.cpp
@@ -6,9 +6,9 @@
#include "core/fxcodec/codec/ccodec_bmpmodule.h"
+#include "core/fxcodec/bmp/fx_bmp.h"
#include "core/fxcodec/codec/codec_int.h"
#include "core/fxcodec/fx_codec.h"
-#include "core/fxcodec/lbmp/fx_bmp.h"
#include "core/fxcrt/unowned_ptr.h"
#include "core/fxge/fx_dib.h"
#include "third_party/base/ptr_util.h"
diff --git a/core/fxcodec/gif/cfx_lzwdecompressor.cpp b/core/fxcodec/gif/cfx_lzwdecompressor.cpp
index 1ee7b5a217..edff8c4f4b 100644
--- a/core/fxcodec/gif/cfx_lzwdecompressor.cpp
+++ b/core/fxcodec/gif/cfx_lzwdecompressor.cpp
@@ -10,7 +10,7 @@
#include <memory>
#include <utility>
-#include "core/fxcodec/lbmp/fx_bmp.h"
+#include "core/fxcodec/bmp/fx_bmp.h"
#include "third_party/base/numerics/safe_math.h"
#include "third_party/base/ptr_util.h"
#include "third_party/base/stl_util.h"