Mirrors/inspectrum
2
0
Fork 0
mirror of https://github.com/miek/inspectrum.git synced 2026-03-07 00:37:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

replace off_t with size_t to match system pointer size

Browse Source 
I was having an issue with size of off_t on a multi-gigabit file.
This may have been related to long being a signed 32 bits on MSVC.
But I think there is good reason to use size_t here in general:

https://stackoverflow.com/questions/10634629/what-are-the-usage-differences-between-size-t-and-off-t
This commit is contained in:
Josh Blum
2017-11-25 16:06:08 -06:00
parent 40890e46ab
commit 3f5e373ee4
27 changed files with 94 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
inputsource.cpp
View File

@@ -35,7 +35,7 @@ public:
return sizeof(std::complex<float>);
}
void copyRange(const void* const src, off_t start, off_t length, std::complex<float>* const dest) override {
void copyRange(const void* const src, size_t start, size_t length, std::complex<float>* const dest) override {
auto s = reinterpret_cast<const std::complex<float>*>(src);
std::copy(&s[start], &s[start + length], dest);
}
@@ -47,7 +47,7 @@ public:
return sizeof(std::complex<int16_t>);
}
void copyRange(const void* const src, off_t start, off_t length, std::complex<float>* const dest) override {
void copyRange(const void* const src, size_t start, size_t length, std::complex<float>* const dest) override {
auto s = reinterpret_cast<const std::complex<int16_t>*>(src);
std::transform(&s[start], &s[start + length], dest,
[](const std::complex<int16_t>& v) -> std::complex<float> {
@@ -64,7 +64,7 @@ public:
return sizeof(std::complex<int8_t>);
}
void copyRange(const void* const src, off_t start, off_t length, std::complex<float>* const dest) override {
void copyRange(const void* const src, size_t start, size_t length, std::complex<float>* const dest) override {
auto s = reinterpret_cast<const std::complex<int8_t>*>(src);
std::transform(&s[start], &s[start + length], dest,
[](const std::complex<int8_t>& v) -> std::complex<float> {
@@ -81,7 +81,7 @@ public:
return sizeof(std::complex<uint8_t>);
}
void copyRange(const void* const src, off_t start, off_t length, std::complex<float>* const dest) override {
void copyRange(const void* const src, size_t start, size_t length, std::complex<float>* const dest) override {
auto s = reinterpret_cast<const std::complex<uint8_t>*>(src);
std::transform(&s[start], &s[start + length], dest,
[](const std::complex<uint8_t>& v) -> std::complex<float> {
@@ -154,18 +154,18 @@ void InputSource::openFile(const char *filename)
invalidate();
}
void InputSource::setSampleRate(off_t rate)
void InputSource::setSampleRate(size_t rate)
{
sampleRate = rate;
invalidate();
}
off_t InputSource::rate()
size_t InputSource::rate()
{
return sampleRate;
}
std::unique_ptr<std::complex<float>[]> InputSource::getSamples(off_t start, off_t length)
std::unique_ptr<std::complex<float>[]> InputSource::getSamples(size_t start, size_t length)
{
if (inputFile == nullptr)
return nullptr;