struct to std::pair conversions

Signed-off-by: Rosen Penev <[email protected]>

Author: neheb

src/crwimage_int.cpp

@@ -22,10 +22,7 @@ class RotationMap {
 
  private:
   //! Helper structure for the mapping list
-  struct OmList {
-    uint16_t orientation;  //!< Exif orientation value
-    int32_t degrees;       //!< CRW Rotation degrees
-  };
+  using OmList = std::pair<uint16_t, int32_t>;
   // DATA
   static const OmList omList_[];
 };  // class RotationMap
@@ -520,7 +517,7 @@ CiffComponent* CiffDirectory::doFindComponent(uint16_t crwTagId, uint16_t crwDir
 void CiffHeader::add(uint16_t crwTagId, uint16_t crwDir, DataBuf&& buf) {
   CrwDirs crwDirs;
   CrwMap::loadStack(crwDirs, crwDir);
-  [[maybe_unused]] uint16_t rootDirectory = crwDirs.top().crwDir_;
+  [[maybe_unused]] auto [rootDirectory, _] = crwDirs.top();
   crwDirs.pop();
   if (!pRootDir_) {
     pRootDir_ = std::make_unique<CiffDirectory>();
@@ -553,18 +550,18 @@ CiffComponent* CiffDirectory::doAdd(CrwDirs& crwDirs, uint16_t crwTagId) {
         set value
   */
   if (!crwDirs.empty()) {
-    CrwSubDir csd = crwDirs.top();
+    auto [dir, parent] = crwDirs.top();
     crwDirs.pop();
     // Find the directory
     for (auto&& component : components_) {
-      if (component->tag() == csd.crwDir_) {
+      if (component->tag() == dir) {
         cc_ = component;
         break;
       }
     }
     if (!cc_) {
       // Directory doesn't exist yet, add it
-      m_ = std::make_unique<CiffDirectory>(csd.crwDir_, csd.parent_);
+      m_ = std::make_unique<CiffDirectory>(dir, parent);
       cc_ = m_.get();
       add(std::move(m_));
     }
@@ -592,7 +589,6 @@ void CiffHeader::remove(uint16_t crwTagId, uint16_t crwDir) {
   if (pRootDir_) {
     CrwDirs crwDirs;
     CrwMap::loadStack(crwDirs, crwDir);
-    [[maybe_unused]] uint16_t rootDirectory = crwDirs.top().crwDir_;
     crwDirs.pop();
     pRootDir_->remove(crwDirs, crwTagId);
   }
@@ -608,11 +604,11 @@ void CiffComponent::doRemove(CrwDirs& /*crwDirs*/, uint16_t /*crwTagId*/) {
 
 void CiffDirectory::doRemove(CrwDirs& crwDirs, uint16_t crwTagId) {
   if (!crwDirs.empty()) {
-    CrwSubDir csd = crwDirs.top();
+    auto [dir, _] = crwDirs.top();
     crwDirs.pop();
     // Find the directory
     for (auto i = components_.begin(); i != components_.end(); ++i) {
-      if ((*i)->tag() == csd.crwDir_) {
+      if ((*i)->tag() == dir) {
         // Recursive call to next lower level directory
         (*i)->remove(crwDirs, crwTagId);
         if ((*i)->empty())
@@ -743,8 +739,8 @@ void CrwMap::decodeArray(const CiffComponent& ciffComponent, const CrwMapping* p
   if (ifdId == canonSiId) {
     // Exif.Photo.FNumber
     float f = fnumber(canonEv(aperture));
-    Rational r = floatToRationalCast(f);
-    URational ur(r.first, r.second);
+    auto [r, s] = floatToRationalCast(f);
+    auto ur = URational(r, s);
     URationalValue fn;
     fn.value_.push_back(ur);
     image.exifData().add(ExifKey("Exif.Photo.FNumber"), &fn);
@@ -835,9 +831,10 @@ void CrwMap::decodeBasic(const CiffComponent& ciffComponent, const CrwMapping* p
 
 void CrwMap::loadStack(CrwDirs& crwDirs, uint16_t crwDir) {
   for (auto&& crw : crwSubDir_) {
-    if (crw.crwDir_ == crwDir) {
+    auto&& [dir, parent] = crw;
+    if (dir == crwDir) {
       crwDirs.push(crw);
-      crwDir = crw.parent_;
+      crwDir = parent;
     }
   }
 }  // CrwMap::loadStack

src/crwimage_int.hpp

@@ -20,7 +20,7 @@ namespace Exiv2::Internal {
 class CiffHeader;
 class CiffComponent;
 struct CrwMapping;
-struct CrwSubDir;
+using CrwSubDir = std::pair<uint16_t, uint16_t>;
 
 // *****************************************************************************
 // type definitions
@@ -486,12 +486,6 @@ class CiffHeader {
 
 };  // class CiffHeader
 
-//! Structure for the CIFF directory hierarchy
-struct CrwSubDir {
-  uint16_t crwDir_;  //!< Directory tag
-  uint16_t parent_;  //!< Parent directory tag
-};                   // struct CrwSubDir
-
 /*!
   @brief Structure for a mapping table for conversion of CIFF entries to
          image metadata and vice versa.

src/tags_int.hpp

@@ -213,10 +213,7 @@ struct TagDetails {
   @brief Helper structure for lookup tables for translations of bitmask
          values to human readable labels.
  */
-struct TagDetailsBitmask {
-  uint32_t mask_;      //!< Bitmask value
-  const char* label_;  //!< Description of the tag value
-};                     // struct TagDetailsBitmask
+using TagDetailsBitmask = std::pair<uint32_t, const char*>;
 
 /*!
   @brief Helper structure for lookup tables for translations of controlled
@@ -271,20 +268,20 @@ template <int N, const TagDetailsBitmask (&array)[N]>
 std::ostream& printTagBitmask(std::ostream& os, const Value& value, const ExifData*) {
   const auto val = value.toUint32();
   if (val == 0 && N > 0) {
-    const TagDetailsBitmask* td = *(&array);
-    if (td->mask_ == 0)
-      return os << exvGettext(td->label_);
+    auto [mask, label] = *array;
+    if (mask == 0)
+      return os << exvGettext(label);
   }
   bool sep = false;
   for (int i = 0; i < N; ++i) {
     // *& acrobatics is a workaround for a MSVC 7.1 bug
-    const TagDetailsBitmask* td = *(&array) + i;
+    auto [mask, label] = *(array + i);
 
-    if (val & td->mask_) {
+    if (val & mask) {
       if (sep) {
-        os << ", " << exvGettext(td->label_);
+        os << ", " << exvGettext(label);
       } else {
-        os << exvGettext(td->label_);
+        os << exvGettext(label);
         sep = true;
       }
     }

src/tiffimage_int.hpp

@@ -134,17 +134,11 @@ class TiffHeader : public TiffHeaderBase {
  */
 struct TiffImgTagStruct {
   //! Search key for TIFF image tag structure.
-  struct Key {
-    //! Constructor
-    Key(uint16_t t, IfdId g) : t_(t), g_(g) {
-    }
-    uint16_t t_;  //!< %Tag
-    IfdId g_;     //!< %Group
-  };
-
+  using Key = std::pair<uint16_t, IfdId>;
   //! Comparison operator to compare a TiffImgTagStruct with a TiffImgTagStruct::Key
   bool operator==(const Key& key) const {
-    return key.g_ == group_ && key.t_ == tag_;
+    auto [t, g] = key;
+    return g == group_ && t == tag_;
   }
 
   // DATA
@@ -158,17 +152,12 @@ struct TiffImgTagStruct {
  */
 struct TiffGroupStruct {
   //! Search key for TIFF group structure.
-  struct Key {
-    //! Constructor
-    Key(uint32_t e, IfdId g) : e_(e), g_(g) {
-    }
-    uint32_t e_;  //!< Extended tag
-    IfdId g_;     //!< %Group
-  };
+  using Key = std::pair<uint32_t, IfdId>;
 
   //! Comparison operator to compare a TiffGroupStruct with a TiffGroupStruct::Key
   bool operator==(const Key& key) const {
-    return key.g_ == group_ && (Tag::all == extendedTag_ || key.e_ == extendedTag_);
+    auto [e, g] = key;
+    return g == group_ && (Tag::all == extendedTag_ || e == extendedTag_);
   }
   //! Return the tag corresponding to the extended tag
   [[nodiscard]] uint16_t tag() const {