Rename remaining fx_codec*.cpp to match class and .h file name
Then include headers in the proper order per standards, since
it will no longer trigger a presubmit warning.
Change-Id: I6bb86ac90e8fd9aed30b66dac61726f0dea8222c
Reviewed-on: https://pdfium-review.googlesource.com/41535
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
diff --git a/BUILD.gn b/BUILD.gn
index 8386f03..e3ba58c 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -723,23 +723,23 @@
sources = [
"core/fxcodec/JBig2_DocumentContext.h",
"core/fxcodec/codec/ccodec_basicmodule.h",
+ "core/fxcodec/codec/ccodec_faxmodule.cpp",
"core/fxcodec/codec/ccodec_faxmodule.h",
+ "core/fxcodec/codec/ccodec_flatemodule.cpp",
"core/fxcodec/codec/ccodec_flatemodule.h",
+ "core/fxcodec/codec/ccodec_iccmodule.cpp",
"core/fxcodec/codec/ccodec_iccmodule.h",
+ "core/fxcodec/codec/ccodec_jbig2module.cpp",
"core/fxcodec/codec/ccodec_jbig2module.h",
"core/fxcodec/codec/ccodec_jpegmodule.cpp",
"core/fxcodec/codec/ccodec_jpegmodule.h",
+ "core/fxcodec/codec/ccodec_jpxmodule.cpp",
"core/fxcodec/codec/ccodec_jpxmodule.h",
"core/fxcodec/codec/ccodec_scanlinedecoder.cpp",
"core/fxcodec/codec/ccodec_scanlinedecoder.h",
"core/fxcodec/codec/cjpx_decoder.h",
"core/fxcodec/codec/codec_int.h",
"core/fxcodec/codec/fx_codec.cpp",
- "core/fxcodec/codec/fx_codec_fax.cpp",
- "core/fxcodec/codec/fx_codec_flate.cpp",
- "core/fxcodec/codec/fx_codec_icc.cpp",
- "core/fxcodec/codec/fx_codec_jbig.cpp",
- "core/fxcodec/codec/fx_codec_jpx_opj.cpp",
"core/fxcodec/fx_codec.h",
"core/fxcodec/fx_codec_def.h",
"core/fxcodec/jbig2/JBig2_ArithDecoder.cpp",
diff --git a/core/fxcodec/codec/fx_codec_fax.cpp b/core/fxcodec/codec/ccodec_faxmodule.cpp
similarity index 99%
rename from core/fxcodec/codec/fx_codec_fax.cpp
rename to core/fxcodec/codec/ccodec_faxmodule.cpp
index c6e71b6..af218f7 100644
--- a/core/fxcodec/codec/fx_codec_fax.cpp
+++ b/core/fxcodec/codec/ccodec_faxmodule.cpp
@@ -4,11 +4,12 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+#include "core/fxcodec/codec/ccodec_faxmodule.h"
+
#include <algorithm>
#include <memory>
#include <vector>
-#include "core/fxcodec/codec/ccodec_faxmodule.h"
#include "core/fxcodec/codec/ccodec_scanlinedecoder.h"
#include "core/fxcodec/codec/codec_int.h"
#include "core/fxcrt/cfx_binarybuf.h"
diff --git a/core/fxcodec/codec/fx_codec_flate.cpp b/core/fxcodec/codec/ccodec_flatemodule.cpp
similarity index 99%
rename from core/fxcodec/codec/fx_codec_flate.cpp
rename to core/fxcodec/codec/ccodec_flatemodule.cpp
index 11bdf67..9074038 100644
--- a/core/fxcodec/codec/fx_codec_flate.cpp
+++ b/core/fxcodec/codec/ccodec_flatemodule.cpp
@@ -4,7 +4,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "core/fxcodec/fx_codec.h"
+#include "core/fxcodec/codec/ccodec_flatemodule.h"
#include <algorithm>
#include <limits>
@@ -12,8 +12,8 @@
#include <utility>
#include <vector>
-#include "core/fxcodec/codec/ccodec_flatemodule.h"
#include "core/fxcodec/codec/ccodec_scanlinedecoder.h"
+#include "core/fxcodec/fx_codec.h"
#include "core/fxcrt/fx_extension.h"
#include "third_party/base/numerics/safe_conversions.h"
#include "third_party/base/ptr_util.h"
diff --git a/core/fxcodec/codec/fx_codec_icc.cpp b/core/fxcodec/codec/ccodec_iccmodule.cpp
similarity index 99%
rename from core/fxcodec/codec/fx_codec_icc.cpp
rename to core/fxcodec/codec/ccodec_iccmodule.cpp
index 7ae93e5..74937b2 100644
--- a/core/fxcodec/codec/fx_codec_icc.cpp
+++ b/core/fxcodec/codec/ccodec_iccmodule.cpp
@@ -4,11 +4,12 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+#include "core/fxcodec/codec/ccodec_iccmodule.h"
+
#include <algorithm>
#include <memory>
#include <vector>
-#include "core/fxcodec/codec/ccodec_iccmodule.h"
#include "core/fxcodec/codec/codec_int.h"
namespace {
diff --git a/core/fxcodec/codec/fx_codec_jbig.cpp b/core/fxcodec/codec/ccodec_jbig2module.cpp
similarity index 100%
rename from core/fxcodec/codec/fx_codec_jbig.cpp
rename to core/fxcodec/codec/ccodec_jbig2module.cpp
diff --git a/core/fxcodec/codec/fx_codec_jpx_opj.cpp b/core/fxcodec/codec/ccodec_jpxmodule.cpp
similarity index 99%
rename from core/fxcodec/codec/fx_codec_jpx_opj.cpp
rename to core/fxcodec/codec/ccodec_jpxmodule.cpp
index 3e44b19..ce6a130 100644
--- a/core/fxcodec/codec/fx_codec_jpx_opj.cpp
+++ b/core/fxcodec/codec/ccodec_jpxmodule.cpp
@@ -4,6 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+#include "core/fxcodec/codec/ccodec_jpxmodule.h"
+
#include <algorithm>
#include <limits>
#include <memory>
@@ -11,7 +13,6 @@
#include <vector>
#include "core/fpdfapi/page/cpdf_colorspace.h"
-#include "core/fxcodec/codec/ccodec_jpxmodule.h"
#include "core/fxcodec/codec/cjpx_decoder.h"
#include "core/fxcrt/fx_memory.h"
#include "core/fxcrt/fx_safe_types.h"
