leonarski_fandClaude Opus 4.8
ebc28744e2
Address portability issues found building jfjoch_viewer with MSVC:
- common/{ADUHistogram,AzimuthalIntegrationProfile}.h and
image_analysis/spot_finding/StrongPixelSet.h only need DeviceOutput,
so include fpga/pcie_driver/jfjoch_fpga.h (plain-C, self-contained)
directly instead of acquisition_device/AcquisitionDevice.h, which
dragged <unistd.h> into the viewer tree.
- common/time_utc.h: guard gmtime_r/timegm/localtime_r with the MSVC
equivalents (gmtime_s/_mkgmtime/localtime_s) under _WIN32; drop the
duplicated includes and add the headers used directly.
- gemmi_gph/gemmi/utf.hpp: vendor the upstream gemmi header; fileutil.hpp
includes it on Windows for UTF8_to_wchar but it was never vendored.
- writer/HDF5Objects.cpp: ExtractFilename returns path.filename().string()
(std::filesystem::path has no implicit conversion to std::string on
Windows, where it is wchar_t-based).
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
79 lines
2.4 KiB
C++
79 lines
2.4 KiB
C++
// Copyright 2017 Global Phasing Ltd.
|
|
//
|
|
// Conversion between UTF-8 and wchar. Used only for file names on Windows.
|
|
|
|
#ifndef GEMMI_UTF_HPP_
|
|
#define GEMMI_UTF_HPP_
|
|
|
|
#include <string>
|
|
|
|
namespace gemmi {
|
|
|
|
// from Mark Ransom's answer
|
|
// https://stackoverflow.com/questions/148403/utf8-to-from-wide-char-conversion-in-stl/148766#148766
|
|
inline std::wstring UTF8_to_wchar(const char* in) {
|
|
std::wstring out;
|
|
unsigned int codepoint = 0;
|
|
while (*in != 0) {
|
|
unsigned char ch = static_cast<unsigned char>(*in);
|
|
if (ch <= 0x7f)
|
|
codepoint = ch;
|
|
else if (ch <= 0xbf)
|
|
codepoint = (codepoint << 6) | (ch & 0x3f);
|
|
else if (ch <= 0xdf)
|
|
codepoint = ch & 0x1f;
|
|
else if (ch <= 0xef)
|
|
codepoint = ch & 0x0f;
|
|
else
|
|
codepoint = ch & 0x07;
|
|
++in;
|
|
if ((*in & 0xc0) != 0x80 && codepoint <= 0x10ffff) {
|
|
if (sizeof(wchar_t) > 2) {
|
|
out.append(1, static_cast<wchar_t>(codepoint));
|
|
} else if (codepoint > 0xffff) {
|
|
out.append(1, static_cast<wchar_t>(0xd800 + (codepoint >> 10)));
|
|
out.append(1, static_cast<wchar_t>(0xdc00 + (codepoint & 0x03ff)));
|
|
} else if (codepoint < 0xd800 || codepoint >= 0xe000) {
|
|
out.append(1, static_cast<wchar_t>(codepoint));
|
|
}
|
|
}
|
|
}
|
|
return out;
|
|
}
|
|
|
|
inline std::string wchar_to_UTF8(const wchar_t* in) {
|
|
std::string out;
|
|
unsigned int codepoint = 0;
|
|
while (*in != 0) {
|
|
if (*in >= 0xd800 && *in <= 0xdbff) {
|
|
codepoint = ((*in - 0xd800) << 10) + 0x10000;
|
|
} else {
|
|
if (*in >= 0xdc00 && *in <= 0xdfff)
|
|
codepoint |= *in - 0xdc00;
|
|
else
|
|
codepoint = *in;
|
|
if (codepoint <= 0x7f) {
|
|
out += static_cast<char>(codepoint);
|
|
} else if (codepoint <= 0x7ff) {
|
|
out += static_cast<char>(0xc0 | ((codepoint >> 6) & 0x1f));
|
|
out += static_cast<char>(0x80 | (codepoint & 0x3f));
|
|
} else if (codepoint <= 0xffff) {
|
|
out += static_cast<char>(0xe0 | ((codepoint >> 12) & 0x0f));
|
|
out += static_cast<char>(0x80 | ((codepoint >> 6) & 0x3f));
|
|
out += static_cast<char>(0x80 | (codepoint & 0x3f));
|
|
} else {
|
|
out += static_cast<char>(0xf0 | ((codepoint >> 18) & 0x07));
|
|
out += static_cast<char>(0x80 | ((codepoint >> 12) & 0x3f));
|
|
out += static_cast<char>(0x80 | ((codepoint >> 6) & 0x3f));
|
|
out += static_cast<char>(0x80 | (codepoint & 0x3f));
|
|
}
|
|
codepoint = 0;
|
|
}
|
|
++in;
|
|
}
|
|
return out;
|
|
}
|
|
|
|
} // namespace gemmi
|
|
#endif
|