Skip to content

Commit c8b2a39

Browse files
andiwandandiwand
committed
cleanup pdf
1 parent 7325d1b commit c8b2a39

15 files changed

+127
-131
lines changed

‎src/odr/internal/pdf/pdf_cmap_parser.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ static constexpr int_type eof = std::streambuf::traits_type::eof();
1313

1414
CMapParser::CMapParser(std::istream &in) : m_parser(in) {}
1515

16-
std::istream &CMapParser::in() const { return m_parser.in(); }
16+
std::istream &CMapParser::in() { return m_parser.in(); }
1717

18-
std::streambuf &CMapParser::sb() const { return m_parser.sb(); }
18+
std::streambuf &CMapParser::sb() { return m_parser.sb(); }
1919

20-
const ObjectParser &CMapParser::parser() const { return m_parser; }
20+
const ObjectParser &CMapParser::parser() { return m_parser; }
2121

22-
std::variant<Object, std::string> CMapParser::read_token() const {
22+
std::variant<Object, std::string> CMapParser::read_token() {
2323
if (m_parser.peek_number()) {
2424
return std::visit([](auto n) { return Object(n); },
2525
m_parser.read_integer_or_real());
@@ -51,7 +51,7 @@ std::variant<Object, std::string> CMapParser::read_token() const {
5151
}
5252

5353
void CMapParser::read_codespacerange(const std::uint32_t n,
54-
[[maybe_unused]] const CMap &cmap) const {
54+
[[maybe_unused]] const CMap &cmap) {
5555
m_parser.skip_whitespace();
5656
for (std::uint32_t i = 0; i < n; ++i) {
5757
auto from_glyph = m_parser.read_object();
@@ -63,7 +63,7 @@ void CMapParser::read_codespacerange(const std::uint32_t n,
6363
}
6464
}
6565

66-
void CMapParser::read_bfchar(const std::uint32_t n, CMap &cmap) const {
66+
void CMapParser::read_bfchar(const std::uint32_t n, CMap &cmap) {
6767
m_parser.skip_whitespace();
6868
for (std::uint32_t i = 0; i < n; ++i) {
6969
std::string glyph = m_parser.read_object().as_string();
@@ -88,7 +88,7 @@ void CMapParser::read_bfchar(const std::uint32_t n, CMap &cmap) const {
8888
}
8989

9090
void CMapParser::read_bfrange(const std::uint32_t n,
91-
[[maybe_unused]] const CMap &cmap) const {
91+
[[maybe_unused]] const CMap &cmap) {
9292
m_parser.skip_whitespace();
9393
for (std::uint32_t i = 0; i < n; ++i) {
9494
auto from_glyph = m_parser.read_object();
@@ -102,7 +102,7 @@ void CMapParser::read_bfrange(const std::uint32_t n,
102102
}
103103
}
104104

105-
CMap CMapParser::parse_cmap() const {
105+
CMap CMapParser::parse_cmap() {
106106
CMap cmap;
107107

108108
std::uint32_t last_int{};

‎src/odr/internal/pdf/pdf_cmap_parser.hpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,20 @@ class CMapParser {
1616

1717
explicit CMapParser(std::istream &);
1818

19-
std::istream &in() const;
20-
std::streambuf &sb() const;
21-
const ObjectParser &parser() const;
19+
[[nodiscard]] std::istream &in();
20+
[[nodiscard]] std::streambuf &sb();
21+
[[nodiscard]] const ObjectParser &parser();
2222

23-
CMap parse_cmap() const;
23+
[[nodiscard]] CMap parse_cmap();
2424

2525
private:
2626
ObjectParser m_parser;
2727

28-
Token read_token() const;
28+
[[nodiscard]] Token read_token();
2929

30-
void read_codespacerange(std::uint32_t n, const CMap &) const;
31-
void read_bfchar(std::uint32_t n, CMap &) const;
32-
void read_bfrange(std::uint32_t n, const CMap &) const;
30+
void read_codespacerange(std::uint32_t n, const CMap &cmap);
31+
void read_bfchar(std::uint32_t n, CMap &cmap);
32+
void read_bfrange(std::uint32_t n, const CMap &cmap);
3333
};
3434

3535
} // namespace odr::internal::pdf

‎src/odr/internal/pdf/pdf_document.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ struct Catalog;
99
struct Element;
1010

1111
struct Document {
12-
Catalog *catalog;
12+
Catalog *catalog{nullptr};
1313
std::vector<std::unique_ptr<Element>> elements;
1414

1515
template <typename T, typename... Args> T *create_element(Args &&...args) {

‎src/odr/internal/pdf/pdf_document_element.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ struct Pages final : Element {
4444
struct Page final : Element {
4545
Pages *parent{nullptr};
4646

47-
Resources *resources;
47+
Resources *resources{nullptr};
4848
std::vector<Annotation *> annotations;
4949

5050
// TODO remove

‎src/odr/internal/pdf/pdf_document_parser.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,9 +167,9 @@ Catalog *parse_catalog(DocumentParser &parser, const ObjectReference &reference,
167167

168168
DocumentParser::DocumentParser(std::istream &in) : m_parser(in) {}
169169

170-
std::istream &DocumentParser::in() const { return m_parser.in(); }
170+
std::istream &DocumentParser::in() { return m_parser.in(); }
171171

172-
const FileParser &DocumentParser::parser() const { return m_parser; }
172+
FileParser &DocumentParser::parser() { return m_parser; }
173173

174174
const Xref &DocumentParser::xref() const { return m_xref; }
175175

‎src/odr/internal/pdf/pdf_document_parser.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ class DocumentParser {
1515
public:
1616
explicit DocumentParser(std::istream &);
1717

18-
[[nodiscard]] std::istream &in() const;
19-
[[nodiscard]] const FileParser &parser() const;
18+
[[nodiscard]] std::istream &in();
19+
[[nodiscard]] FileParser &parser();
2020
[[nodiscard]] const Xref &xref() const;
2121

2222
const IndirectObject &read_object(const ObjectReference &reference);

‎src/odr/internal/pdf/pdf_file_parser.cpp‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ namespace odr::internal::pdf {
1010

1111
FileParser::FileParser(std::istream &in) : m_parser(in) {}
1212

13-
std::istream &FileParser::in() const { return m_parser.in(); }
13+
std::istream &FileParser::in() { return m_parser.in(); }
1414

15-
std::streambuf &FileParser::sb() const { return m_parser.sb(); }
15+
std::streambuf &FileParser::sb() { return m_parser.sb(); }
1616

17-
const ObjectParser &FileParser::parser() const { return m_parser; }
17+
ObjectParser &FileParser::parser() { return m_parser; }
1818

19-
IndirectObject FileParser::read_indirect_object() const {
19+
IndirectObject FileParser::read_indirect_object() {
2020
IndirectObject result;
2121

2222
result.reference.id = m_parser.read_unsigned_integer();
@@ -47,7 +47,7 @@ IndirectObject FileParser::read_indirect_object() const {
4747
throw std::runtime_error("expected stream");
4848
}
4949

50-
Trailer FileParser::read_trailer() const {
50+
Trailer FileParser::read_trailer() {
5151
m_parser.expect_characters("trailer");
5252
m_parser.skip_whitespace();
5353

@@ -62,7 +62,7 @@ Trailer FileParser::read_trailer() const {
6262
return result;
6363
}
6464

65-
Xref FileParser::read_xref() const {
65+
Xref FileParser::read_xref() {
6666
if (const std::string line = m_parser.read_line(); line != "xref") {
6767
throw std::runtime_error("expected xref");
6868
}
@@ -94,7 +94,7 @@ Xref FileParser::read_xref() const {
9494
}
9595
}
9696

97-
StartXref FileParser::read_start_xref() const {
97+
StartXref FileParser::read_start_xref() {
9898
if (const std::string line = m_parser.read_line(); line != "startxref") {
9999
throw std::runtime_error("expected startxref");
100100
}
@@ -108,7 +108,7 @@ StartXref FileParser::read_start_xref() const {
108108
return result;
109109
}
110110

111-
std::string FileParser::read_stream(const std::int32_t size) const {
111+
std::string FileParser::read_stream(const std::int32_t size) {
112112
std::string result;
113113

114114
if (size >= 0) {
@@ -140,7 +140,7 @@ std::string FileParser::read_stream(const std::int32_t size) const {
140140
return result;
141141
}
142142

143-
void FileParser::read_header() const {
143+
void FileParser::read_header() {
144144
const std::string header1 = m_parser.read_line();
145145
const std::string header2 = m_parser.read_line();
146146

@@ -151,7 +151,7 @@ void FileParser::read_header() const {
151151
m_parser.skip_whitespace();
152152
}
153153

154-
Entry FileParser::read_entry() const {
154+
Entry FileParser::read_entry() {
155155
std::uint32_t position = in().tellg();
156156
const std::string entry_header = m_parser.read_line();
157157
in().seekg(position);
@@ -179,7 +179,7 @@ Entry FileParser::read_entry() const {
179179
throw std::runtime_error("unknown entry");
180180
}
181181

182-
void FileParser::seek_start_xref(const std::uint32_t margin) const {
182+
void FileParser::seek_start_xref(const std::uint32_t margin) {
183183
in().seekg(0, std::ios::end);
184184
const std::int64_t size = in().tellg();
185185
in().seekg(std::max(static_cast<std::int64_t>(0), size - margin),

‎src/odr/internal/pdf/pdf_file_parser.hpp‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,21 @@ class FileParser {
1717
public:
1818
explicit FileParser(std::istream &);
1919

20-
[[nodiscard]] std::istream &in() const;
21-
[[nodiscard]] std::streambuf &sb() const;
22-
[[nodiscard]] const ObjectParser &parser() const;
20+
[[nodiscard]] std::istream &in();
21+
[[nodiscard]] std::streambuf &sb();
22+
[[nodiscard]] ObjectParser &parser();
2323

24-
[[nodiscard]] IndirectObject read_indirect_object() const;
25-
[[nodiscard]] Trailer read_trailer() const;
26-
[[nodiscard]] Xref read_xref() const;
27-
[[nodiscard]] StartXref read_start_xref() const;
24+
[[nodiscard]] IndirectObject read_indirect_object();
25+
[[nodiscard]] Trailer read_trailer();
26+
[[nodiscard]] Xref read_xref();
27+
[[nodiscard]] StartXref read_start_xref();
2828

29-
[[nodiscard]] std::string read_stream(std::int32_t size) const;
29+
[[nodiscard]] std::string read_stream(std::int32_t size);
3030

31-
void read_header() const;
32-
[[nodiscard]] Entry read_entry() const;
31+
void read_header();
32+
[[nodiscard]] Entry read_entry();
3333

34-
void seek_start_xref(std::uint32_t margin = 64) const;
34+
void seek_start_xref(std::uint32_t margin = 64);
3535

3636
private:
3737
ObjectParser m_parser;

‎src/odr/internal/pdf/pdf_graphics_operator.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ struct GraphicsOperator {
103103
using Argument = Object;
104104
using Arguments = std::vector<Argument>;
105105

106-
GraphicsOperatorType type;
106+
GraphicsOperatorType type{GraphicsOperatorType::unknown};
107107
Arguments arguments;
108108
};
109109

‎src/odr/internal/pdf/pdf_graphics_operator_parser.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -115,11 +115,11 @@ static constexpr int_type eof = std::streambuf::traits_type::eof();
115115
GraphicsOperatorParser::GraphicsOperatorParser(std::istream &in)
116116
: m_parser(in) {}
117117

118-
std::istream &GraphicsOperatorParser::in() const { return m_parser.in(); }
118+
std::istream &GraphicsOperatorParser::in() { return m_parser.in(); }
119119

120-
std::streambuf &GraphicsOperatorParser::sb() const { return m_parser.sb(); }
120+
std::streambuf &GraphicsOperatorParser::sb() { return m_parser.sb(); }
121121

122-
std::string GraphicsOperatorParser::read_operator_name() const {
122+
std::string GraphicsOperatorParser::read_operator_name() {
123123
std::string result;
124124

125125
while (true) {
@@ -137,7 +137,7 @@ std::string GraphicsOperatorParser::read_operator_name() const {
137137
}
138138
}
139139

140-
GraphicsOperator GraphicsOperatorParser::read_operator() const {
140+
GraphicsOperator GraphicsOperatorParser::read_operator() {
141141
GraphicsOperator result;
142142

143143
while (true) {

0 commit comments

Comments
 (0)