luke
/
prjxray
mirror of https://github.com/openXC7/prjxray.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tools/bitread.cc: fix build with recent gcc

This commit is contained in:
Gwenhael Goavec-Merou 2026-02-25 11:01:16 +01:00
parent c526b25cd9
commit fcd561fb7f
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/include/prjxray/memory_mapped_file.h
View File

@ -12,6 +12,7 @@
#include <memory> #include <memory>
#include <string> #include <string>
#include <cstdint>
#include <absl/types/span.h> #include <absl/types/span.h>

16
tools/bitread.cc
View File

@ -67,9 +67,9 @@ uint32_t frame_range_begin = 0, frame_range_end = 0;
std::vector<uint32_t> zero_frame(101); std::vector<uint32_t> zero_frame(101);
struct BitReader { struct BitReader {
BitReader(const std::vector<uint8_t>& bytes) : bytes_(bytes) {} BitReader(const absl::Span<uint8_t>& bytes) : bytes_(bytes) {}
const std::vector<uint8_t>& bytes_; const absl::Span<uint8_t>& bytes_;
template <typename T> template <typename T>
int operator()(T& arg) { int operator()(T& arg) {
@ -319,7 +319,7 @@ int main(int argc, char** argv) {
frame_range_end = strtol(p.second.c_str(), nullptr, 0) + 1; frame_range_end = strtol(p.second.c_str(), nullptr, 0) + 1;
} }
std::vector<uint8_t> in_bytes; absl::Span<uint8_t> in_bytes;
if (argc == 2) { if (argc == 2) {
auto in_file_name = argv[1]; auto in_file_name = argv[1];
auto in_file = auto in_file =
@ -333,16 +333,18 @@ int main(int argc, char** argv) {
std::cout << "Bitstream size: " << in_file->size() << " bytes" std::cout << "Bitstream size: " << in_file->size() << " bytes"
<< std::endl; << std::endl;
in_bytes = std::vector<uint8_t>( in_bytes = absl::Span<uint8_t>(
static_cast<uint8_t*>(in_file->data()), static_cast<uint8_t*>(in_file->data()), in_file->size());
static_cast<uint8_t*>(in_file->data()) + in_file->size());
} else { } else {
std::vector<uint8_t> t;
while (1) { while (1) {
int c = getchar(); int c = getchar();
if (c == EOF) if (c == EOF)
break; break;
in_bytes.push_back(c); t.push_back(c);
} }
in_bytes = absl::Span<uint8_t>(
static_cast<uint8_t*>(t.data()), t.size());
std::cout << "Bitstream size: " << in_bytes.size() << " bytes" std::cout << "Bitstream size: " << in_bytes.size() << " bytes"
<< std::endl; << std::endl;