From 4ab2c57b61ff1659e4e7855459def999713ea55c Mon Sep 17 00:00:00 2001
From: Frank Bossen <fbossen@gmail.com>
Date: Wed, 2 Nov 2022 10:59:45 -0400
Subject: [PATCH] Address compiler warnings/errors
---
source/App/Parcat/parcat.cpp | 2 +-
source/Lib/CommonLib/Quant.cpp | 3 ++-
source/Lib/CommonLib/TypeDef.h | 1 +
source/Lib/DecoderLib/SEIread.cpp | 5 ++++-
source/Lib/Utilities/program_options_lite.h | 16 ++++++++--------
5 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/source/App/Parcat/parcat.cpp b/source/App/Parcat/parcat.cpp
index 5746f4695a..d2a2be59d2 100644
--- a/source/App/Parcat/parcat.cpp
+++ b/source/App/Parcat/parcat.cpp
@@ -373,7 +373,7 @@ std::vector<uint8_t> process_segment(const char * path, int idx, int * poc_base,
}
fseek(fdi, 0, SEEK_END);
- int full_sz = ftell(fdi);
+ long full_sz = ftell(fdi);
fseek(fdi, 0, SEEK_SET);
std::vector<uint8_t> v(full_sz);
diff --git a/source/Lib/CommonLib/Quant.cpp b/source/Lib/CommonLib/Quant.cpp
index b75f57ea01..249df2fe57 100644
--- a/source/Lib/CommonLib/Quant.cpp
+++ b/source/Lib/CommonLib/Quant.cpp
@@ -1104,7 +1104,8 @@ void Quant::transformSkipQuantOneSample(TransformUnit &tu, const ComponentID &co
*/
const int iQBits = QUANT_SHIFT + cQP.per(useTransformSkip) + (useTransformSkip ? 0 : iTransformShift);
// QBits will be OK for any internal bit depth as the reduction in transform shift is balanced by an increase in Qp_per due to QpBDOffset
- const int iAdd = int64_t(bUseHalfRoundingPoint ? 256 : (tu.cs->slice->isIRAP() ? 171 : 85)) << int64_t(iQBits - 9);
+ const int64_t iAdd = int64_t(bUseHalfRoundingPoint ? 256 : (tu.cs->slice->isIRAP() ? 171 : 85))
+ << int64_t(iQBits - 9);
TCoeff transformedCoefficient;
// transform-skip
diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h
index da8efde648..38c36ee8fe 100644
--- a/source/Lib/CommonLib/TypeDef.h
+++ b/source/Lib/CommonLib/TypeDef.h
@@ -42,6 +42,7 @@
#error Include CommonDef.h not TypeDef.h
#endif
+#include <array>
#include <vector>
#include <utility>
#include <sstream>
diff --git a/source/Lib/DecoderLib/SEIread.cpp b/source/Lib/DecoderLib/SEIread.cpp
index 10cf16d692..2abafca5f3 100644
--- a/source/Lib/DecoderLib/SEIread.cpp
+++ b/source/Lib/DecoderLib/SEIread.cpp
@@ -110,7 +110,10 @@ static inline void output_sei_message_header(SEI &sei, std::ostream *pDecodedMes
if (pDecodedMessageOutputStream)
{
std::string seiMessageHdr(SEI::getSEIMessageString(sei.payloadType())); seiMessageHdr+=" SEI message";
- (*pDecodedMessageOutputStream) << std::setfill('-') << std::setw(seiMessageHdr.size()) << "-" << std::setfill(' ') << "\n" << seiMessageHdr << " (" << payloadSize << " bytes)"<< "\n";
+ (*pDecodedMessageOutputStream) << std::setfill('-') << std::setw((int) seiMessageHdr.size()) << "-"
+ << std::setfill(' ') << "\n"
+ << seiMessageHdr << " (" << payloadSize << " bytes)"
+ << "\n";
}
}
diff --git a/source/Lib/Utilities/program_options_lite.h b/source/Lib/Utilities/program_options_lite.h
index 2b1f4cfb11..7324b7e09c 100644
--- a/source/Lib/Utilities/program_options_lite.h
+++ b/source/Lib/Utilities/program_options_lite.h
@@ -264,15 +264,15 @@ namespace df
std::string cNameBuffer;
std::string cDescriptionBuffer;
- for (unsigned int uiK = 0; uiK < uiMaxNum; uiK++)
+ for (unsigned int k = 0; k < uiMaxNum; k++)
{
// it needs to be reset when extra digit is added, e.g. number 10 and above
cNameBuffer.resize(name.size() + 10);
cDescriptionBuffer.resize(desc.size() + 10);
// isn't there are sprintf function for string??
- sprintf((char*)cNameBuffer.c_str(), name.c_str(), uiK, uiK);
- sprintf((char*)cDescriptionBuffer.c_str(), desc.c_str(), uiK, uiK);
+ snprintf((char *) cNameBuffer.c_str(), cNameBuffer.size(), name.c_str(), k, k);
+ snprintf((char *) cDescriptionBuffer.c_str(), cDescriptionBuffer.size(), desc.c_str(), k, k);
size_t pos = cNameBuffer.find_first_of('\0');
if (pos != std::string::npos)
@@ -280,7 +280,7 @@ namespace df
cNameBuffer.resize(pos);
}
- parent.addOption(new Option<T>(cNameBuffer, (storage[uiK]), default_val, cDescriptionBuffer));
+ parent.addOption(new Option<T>(cNameBuffer, (storage[k]), default_val, cDescriptionBuffer));
}
return *this;
@@ -293,21 +293,21 @@ namespace df
std::string cNameBuffer;
std::string cDescriptionBuffer;
- for (unsigned int uiK = 0; uiK < uiMaxNum; uiK++)
+ for (unsigned int k = 0; k < uiMaxNum; k++)
{
// it needs to be reset when extra digit is added, e.g. number 10 and above
cNameBuffer.resize(name.size() + 10);
cDescriptionBuffer.resize(desc.size() + 10);
// isn't there are sprintf function for string??
- sprintf((char*)cNameBuffer.c_str(), name.c_str(), uiK, uiK);
- sprintf((char*)cDescriptionBuffer.c_str(), desc.c_str(), uiK, uiK);
+ snprintf((char *) cNameBuffer.c_str(), cNameBuffer.size(), name.c_str(), k, k);
+ snprintf((char *) cDescriptionBuffer.c_str(), cDescriptionBuffer.size(), desc.c_str(), k, k);
size_t pos = cNameBuffer.find_first_of('\0');
if (pos != std::string::npos)
cNameBuffer.resize(pos);
- parent.addOption(new Option<T>(cNameBuffer, *(storage[uiK]), default_val, cDescriptionBuffer));
+ parent.addOption(new Option<T>(cNameBuffer, *(storage[k]), default_val, cDescriptionBuffer));
}
return *this;
--
GitLab