[rust png] Rename `PngDecoder` to `LibpngPngDecoder`.
Doing this in a separate CL in an attempt to reduce the size of
https://pdfium-review.googlesource.com/c/pdfium/+/135730.
Bug: 444045690
Change-Id: Ib4d1aee1454b8d20e10544ba2512dda14fef8bc0
Bypass-Check-License: Moved files (rather than new files) = old year ok.
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/136130
Commit-Queue: Ćukasz Anforowicz <lukasza@google.com>
Reviewed-by: Lei Zhang <thestig@chromium.org>
diff --git a/core/fxcodec/BUILD.gn b/core/fxcodec/BUILD.gn
index e61f710..c7ef717 100644
--- a/core/fxcodec/BUILD.gn
+++ b/core/fxcodec/BUILD.gn
@@ -120,8 +120,8 @@
}
if (pdf_enable_xfa_png) {
sources += [
- "png/png_decoder.cpp",
- "png/png_decoder.h",
+ "png/libpng_png_decoder.cpp",
+ "png/libpng_png_decoder.h",
"png/png_decoder_delegate.cpp",
"png/png_decoder_delegate.h",
]
diff --git a/core/fxcodec/png/png_decoder.cpp b/core/fxcodec/png/libpng_png_decoder.cpp
similarity index 95%
rename from core/fxcodec/png/png_decoder.cpp
rename to core/fxcodec/png/libpng_png_decoder.cpp
index c5dd048..96c376b 100644
--- a/core/fxcodec/png/png_decoder.cpp
+++ b/core/fxcodec/png/libpng_png_decoder.cpp
@@ -4,7 +4,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "core/fxcodec/png/png_decoder.h"
+#include "core/fxcodec/png/libpng_png_decoder.h"
#include <setjmp.h>
#include <string.h>
@@ -182,7 +182,7 @@
namespace fxcodec {
// static
-std::unique_ptr<ProgressiveDecoderIface::Context> PngDecoder::StartDecode(
+std::unique_ptr<ProgressiveDecoderIface::Context> LibpngPngDecoder::StartDecode(
PngDecoderDelegate* pDelegate) {
auto p = std::make_unique<CPngContext>(pDelegate);
p->png_ =
@@ -201,8 +201,9 @@
}
// static
-bool PngDecoder::ContinueDecode(ProgressiveDecoderIface::Context* pContext,
- RetainPtr<CFX_CodecMemory> codec_memory) {
+bool LibpngPngDecoder::ContinueDecode(
+ ProgressiveDecoderIface::Context* pContext,
+ RetainPtr<CFX_CodecMemory> codec_memory) {
auto* ctx = static_cast<CPngContext*>(pContext);
pdfium::span<uint8_t> src_buf = codec_memory->GetUnconsumedSpan();
return _png_continue_decode(ctx->png_, ctx->info_, src_buf.data(),
diff --git a/core/fxcodec/png/png_decoder.h b/core/fxcodec/png/libpng_png_decoder.h
similarity index 63%
rename from core/fxcodec/png/png_decoder.h
rename to core/fxcodec/png/libpng_png_decoder.h
index 32d9030..a70a205 100644
--- a/core/fxcodec/png/png_decoder.h
+++ b/core/fxcodec/png/libpng_png_decoder.h
@@ -4,8 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef CORE_FXCODEC_PNG_PNG_DECODER_H_
-#define CORE_FXCODEC_PNG_PNG_DECODER_H_
+#ifndef CORE_FXCODEC_PNG_LIBPNG_PNG_DECODER_H_
+#define CORE_FXCODEC_PNG_LIBPNG_PNG_DECODER_H_
#include <memory>
@@ -20,7 +20,8 @@
class PngDecoderDelegate;
-class PngDecoder {
+// PNG decoder that uses the `libpng` library to decode pixels.
+class LibpngPngDecoder {
public:
static std::unique_ptr<ProgressiveDecoderIface::Context> StartDecode(
PngDecoderDelegate* pDelegate);
@@ -28,13 +29,13 @@
static bool ContinueDecode(ProgressiveDecoderIface::Context* pContext,
RetainPtr<CFX_CodecMemory> codec_memory);
- PngDecoder() = delete;
- PngDecoder(const PngDecoder&) = delete;
- PngDecoder& operator=(const PngDecoder&) = delete;
+ LibpngPngDecoder() = delete;
+ LibpngPngDecoder(const LibpngPngDecoder&) = delete;
+ LibpngPngDecoder& operator=(const LibpngPngDecoder&) = delete;
};
} // namespace fxcodec
-using PngDecoder = fxcodec::PngDecoder;
+using PngDecoder = fxcodec::LibpngPngDecoder;
-#endif // CORE_FXCODEC_PNG_PNG_DECODER_H_
+#endif // CORE_FXCODEC_PNG_LIBPNG_PNG_DECODER_H_
diff --git a/core/fxcodec/progressive_decoder.cpp b/core/fxcodec/progressive_decoder.cpp
index 25c5355..2d57ec7 100644
--- a/core/fxcodec/progressive_decoder.cpp
+++ b/core/fxcodec/progressive_decoder.cpp
@@ -38,7 +38,7 @@
#endif // PDF_ENABLE_XFA_GIF
#ifdef PDF_ENABLE_XFA_PNG
-#include "core/fxcodec/png/png_decoder.h"
+#include "core/fxcodec/png/libpng_png_decoder.h"
#include "core/fxcodec/png/png_decoder_delegate.h"
#endif // PDF_ENABLE_XFA_PNG