Skip to content

Commit

Permalink
make_unique conversions
Browse files Browse the repository at this point in the history
Requires pointer hack for MSVC.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
  • Loading branch information
neheb committed Jul 25, 2022
1 parent 3ae1d3b commit 4967964
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/tiffcomposite_int.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -1542,19 +1542,19 @@ TiffComponent::UniquePtr newTiffSubIfd(uint16_t tag, IfdId group) {
//! Function to create and initialize a new binary array entry
template <const ArrayCfg* arrayCfg, int N, const ArrayDef arrayDef[N]>
TiffComponent::UniquePtr newTiffBinaryArray0(uint16_t tag, IfdId group) {
return TiffComponent::UniquePtr(new TiffBinaryArray(tag, group, arrayCfg, arrayDef, N));
return std::make_unique<TiffBinaryArray>(tag, group, &(*arrayCfg), &(*arrayDef), N);
}

//! Function to create and initialize a new simple binary array entry
template <const ArrayCfg* arrayCfg>
TiffComponent::UniquePtr newTiffBinaryArray1(uint16_t tag, IfdId group) {
return TiffComponent::UniquePtr(new TiffBinaryArray(tag, group, arrayCfg, nullptr, 0));
return std::make_unique<TiffBinaryArray>(tag, group, &(*arrayCfg), nullptr, 0);
}

//! Function to create and initialize a new complex binary array entry
template <const ArraySet* arraySet, int N, CfgSelFct cfgSelFct>
TiffComponent::UniquePtr newTiffBinaryArray2(uint16_t tag, IfdId group) {
return TiffComponent::UniquePtr(new TiffBinaryArray(tag, group, arraySet, N, cfgSelFct));
return std::make_unique<TiffBinaryArray>(tag, group, &(*arraySet), N, cfgSelFct);
}

//! Function to create and initialize a new TIFF entry for a thumbnail (data)
Expand Down

0 comments on commit 4967964

Please sign in to comment.