remove some double pointer stuff

neheb · neheb · commit bd1758c3c50f · 2022-04-18T15:35:06.000-07:00
Signed-off-by: Rosen Penev &lt;rosenp@gmail.com&gt;
diff --git a/src/tiffcomposite_int.hpp b/src/tiffcomposite_int.hpp
@@ -1538,10 +1538,9 @@ 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]>
+template <const ArrayCfg* arrayCfg, int N, const ArrayDef arrayDef[N]>
 TiffComponent::UniquePtr newTiffBinaryArray0(uint16_t tag, IfdId group) {
-  // *& acrobatics is a workaround for a MSVC 7.1 bug
-  return TiffComponent::UniquePtr(new TiffBinaryArray(tag, group, arrayCfg, *(&arrayDef), N));
+  return TiffComponent::UniquePtr(new TiffBinaryArray(tag, group, arrayCfg, arrayDef, N));
 }
 
 //! Function to create and initialize a new simple binary array entry

Original file line number	Diff line number	Diff line change
`@@ -1538,10 +1538,9 @@ TiffComponent::UniquePtr newTiffSubIfd(uint16_t tag, IfdId group) {`
`1538`	`1538`	`}`
`1539`	`1539`
`1540`	`1540`	`//! Function to create and initialize a new binary array entry`
`1541`		`-template <const ArrayCfg* arrayCfg, int N, const ArrayDef (&arrayDef)[N]>`
	`1541`	`+template <const ArrayCfg* arrayCfg, int N, const ArrayDef arrayDef[N]>`
`1542`	`1542`	`TiffComponent::UniquePtr newTiffBinaryArray0(uint16_t tag, IfdId group) {`
`1543`		`- // *& acrobatics is a workaround for a MSVC 7.1 bug`
`1544`		`- return TiffComponent::UniquePtr(new TiffBinaryArray(tag, group, arrayCfg, *(&arrayDef), N));`
	`1543`	`+ return TiffComponent::UniquePtr(new TiffBinaryArray(tag, group, arrayCfg, arrayDef, N));`
`1545`	`1544`	`}`
`1546`	`1545`
`1547`	`1546`	`//! Function to create and initialize a new simple binary array entry`