Mirrors/inspectrum
2
0
Fork 0
mirror of https://github.com/miek/inspectrum.git synced 2026-03-02 22:44:18 +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

18
spectrogramplot.cpp
View File

@@ -56,7 +56,7 @@ void SpectrogramPlot::invalidateEvent()
emit repaint();
}
void SpectrogramPlot::paintFront(QPainter &painter, QRect &rect, range_t<off_t> sampleRange)
void SpectrogramPlot::paintFront(QPainter &painter, QRect &rect, range_t<size_t> sampleRange)
{
if (tunerEnabled())
tuner.paintFront(painter, rect, sampleRange);
@@ -137,13 +137,13 @@ void SpectrogramPlot::paintFrequencyScale(QPainter &painter, QRect &rect)
painter.restore();
}
void SpectrogramPlot::paintMid(QPainter &painter, QRect &rect, range_t<off_t> sampleRange)
void SpectrogramPlot::paintMid(QPainter &painter, QRect &rect, range_t<size_t> sampleRange)
{
if (!inputSource || inputSource->count() == 0)
return;
off_t sampleOffset = sampleRange.minimum % (getStride() * linesPerTile());
off_t tileID = sampleRange.minimum - sampleOffset;
size_t sampleOffset = sampleRange.minimum % (getStride() * linesPerTile());
size_t tileID = sampleRange.minimum - sampleOffset;
int xoffset = sampleOffset / getStride();
// Paint first (possibly partial) tile
@@ -159,7 +159,7 @@ void SpectrogramPlot::paintMid(QPainter &painter, QRect &rect, range_t<off_t> sa
}
}
QPixmap* SpectrogramPlot::getPixmapTile(off_t tile)
QPixmap* SpectrogramPlot::getPixmapTile(size_t tile)
{
QPixmap *obj = pixmapCache.object(TileCacheKey(fftSize, zoomLevel, tile));
if (obj != 0)
@@ -184,7 +184,7 @@ QPixmap* SpectrogramPlot::getPixmapTile(off_t tile)
return obj;
}
float* SpectrogramPlot::getFFTTile(off_t tile)
float* SpectrogramPlot::getFFTTile(size_t tile)
{
std::array<float, tileSize>* obj = fftCache.object(TileCacheKey(fftSize, zoomLevel, tile));
if (obj != nullptr)
@@ -192,7 +192,7 @@ float* SpectrogramPlot::getFFTTile(off_t tile)
std::array<float, tileSize>* destStorage = new std::array<float, tileSize>;
float *ptr = destStorage->data();
off_t sample = tile;
size_t sample = tile;
while ((ptr - destStorage->data()) < tileSize) {
getLine(ptr, sample);
sample += getStride();
@@ -202,7 +202,7 @@ float* SpectrogramPlot::getFFTTile(off_t tile)
return destStorage->data();
}
void SpectrogramPlot::getLine(float *dest, off_t sample)
void SpectrogramPlot::getLine(float *dest, size_t sample)
{
if (inputSource && fft) {
auto buffer = inputSource->getSamples(sample, fftSize);
@@ -312,7 +312,7 @@ void SpectrogramPlot::setZoomLevel(int zoom)
zoomLevel = zoom;
}
void SpectrogramPlot::setSampleRate(off_t rate)
void SpectrogramPlot::setSampleRate(size_t rate)
{
sampleRate = rate;
}