clean pdf

Author: andiwand

CMakeLists.txt

@@ -161,13 +161,10 @@ set(ODR_SOURCE_FILES
 
         "src/odr/internal/pdf/pdf_cmap.cpp"
         "src/odr/internal/pdf/pdf_cmap_parser.cpp"
-        "src/odr/internal/pdf/pdf_document.cpp"
-        "src/odr/internal/pdf/pdf_document_element.cpp"
         "src/odr/internal/pdf/pdf_document_parser.cpp"
         "src/odr/internal/pdf/pdf_file.cpp"
         "src/odr/internal/pdf/pdf_file_object.cpp"
         "src/odr/internal/pdf/pdf_file_parser.cpp"
-        "src/odr/internal/pdf/pdf_graphics_operator.cpp"
         "src/odr/internal/pdf/pdf_graphics_operator_parser.cpp"
         "src/odr/internal/pdf/pdf_graphics_state.cpp"
         "src/odr/internal/pdf/pdf_object.cpp"

src/odr/internal/pdf/pdf_cmap.cpp

@@ -5,13 +5,11 @@
 
 namespace odr::internal::pdf {
 
-CMap::CMap() = default;
-
-void CMap::map_bfchar(char glyph, char16_t unicode) {
+void CMap::map_bfchar(const char glyph, const char16_t unicode) {
   m_bfchar[glyph] = unicode;
 }
 
-char16_t CMap::translate_glyph(char glyph) const {
+char16_t CMap::translate_glyph(const char glyph) const {
   return util::map::lookup_default(m_bfchar, glyph, glyph);
 }
 

src/odr/internal/pdf/pdf_cmap.hpp

@@ -7,12 +7,10 @@ namespace odr::internal::pdf {
 
 class CMap {
 public:
-  CMap();
-
   void map_bfchar(char glyph, char16_t unicode);
 
-  char16_t translate_glyph(char glyph) const;
-  std::string translate_string(const std::string &glyphs) const;
+  [[nodiscard]] char16_t translate_glyph(char glyph) const;
+  [[nodiscard]] std::string translate_string(const std::string &glyphs) const;
 
 private:
   std::unordered_map<char, char16_t> m_bfchar;

src/odr/internal/pdf/pdf_cmap_parser.cpp

@@ -37,20 +37,21 @@ std::variant<Object, std::string> CMapParser::read_token() const {
 
   std::string token;
   while (true) {
-    int_type i = m_parser.geti();
+    const int_type i = m_parser.geti();
     if (i == eof) {
       return token;
     }
-    auto c = static_cast<char_type>(i);
+    const auto c = static_cast<char_type>(i);
     if (ObjectParser::is_whitespace(c)) {
       return token;
     }
     m_parser.bumpc();
-    token += (char_type)c;
+    token += c;
   }
 }
 
-void CMapParser::read_codespacerange(std::uint32_t n, CMap &cmap) const {
+void CMapParser::read_codespacerange(const std::uint32_t n,
+                                     const CMap &cmap) const {
   (void)cmap;
 
   m_parser.skip_whitespace();
@@ -64,7 +65,7 @@ void CMapParser::read_codespacerange(std::uint32_t n, CMap &cmap) const {
   }
 }
 
-void CMapParser::read_bfchar(std::uint32_t n, CMap &cmap) const {
+void CMapParser::read_bfchar(const std::uint32_t n, CMap &cmap) const {
   m_parser.skip_whitespace();
   for (std::uint32_t i = 0; i < n; ++i) {
     std::string glyph = m_parser.read_object().as_string();
@@ -73,7 +74,7 @@ void CMapParser::read_bfchar(std::uint32_t n, CMap &cmap) const {
     m_parser.skip_whitespace();
 
     util::reverse_bytes(reinterpret_cast<char16_t *>(unicode.data()),
-                        (std::size_t)unicode.size() / 2);
+                        unicode.size() / 2);
     std::u16string_view unicode16(
         reinterpret_cast<const char16_t *>(unicode.data()), unicode.size() / 2);
 
@@ -88,7 +89,7 @@ void CMapParser::read_bfchar(std::uint32_t n, CMap &cmap) const {
   }
 }
 
-void CMapParser::read_bfrange(std::uint32_t n, CMap &cmap) const {
+void CMapParser::read_bfrange(const std::uint32_t n, const CMap &cmap) const {
   (void)cmap;
 
   m_parser.skip_whitespace();
@@ -118,13 +119,12 @@ CMap CMapParser::parse_cmap() const {
     m_parser.skip_whitespace();
 
     if (std::holds_alternative<Object>(token)) {
-      const Object &object = std::get<Object>(token);
-      if (object.is_integer()) {
+      if (const Object &object = std::get<Object>(token); object.is_integer()) {
         last_int = object.as_integer();
       }
     } else if (std::holds_alternative<std::string>(token)) {
-      const std::string &command = std::get<std::string>(token);
-      if (command == "begincodespacerange") {
+      if (const std::string &command = std::get<std::string>(token);
+          command == "begincodespacerange") {
         read_codespacerange(last_int, cmap);
       } else if (command == "beginbfchar") {
         read_bfchar(last_int, cmap);

src/odr/internal/pdf/pdf_cmap_parser.hpp

@@ -27,9 +27,9 @@ class CMapParser {
 
   Token read_token() const;
 
-  void read_codespacerange(std::uint32_t n, CMap &) const;
+  void read_codespacerange(std::uint32_t n, const CMap &) const;
   void read_bfchar(std::uint32_t n, CMap &) const;
-  void read_bfrange(std::uint32_t n, CMap &) const;
+  void read_bfrange(std::uint32_t n, const CMap &) const;
 };
 
 } // namespace odr::internal::pdf

src/odr/internal/pdf/pdf_document.cpp

@@ -32,16 +32,16 @@ struct Element {
   Object object;
 };
 
-struct Catalog : Element {
+struct Catalog final : Element {
   Pages *pages{nullptr};
 };
 
-struct Pages : Element {
+struct Pages final : Element {
   std::vector<Element *> kids;
   std::uint32_t count{0};
 };
 
-struct Page : Element {
+struct Page final : Element {
   Pages *parent{nullptr};
 
   Resources *resources;
@@ -51,13 +51,13 @@ struct Page : Element {
   std::vector<ObjectReference> contents_reference;
 };
 
-struct Annotation : Element {};
+struct Annotation final : Element {};
 
-struct Resources : Element {
+struct Resources final : Element {
   std::unordered_map<std::string, Font *> font;
 };
 
-struct Font : Element {
+struct Font final : Element {
   CMap cmap;
 };
 

src/odr/internal/pdf/pdf_document_element.cpp

@@ -6,19 +6,19 @@
 #include <odr/internal/pdf/pdf_document_element.hpp>
 #include <odr/internal/pdf/pdf_file_parser.hpp>
 
-#include <functional>
 #include <iostream>
+#include <ranges>
 #include <sstream>
 
 namespace odr::internal::pdf {
 namespace {
 
-pdf::Element *parse_page_or_pages(DocumentParser &parser,
-                                  const ObjectReference &reference,
-                                  Document &document, Element *parent);
+Element *parse_page_or_pages(DocumentParser &parser,
+                             const ObjectReference &reference,
+                             Document &document, Element *parent);
 
-pdf::Font *parse_font(DocumentParser &parser, const ObjectReference &reference,
-                      Document &document) {
+Font *parse_font(DocumentParser &parser, const ObjectReference &reference,
+                 Document &document) {
   Font *font = document.create_element<Font>();
 
   IndirectObject object = parser.read_object(reference);
@@ -41,8 +41,8 @@ pdf::Font *parse_font(DocumentParser &parser, const ObjectReference &reference,
   return font;
 }
 
-pdf::Resources *parse_resources(DocumentParser &parser, const Object &object,
-                                Document &document) {
+Resources *parse_resources(DocumentParser &parser, const Object &object,
+                           Document &document) {
   auto *resources = document.create_element<Resources>();
 
   Dictionary dictionary = parser.resolve_object_copy(object).as_dictionary();
@@ -61,9 +61,9 @@ pdf::Resources *parse_resources(DocumentParser &parser, const Object &object,
   return resources;
 }
 
-pdf::Annotation *parse_annotation(DocumentParser &parser,
-                                  const ObjectReference &reference,
-                                  Document &document) {
+Annotation *parse_annotation(DocumentParser &parser,
+                             const ObjectReference &reference,
+                             Document &document) {
   auto *annotation = document.create_element<Annotation>();
 
   IndirectObject object = parser.read_object(reference);
@@ -76,8 +76,8 @@ pdf::Annotation *parse_annotation(DocumentParser &parser,
   return annotation;
 }
 
-pdf::Page *parse_page(DocumentParser &parser, const ObjectReference &reference,
-                      Document &document, Element *parent) {
+Page *parse_page(DocumentParser &parser, const ObjectReference &reference,
+                 Document &document, Element *parent) {
   Page *page = document.create_element<Page>();
 
   IndirectObject object = parser.read_object(reference);
@@ -110,8 +110,8 @@ pdf::Page *parse_page(DocumentParser &parser, const ObjectReference &reference,
   return page;
 }
 
-pdf::Pages *parse_pages(DocumentParser &parser,
-                        const ObjectReference &reference, Document &document) {
+Pages *parse_pages(DocumentParser &parser, const ObjectReference &reference,
+                   Document &document) {
   auto *pages = document.create_element<Pages>();
 
   IndirectObject object = parser.read_object(reference);
@@ -130,9 +130,9 @@ pdf::Pages *parse_pages(DocumentParser &parser,
   return pages;
 }
 
-pdf::Element *parse_page_or_pages(DocumentParser &parser,
-                                  const ObjectReference &reference,
-                                  Document &document, Element *parent) {
+Element *parse_page_or_pages(DocumentParser &parser,
+                             const ObjectReference &reference,
+                             Document &document, Element *parent) {
   // TODO we are parsing twice
   IndirectObject object = parser.read_object(reference);
   const Dictionary &dictionary = object.object.as_dictionary();
@@ -148,9 +148,8 @@ pdf::Element *parse_page_or_pages(DocumentParser &parser,
   throw std::runtime_error("unknown element");
 }
 
-pdf::Catalog *parse_catalog(DocumentParser &parser,
-                            const ObjectReference &reference,
-                            Document &document) {
+Catalog *parse_catalog(DocumentParser &parser, const ObjectReference &reference,
+                       Document &document) {
   auto *catalog = document.create_element<Catalog>();
 
   IndirectObject object = parser.read_object(reference);
@@ -177,11 +176,11 @@ const Xref &DocumentParser::xref() const { return m_xref; }
 
 const IndirectObject &
 DocumentParser::read_object(const ObjectReference &reference) {
-  if (auto it = m_objects.find(reference); it != std::end(m_objects)) {
+  if (const auto it = m_objects.find(reference); it != std::end(m_objects)) {
     return it->second;
   }
 
-  std::uint32_t position = m_xref.table.at(reference).position;
+  const std::uint32_t position = m_xref.table.at(reference).position;
   in().seekg(position);
   IndirectObject object = parser().read_indirect_object();
 
@@ -194,8 +193,8 @@ DocumentParser::read_object_stream(const ObjectReference &reference) {
 }
 
 std::string DocumentParser::read_object_stream(const IndirectObject &object) {
-  Object length = object.object.as_dictionary()["Length"];
-  std::uint32_t size;
+  const Object length = object.object.as_dictionary()["Length"];
+  std::uint32_t size = 0;
   if (length.is_integer()) {
     size = length.as_integer();
   } else if (length.is_reference()) {
@@ -205,12 +204,12 @@ std::string DocumentParser::read_object_stream(const IndirectObject &object) {
   }
 
   in().seekg(object.stream_position.value());
-  return m_parser.read_stream(size);
+  return m_parser.read_stream(static_cast<std::int32_t>(size));
 }
 
 std::unique_ptr<Document> DocumentParser::parse_document() {
   parser().seek_start_xref();
-  StartXref start_xref = parser().read_start_xref();
+  const StartXref start_xref = parser().read_start_xref();
 
   std::uint32_t xref_position = start_xref.start;
   std::optional<Trailer> trailer;
@@ -253,7 +252,7 @@ void DocumentParser::deep_resolve_object(Object &object) {
       deep_resolve_object(e);
     }
   } else if (object.is_dictionary()) {
-    for (auto &[k, v] : object.as_dictionary()) {
+    for (Object &v : object.as_dictionary() | std::views::values) {
       deep_resolve_object(v);
     }
   }

src/odr/internal/pdf/pdf_document_element.hpp

@@ -13,11 +13,11 @@ struct Document;
 
 class DocumentParser {
 public:
-  DocumentParser(std::istream &);
+  explicit DocumentParser(std::istream &);
 
-  std::istream &in() const;
-  const FileParser &parser() const;
-  const Xref &xref() const;
+  [[nodiscard]] std::istream &in() const;
+  [[nodiscard]] const FileParser &parser() const;
+  [[nodiscard]] const Xref &xref() const;
 
   const IndirectObject &read_object(const ObjectReference &reference);
   std::string read_object_stream(const ObjectReference &reference);