Refactor QPDFObjectHandle::unsafeShallowCopy

m-holger · Jay Berkenbilt
1 parent 0289b21c
Showing 2 changed files with 4 additions and 14 deletions
include/qpdf/QPDFObjectHandle.hh
libqpdf/QPDFObjectHandle.cc
@@ -1634,7 +1634,6 @@ class QPDFObjectHandle
         bool first_level_only,
         bool stop_at_streams);
     void shallowCopyInternal1(QPDFObjectHandle& oh, bool first_level_only);
-    void shallowCopyInternal2(QPDFObjectHandle& oh);
     void copyObject(
         std::set<QPDFObjGen>& visited,
         bool cross_indirect,
@@ -2298,20 +2298,11 @@ QPDFObjectHandle::copyObject1(
 QPDFObjectHandle
 QPDFObjectHandle::unsafeShallowCopy()
 {
-    QPDFObjectHandle result;
-    shallowCopyInternal2(result);
-    return result;
-}
-
-void
-QPDFObjectHandle::shallowCopyInternal2(QPDFObjectHandle& new_obj)
-{
-    assertInitialized();
-
-    if (isStream()) {
-        throw std::runtime_error("attempt to make a shallow copy of a stream");
+    if (!dereference()) {
+        throw std::logic_error("operation attempted on uninitialized "
+                               "QPDFObjectHandle");
     }
-    new_obj = QPDFObjectHandle(obj->copy(true));
+    return QPDFObjectHandle(obj->copy(true));
 }
  
 void