uninline constexpr constructors

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

Author: neheb

src/tiffcomposite_int.cpp

@@ -93,6 +93,25 @@ TiffBinaryArray::TiffBinaryArray(uint16_t tag, IfdId group, const ArraySet* arra
   // We'll figure out the correct cfg later
 }
 
+TiffBinaryArray::TiffBinaryArray(const TiffBinaryArray& rhs) :
+    TiffEntryBase(rhs),
+    cfgSelFct_(rhs.cfgSelFct_),
+    arraySet_(rhs.arraySet_),
+    arrayCfg_(rhs.arrayCfg_),
+    arrayDef_(rhs.arrayDef_),
+    defSize_(rhs.defSize_),
+    setSize_(rhs.setSize_),
+    origData_(rhs.origData_),
+    origSize_(rhs.origSize_),
+    pRoot_(rhs.pRoot_) {
+}
+
+TiffEntryBase::TiffEntryBase(uint16_t tag, IfdId group, TiffType tiffType) :
+    TiffComponent(tag, group), tiffType_(tiffType) {
+}
+
+TiffEntryBase::~TiffEntryBase() = default;
+
 TiffEntryBase::TiffEntryBase(const TiffEntryBase& rhs) :
     TiffComponent(rhs),
     tiffType_(rhs.tiffType_),
@@ -111,17 +130,18 @@ TiffDirectory::TiffDirectory(const TiffDirectory& rhs) : TiffComponent(rhs), has
 TiffSubIfd::TiffSubIfd(const TiffSubIfd& rhs) : TiffEntryBase(rhs), newGroup_(rhs.newGroup_) {
 }
 
-TiffBinaryArray::TiffBinaryArray(const TiffBinaryArray& rhs) :
-    TiffEntryBase(rhs),
-    cfgSelFct_(rhs.cfgSelFct_),
-    arraySet_(rhs.arraySet_),
-    arrayCfg_(rhs.arrayCfg_),
-    arrayDef_(rhs.arrayDef_),
-    defSize_(rhs.defSize_),
-    setSize_(rhs.setSize_),
-    origData_(rhs.origData_),
-    origSize_(rhs.origSize_),
-    pRoot_(rhs.pRoot_) {
+TiffDataEntryBase::TiffDataEntryBase(uint16_t tag, IfdId group, uint16_t szTag, IfdId szGroup) :
+    TiffEntryBase(tag, group), szTag_(szTag), szGroup_(szGroup) {
+}
+
+TiffDataEntryBase::~TiffDataEntryBase() = default;
+
+TiffSizeEntry::TiffSizeEntry(uint16_t tag, IfdId group, uint16_t dtTag, IfdId dtGroup) :
+    TiffEntryBase(tag, group), dtTag_(dtTag), dtGroup_(dtGroup) {
+}
+
+TiffMnEntry::TiffMnEntry(uint16_t tag, IfdId group, IfdId mnGroup) :
+    TiffEntryBase(tag, group, ttUndefined), mnGroup_(mnGroup) {
 }
 
 TiffComponent::UniquePtr TiffComponent::clone() const {

src/tiffcomposite_int.hpp

@@ -384,12 +384,10 @@ class TiffEntryBase : public TiffComponent {
   //! @name Creators
   //@{
   //! Default constructor.
-  constexpr TiffEntryBase(uint16_t tag, IfdId group, TiffType tiffType = ttUndefined) :
-      TiffComponent(tag, group), tiffType_(tiffType) {
-  }
+  TiffEntryBase(uint16_t tag, IfdId group, TiffType tiffType = ttUndefined);
 
   //! Virtual destructor.
-  ~TiffEntryBase() override = default;
+  ~TiffEntryBase() override;
   //@}
 
   //! @name NOT implemented
@@ -594,9 +592,7 @@ class TiffDataEntryBase : public TiffEntryBase {
   //! @name Creators
   //@{
   //! Constructor
-  constexpr TiffDataEntryBase(uint16_t tag, IfdId group, uint16_t szTag, IfdId szGroup) :
-      TiffEntryBase(tag, group), szTag_(szTag), szGroup_(szGroup) {
-  }
+  TiffDataEntryBase(uint16_t tag, IfdId group, uint16_t szTag, IfdId szGroup);
   //@}
 
   ~TiffDataEntryBase() override;
@@ -778,10 +774,7 @@ class TiffSizeEntry : public TiffEntryBase {
   //! @name Creators
   //@{
   //! Constructor
-  constexpr TiffSizeEntry(uint16_t tag, IfdId group, uint16_t dtTag, IfdId dtGroup) :
-      TiffEntryBase(tag, group), dtTag_(dtTag), dtGroup_(dtGroup) {
-  }
-
+  TiffSizeEntry(uint16_t tag, IfdId group, uint16_t dtTag, IfdId dtGroup);
   //@}
 
   //! @name Accessors
@@ -1013,9 +1006,7 @@ class TiffMnEntry : public TiffEntryBase {
   //! @name Creators
   //@{
   //! Default constructor
-  constexpr TiffMnEntry(uint16_t tag, IfdId group, IfdId mnGroup) :
-      TiffEntryBase(tag, group, ttUndefined), mnGroup_(mnGroup) {
-  }
+  TiffMnEntry(uint16_t tag, IfdId group, IfdId mnGroup);
 
  protected:
   //! @name Protected Manipulators

src/tiffvisitor_int.cpp

@@ -343,8 +343,6 @@ static const TagInfo* findTag(const TagInfo* pList, uint16_t tag) {
   return pList->tag_ != 0xffff ? pList : nullptr;
 }
 
-TiffDataEntryBase::~TiffDataEntryBase() = default;
-
 void TiffDecoder::decodeCanonAFInfo(const TiffEntryBase* object) {
   // report Exif.Canon.AFInfo as usual
   TiffDecoder::decodeStdTiffEntry(object);