From 728dc9e6d8975eebbbc0f5b35628b57d273ffe2d Mon Sep 17 00:00:00 2001
From: Jay Berkenbilt <ejb@ql.org>
Date: Sat, 26 Aug 2017 21:51:17 -0400
Subject: Fix error caught by clang

---
 include/qpdf/QPDFObjectHandle.hh | 10 ++++++++++
 libqpdf/QPDFObjectHandle.cc      |  7 +++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/include/qpdf/QPDFObjectHandle.hh b/include/qpdf/QPDFObjectHandle.hh
index 344f6a94..8c38fffe 100644
--- a/include/qpdf/QPDFObjectHandle.hh
+++ b/include/qpdf/QPDFObjectHandle.hh
@@ -652,6 +652,16 @@ class QPDFObjectHandle
     QPDFObjectHandle(QPDF*, int objid, int generation);
     QPDFObjectHandle(QPDFObject*);
 
+    enum parser_state_e
+    {
+        st_top,
+        st_start,
+        st_stop,
+        st_eof,
+        st_dictionary,
+        st_array
+    };
+
     // Private object factory methods
     static QPDFObjectHandle newIndirect(QPDF*, int objid, int generation);
     static QPDFObjectHandle newStream(
diff --git a/libqpdf/QPDFObjectHandle.cc b/libqpdf/QPDFObjectHandle.cc
index e854253a..888d9a3a 100644
--- a/libqpdf/QPDFObjectHandle.cc
+++ b/libqpdf/QPDFObjectHandle.cc
@@ -965,8 +965,7 @@ QPDFObjectHandle::parseInternal(PointerHolder<InputSource> input,
 
     std::vector<std::vector<QPDFObjectHandle> > olist_stack;
     olist_stack.push_back(std::vector<QPDFObjectHandle>());
-    enum state_e { st_top, st_start, st_stop, st_eof, st_dictionary, st_array };
-    std::vector<state_e> state_stack;
+    std::vector<parser_state_e> state_stack;
     state_stack.push_back(st_top);
     std::vector<qpdf_offset_t> offset_stack;
     offset_stack.push_back(input->tell());
@@ -974,7 +973,7 @@ QPDFObjectHandle::parseInternal(PointerHolder<InputSource> input,
     while (! done)
     {
         std::vector<QPDFObjectHandle>& olist = olist_stack.back();
-        state_e state = state_stack.back();
+        parser_state_e state = state_stack.back();
         qpdf_offset_t offset = offset_stack.back();
 
 	object = QPDFObjectHandle();
@@ -1193,7 +1192,7 @@ QPDFObjectHandle::parseInternal(PointerHolder<InputSource> input,
                     "QPDFObjectHandle::parseInternal: st_stop encountered"
                     " with insufficient elements in stack");
             }
-            state_e old_state = state_stack.back();
+            parser_state_e old_state = state_stack.back();
             state_stack.pop_back();
             if (old_state == st_array)
             {
-- 
cgit v1.2.3-54-g00ecf