octoleo
/
qpdf
mirror of https://github.com/qpdf/qpdf.git
2
1
Fork 0
Code Issues Releases Wiki Activity

string_view leads to char_traits which is not standard C++ (background in #1024). 

This triggers compilation failures with certain C++20 compiler configurations.

To avoid this I moved the cast to the loop's body.
This commit is contained in:
Zoe Clifford 2024-02-28 13:26:10 -08:00
parent 3b97c9bd26
commit 07bc363224
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libqpdf/QPDF_Name.cc
View File

@ -3,8 +3,6 @@
#include <qpdf/JSON_writer.hh>
#include <qpdf/QUtil.hh>
#include <string_view>
QPDF_Name::QPDF_Name(std::string const& name) :
QPDFValue(::ot_name, "name"),
name(name)
@ -57,14 +55,12 @@ QPDF_Name::unparse()
std::pair<bool, bool>
QPDF_Name::analyzeJSONEncoding(const std::string& name)
{
std::basic_string_view<unsigned char> view{
reinterpret_cast<const unsigned char*>(name.data()), name.size()};
int tail = 0; // Number of continuation characters expected.
bool tail2 = false; // Potential overlong 3 octet utf-8.
bool tail3 = false; // potential overlong 4 octet
bool needs_escaping = false;
for (auto const& c: view) {
for (auto it = name.begin(); it != name.end(); ++it) {
unsigned char c = static_cast<unsigned char>(*it);
if (tail) {
if ((c & 0xc0) != 0x80) {
return {false, false};