Refactoring suggested by @neheb

(cherry picked from commit 03bdced)

# Conflicts:
#	src/crwimage_int.cpp

src/crwimage_int.cpp

@@ -566,6 +566,7 @@ CiffComponent* CiffDirectory::doAdd(CrwDirs& crwDirs, uint16_t crwTagId) {
       add(std::move(m_));
     }
     // Recursive call to next lower level directory
+<<<<<<< HEAD
     cc = cc->add(crwDirs, crwTagId);
   } else {
     // Find the tag
@@ -587,7 +588,22 @@ CiffComponent* CiffDirectory::doAdd(CrwDirs& crwDirs, uint16_t crwTagId) {
       m_ = std::make_unique<CiffEntry>(crwTagId, tag());
       cc = m_.get();
       add(std::move(m_));
+=======
+    return cc->add(crwDirs, crwTagId);
+  }
+
+  // Find the tag
+  for (const auto& c : components_)
+    if (c->tagId() == crwTagId) {
+      cc = c;
+      break;
+>>>>>>> 03bdced4 (Refactoring suggested by @neheb)
     }
+  if (!cc) {
+    // Tag doesn't exist yet, add it
+    m_ = std::make_unique<CiffEntry>(crwTagId, tag());
+    cc = m_.get();
+    add(std::move(m_));
   }
   return cc;
 }  // CiffDirectory::doAdd