Use uintptr_t for pointer arithmetic (#455)

Author: sbooth

LICENSE.txt

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2006-2024 Stephen F. Booth
+Copyright (c) 2006-2025 Stephen F. Booth
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Sources/CSFBAudioEngine/Decoders/SFBDSDIFFDecoder.mm

@@ -1,9 +1,10 @@
 //
-// Copyright (c) 2014-2024 Stephen F. Booth <[email protected]>
+// Copyright (c) 2014-2025 Stephen F. Booth <[email protected]>
 // Part of https://github.com/sbooth/SFBAudioEngine
 // MIT license
 //
 
+#import <cstdint>
 #import <map>
 #import <memory>
 #import <string>
@@ -870,7 +871,7 @@ - (BOOL)decodeIntoBuffer:(AVAudioCompressedBuffer *)buffer packetCount:(AVAudioP
 		// Read interleaved input, grouped as 8 one bit samples per frame (a single channel byte) into
 		// a clustered frame (one channel byte per channel)
 
-		uint8_t *buf = (uint8_t *)buffer.data + buffer.byteLength;
+		auto buf = static_cast<uint8_t *>(reinterpret_cast<void *>(reinterpret_cast<uintptr_t>(buffer.data) + buffer.byteLength));
 		NSInteger bytesToRead = std::min(packetsToRead * packetSize, buffer.byteCapacity - buffer.byteLength);
 
 		NSInteger bytesRead;

Sources/CSFBAudioEngine/Decoders/SFBDSDPCMDecoder.mm

@@ -1,10 +1,11 @@
 //
-// Copyright (c) 2018-2024 Stephen F. Booth <[email protected]>
+// Copyright (c) 2018-2025 Stephen F. Booth <[email protected]>
 // Part of https://github.com/sbooth/SFBAudioEngine
 // MIT license
 //
 
 #import <algorithm>
+#import <cstdint>
 #import <vector>
 
 #import <os/log.h>
@@ -483,7 +484,7 @@ - (BOOL)decodeIntoBuffer:(AVAudioPCMBuffer *)buffer frameLength:(AVAudioFrameCou
 		AVAudioChannelCount channelCount = buffer.format.channelCount;
 		bool isBigEndian = _buffer.format.streamDescription->mFormatFlags & kAudioFormatFlagIsBigEndian;
 		for(AVAudioChannelCount channel = 0; channel < channelCount; ++channel) {
-			const uint8_t *input = static_cast<const uint8_t *>(_buffer.data) + channel;
+			const auto input = static_cast<const uint8_t *>(reinterpret_cast<const void *>(reinterpret_cast<uintptr_t>(_buffer.data) + channel));
 			float *output = floatChannelData[channel];
 			_context[channel].Translate(framesDecoded, input, channelCount, !isBigEndian, output, 1);
 			// Boost signal by 6 dBFS

Sources/CSFBAudioEngine/Decoders/SFBDSFDecoder.m

@@ -1,9 +1,11 @@
 //
-// Copyright (c) 2014-2024 Stephen F. Booth <[email protected]>
+// Copyright (c) 2014-2025 Stephen F. Booth <[email protected]>
 // Part of https://github.com/sbooth/SFBAudioEngine
 // MIT license
 //
 
+@import stdint_h;
+
 @import os.log;
 
 #import "SFBDSFDecoder.h"
@@ -344,7 +346,7 @@ - (BOOL)decodeIntoBuffer:(AVAudioCompressedBuffer *)buffer packetCount:(AVAudioP
 
 		// Copy data from the internal buffer to output
 		uint32_t copySize = packetsToCopy * packetSize;
-		memcpy((uint8_t *)buffer.data + (packetsToSkip * packetSize), _buffer.data, copySize);
+		memcpy((void *)((uintptr_t)buffer.data + (packetsToSkip * packetSize)), _buffer.data, copySize);
 		buffer.packetCount += packetsToCopy;
 		buffer.byteLength += copySize;
 
@@ -401,9 +403,8 @@ - (BOOL)seekToPacket:(AVAudioFramePosition)packet error:(NSError **)error
 
 	// Move data
 	uint32_t packetSize = kSFBBytesPerDSDPacketPerChannel * _processingFormat.channelCount;
-	uint8_t *dst = (uint8_t *)_buffer.data;
-	const uint8_t *src = (uint8_t *)_buffer.data + (packetsToSkip * packetSize);
-	memmove(dst, src, packetsToMove * packetSize);
+	const void *src = (const void *)((uintptr_t)_buffer.data + (packetsToSkip * packetSize));
+	memmove(_buffer.data, src, packetsToMove * packetSize);
 
 	_buffer.packetCount = packetsToMove;
 	_buffer.byteLength = packetsToMove * packetSize;

Sources/CSFBAudioEngine/Decoders/SFBDoPDecoder.m

@@ -1,9 +1,11 @@
 //
-// Copyright (c) 2014-2024 Stephen F. Booth <[email protected]>
+// Copyright (c) 2014-2025 Stephen F. Booth <[email protected]>
 // Part of https://github.com/sbooth/SFBAudioEngine
 // MIT license
 //
 
+@import stdint_h;
+
 @import os.log;
 
 @import AVFAudioExtensions;
@@ -228,8 +230,8 @@ - (BOOL)decodeIntoBuffer:(AVAudioPCMBuffer *)buffer frameLength:(AVAudioFrameCou
 		uint8_t marker = _marker;
 		AVAudioChannelCount channelCount = _processingFormat.channelCount;
 		for(AVAudioChannelCount channel = 0; channel < channelCount; ++channel) {
-			const uint8_t *input = (uint8_t *)_buffer.data + channel;
-			uint8_t *output = (uint8_t *)buffer.audioBufferList->mBuffers[channel].mData + buffer.audioBufferList->mBuffers[channel].mDataByteSize;
+			const uint8_t *input = (const void *)((uintptr_t)_buffer.data + channel);
+			uint8_t *output = (void *)((uintptr_t)buffer.audioBufferList->mBuffers[channel].mData + buffer.audioBufferList->mBuffers[channel].mDataByteSize);
 
 			// The DoP marker should match across channels
 			marker = _marker;

Sources/CSFBAudioEngine/Output/SFBBufferOutputSource.m

@@ -1,9 +1,11 @@
 //
-// Copyright (c) 2010-2022 Stephen F. Booth <[email protected]>
+// Copyright (c) 2010-2025 Stephen F. Booth <[email protected]>
 // Part of https://github.com/sbooth/SFBAudioEngine
 // MIT license
 //
 
+@import stdint_h;
+
 #import "SFBBufferOutputSource.h"
 
 @interface SFBBufferOutputSource ()
@@ -59,7 +61,7 @@ - (BOOL)readBytes:(void *)buffer length:(NSInteger)length bytesRead:(NSInteger *
 	}
 
 	size_t bytesToCopy = MIN(bytesAvailable, (size_t)length);
-	memcpy(buffer, (uint8_t *)_buffer + _pos, bytesToCopy);
+	memcpy(buffer, (const void *)((uintptr_t)_buffer + _pos), bytesToCopy);
 	_pos += bytesToCopy;
 	*bytesRead = (NSInteger)bytesToCopy;
 
@@ -80,7 +82,7 @@ - (BOOL)writeBytes:(const void *)buffer length:(NSInteger)length bytesWritten:(N
 	}
 
 	size_t bytesToCopy = MIN(remainingCapacity, (size_t)length);
-	memcpy((uint8_t *)_buffer + _pos, buffer, bytesToCopy);
+	memcpy((void *)((uintptr_t)_buffer + _pos), buffer, bytesToCopy);
 	_pos += bytesToCopy;
 	*bytesWritten = (NSInteger)bytesToCopy;