Commit 728dc9e6d8975eebbbc0f5b35628b57d273ffe2d
1 parent
dea704f0
Fix error caught by clang
Showing
2 changed files
with
13 additions
and
4 deletions
include/qpdf/QPDFObjectHandle.hh
| @@ -652,6 +652,16 @@ class QPDFObjectHandle | @@ -652,6 +652,16 @@ class QPDFObjectHandle | ||
| 652 | QPDFObjectHandle(QPDF*, int objid, int generation); | 652 | QPDFObjectHandle(QPDF*, int objid, int generation); |
| 653 | QPDFObjectHandle(QPDFObject*); | 653 | QPDFObjectHandle(QPDFObject*); |
| 654 | 654 | ||
| 655 | + enum parser_state_e | ||
| 656 | + { | ||
| 657 | + st_top, | ||
| 658 | + st_start, | ||
| 659 | + st_stop, | ||
| 660 | + st_eof, | ||
| 661 | + st_dictionary, | ||
| 662 | + st_array | ||
| 663 | + }; | ||
| 664 | + | ||
| 655 | // Private object factory methods | 665 | // Private object factory methods |
| 656 | static QPDFObjectHandle newIndirect(QPDF*, int objid, int generation); | 666 | static QPDFObjectHandle newIndirect(QPDF*, int objid, int generation); |
| 657 | static QPDFObjectHandle newStream( | 667 | static QPDFObjectHandle newStream( |
libqpdf/QPDFObjectHandle.cc
| @@ -965,8 +965,7 @@ QPDFObjectHandle::parseInternal(PointerHolder<InputSource> input, | @@ -965,8 +965,7 @@ QPDFObjectHandle::parseInternal(PointerHolder<InputSource> input, | ||
| 965 | 965 | ||
| 966 | std::vector<std::vector<QPDFObjectHandle> > olist_stack; | 966 | std::vector<std::vector<QPDFObjectHandle> > olist_stack; |
| 967 | olist_stack.push_back(std::vector<QPDFObjectHandle>()); | 967 | olist_stack.push_back(std::vector<QPDFObjectHandle>()); |
| 968 | - enum state_e { st_top, st_start, st_stop, st_eof, st_dictionary, st_array }; | ||
| 969 | - std::vector<state_e> state_stack; | 968 | + std::vector<parser_state_e> state_stack; |
| 970 | state_stack.push_back(st_top); | 969 | state_stack.push_back(st_top); |
| 971 | std::vector<qpdf_offset_t> offset_stack; | 970 | std::vector<qpdf_offset_t> offset_stack; |
| 972 | offset_stack.push_back(input->tell()); | 971 | offset_stack.push_back(input->tell()); |
| @@ -974,7 +973,7 @@ QPDFObjectHandle::parseInternal(PointerHolder<InputSource> input, | @@ -974,7 +973,7 @@ QPDFObjectHandle::parseInternal(PointerHolder<InputSource> input, | ||
| 974 | while (! done) | 973 | while (! done) |
| 975 | { | 974 | { |
| 976 | std::vector<QPDFObjectHandle>& olist = olist_stack.back(); | 975 | std::vector<QPDFObjectHandle>& olist = olist_stack.back(); |
| 977 | - state_e state = state_stack.back(); | 976 | + parser_state_e state = state_stack.back(); |
| 978 | qpdf_offset_t offset = offset_stack.back(); | 977 | qpdf_offset_t offset = offset_stack.back(); |
| 979 | 978 | ||
| 980 | object = QPDFObjectHandle(); | 979 | object = QPDFObjectHandle(); |
| @@ -1193,7 +1192,7 @@ QPDFObjectHandle::parseInternal(PointerHolder<InputSource> input, | @@ -1193,7 +1192,7 @@ QPDFObjectHandle::parseInternal(PointerHolder<InputSource> input, | ||
| 1193 | "QPDFObjectHandle::parseInternal: st_stop encountered" | 1192 | "QPDFObjectHandle::parseInternal: st_stop encountered" |
| 1194 | " with insufficient elements in stack"); | 1193 | " with insufficient elements in stack"); |
| 1195 | } | 1194 | } |
| 1196 | - state_e old_state = state_stack.back(); | 1195 | + parser_state_e old_state = state_stack.back(); |
| 1197 | state_stack.pop_back(); | 1196 | state_stack.pop_back(); |
| 1198 | if (old_state == st_array) | 1197 | if (old_state == st_array) |
| 1199 | { | 1198 | { |