Mirrors/inspectrum
2
0
Fork 0
mirror of https://github.com/miek/inspectrum.git synced 2026-03-04 15:34:21 +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

24
plotview.cpp
View File

@@ -150,7 +150,7 @@ void PlotView::cursorsMoved()
void PlotView::emitTimeSelection()
{
off_t sampleCount = selectedSamples.length();
size_t sampleCount = selectedSamples.length();
float selectionTime = sampleCount / (float)mainSampleSource->rate();
emit timeSelectionChanged(selectionTime);
}
@@ -306,7 +306,7 @@ void PlotView::exportSamples(std::shared_ptr<AbstractSampleSource> src)
if (dialog.exec()) {
QStringList fileNames = dialog.selectedFiles();
off_t start, end;
size_t start, end;
if (cursorSelection.isChecked()) {
start = selectedSamples.minimum;
end = start + selectedSamples.length();
@@ -320,12 +320,12 @@ void PlotView::exportSamples(std::shared_ptr<AbstractSampleSource> src)
std::ofstream os (fileNames[0].toStdString(), std::ios::binary);
off_t index;
size_t index;
// viewRange.length() is used as some less arbitrary step value
off_t step = viewRange.length();
size_t step = viewRange.length();
for (index = start; index < end; index += step) {
off_t length = std::min(step, end - index);
size_t length = std::min(step, end - index);
auto samples = sampleSrc->getSamples(index, length);
if (samples != nullptr) {
for (auto i = 0; i < length; i += decimation.value()) {
@@ -428,7 +428,7 @@ void PlotView::paintEvent(QPaintEvent *event)
#undef PLOT_LAYER
}
void PlotView::paintTimeScale(QPainter &painter, QRect &rect, range_t<off_t> sampleRange)
void PlotView::paintTimeScale(QPainter &painter, QRect &rect, range_t<size_t> sampleRange)
{
float startTime = (float)sampleRange.minimum / sampleRate;
float stopTime = (float)sampleRange.maximum / sampleRate;
@@ -454,7 +454,7 @@ void PlotView::paintTimeScale(QPainter &painter, QRect &rect, range_t<off_t> sam
while (tick <= stopTime) {
off_t tickSample = tick * sampleRate;
size_t tickSample = tick * sampleRate;
int tickLine = sampleToColumn(tickSample - sampleRange.minimum);
char buf[128];
@@ -471,7 +471,7 @@ void PlotView::paintTimeScale(QPainter &painter, QRect &rect, range_t<off_t> sam
tick = firstTick;
while (tick <= stopTime) {
off_t tickSample = tick * sampleRate;
size_t tickSample = tick * sampleRate;
int tickLine = sampleToColumn(tickSample - sampleRange.minimum);
painter.drawLine(tickLine, 0, tickLine, 10);
@@ -495,7 +495,7 @@ void PlotView::resizeEvent(QResizeEvent * event)
updateView();
}
off_t PlotView::samplesPerColumn()
size_t PlotView::samplesPerColumn()
{
return fftSize / zoomLevel;
}
@@ -538,7 +538,7 @@ void PlotView::updateView(bool reCenter)
viewport()->update();
}
void PlotView::setSampleRate(off_t rate)
void PlotView::setSampleRate(size_t rate)
{
sampleRate = rate;
@@ -558,12 +558,12 @@ void PlotView::enableScales(bool enabled)
viewport()->update();
}
int PlotView::sampleToColumn(off_t sample)
int PlotView::sampleToColumn(size_t sample)
{
return sample / samplesPerColumn();
}
off_t PlotView::columnToSample(int col)
size_t PlotView::columnToSample(int col)
{
return col * samplesPerColumn();
}