From fe9947d4fb5741436ed69085406b7133ac835d66 Mon Sep 17 00:00:00 2001
From: Frank Bossen <fbossen@gmail.com>
Date: Sat, 28 Jan 2023 11:24:04 -0500
Subject: [PATCH] Fix compilation when JVET_O0756_CALCULATE_HDRMETRICS is
enabled
---
source/Lib/EncoderLib/EncGOP.cpp | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/source/Lib/EncoderLib/EncGOP.cpp b/source/Lib/EncoderLib/EncGOP.cpp
index 8a108844c..d95c509ac 100644
--- a/source/Lib/EncoderLib/EncGOP.cpp
+++ b/source/Lib/EncoderLib/EncGOP.cpp
@@ -5239,9 +5239,8 @@ void EncGOP::xCalculateAddPSNR(Picture* pcPic, PelUnitBuf cPicD, const AccessUni
int64_t xdeltaE[MAX_NUM_COMPONENT];
for (int i = 0; i < 1; i++)
{
- copy(reinterpret_cast<uint8_t *>(&deltaE[i]),
- reinterpret_cast<uint8_t *>(&deltaE[i]) + sizeof(deltaE[i]),
- reinterpret_cast<uint8_t *>(&xdeltaE[i]));
+ std::copy_n(reinterpret_cast<uint8_t*>(&deltaE[i]), sizeof(deltaE[i]),
+ reinterpret_cast<uint8_t*>(&xdeltaE[i]));
}
msg(NOTICE, " [xDeltaE%d %16" PRIx64 "]", (int)m_pcCfg->getWhitePointDeltaE(i), xdeltaE[0]);
}
@@ -5255,9 +5254,8 @@ void EncGOP::xCalculateAddPSNR(Picture* pcPic, PelUnitBuf cPicD, const AccessUni
int64_t xpsnrL[MAX_NUM_COMPONENT];
for (int i = 0; i < 1; i++)
{
- copy(reinterpret_cast<uint8_t *>(&psnrL[i]),
- reinterpret_cast<uint8_t *>(&psnrL[i]) + sizeof(psnrL[i]),
- reinterpret_cast<uint8_t *>(&xpsnrL[i]));
+ std::copy_n(reinterpret_cast<uint8_t*>(&psnrL[i]), sizeof(psnrL[i]),
+ reinterpret_cast<uint8_t*>(&xpsnrL[i]));
}
msg(NOTICE, " [xPSNRL%d %16" PRIx64 "]", (int) m_pcCfg->getWhitePointDeltaE(i), xpsnrL[0]);
--
GitLab