Fix type errors building in 64-bit mode

SmingHub · Jun 18, 2024 · 0af995d · 0af995d
1 parent 3682263
commit 0af995d
Show file tree

Hide file tree

Showing 12 changed files with 14 additions and 14 deletions.
diff --git a/Sming/Libraries/ArduCAM/ArduCAMStream.cpp b/Sming/Libraries/ArduCAM/ArduCAMStream.cpp
@@ -99,7 +99,7 @@ uint16_t ArduCAMStream::readMemoryBlock(char* data, int bufSize) {
 
 	}
 
-	int bytesread = min(len, (unsigned int)bufSize);
+	int bytesread = min(len, size_t(bufSize));
 
 	ACAM_DEBUG("ArduCAMStream::readMemoryBlock [%d] (%d bytes) remaining (%d bytes)\n", bcount++, bytesread, len);
 

diff --git a/Sming/Libraries/Arduino_TensorFlowLite b/Sming/Libraries/Arduino_TensorFlowLite
diff --git a/Sming/Libraries/Graphics b/Sming/Libraries/Graphics
diff --git a/Sming/Libraries/HardwareSPI b/Sming/Libraries/HardwareSPI
diff --git a/Sming/Libraries/LittleFS b/Sming/Libraries/LittleFS
diff --git a/Sming/Libraries/MultipartParser/src/MultipartParser.cpp b/Sming/Libraries/MultipartParser/src/MultipartParser.cpp
@@ -187,7 +187,7 @@ int MultipartParser::partHeadersComplete(multipart_parser_t* p)
 			.name = name,
 			.fileName = fileName,
 			.mime = headers[HTTP_HEADER_CONTENT_TYPE],
-			.length = contentLength ? contentLength.toInt() : -1,
+			.length = contentLength ? int(contentLength.toInt()) : -1,
 		};
 
 		auto checkerStream = static_cast<PartCheckerStream*>(stream);

diff --git a/Sming/Libraries/SPI/test/app/SPI.cpp b/Sming/Libraries/SPI/test/app/SPI.cpp
@@ -317,7 +317,7 @@ class SpiTest : public TestGroup
 	{
 		String inData = outData;
 		auto bufptr = reinterpret_cast<uint8_t*>(inData.begin() + startOffset);
-		auto length = inData.length() - startOffset;
+		unsigned length = inData.length() - startOffset;
 
 		debug_i("TX %u bytes, startOffset %u, %cSB first", length, startOffset,
 				settings.bitOrder == MSBFIRST ? 'M' : 'L');

diff --git a/Sming/Libraries/USB b/Sming/Libraries/USB
diff --git a/Sming/System/include/m_printf.h b/Sming/System/include/m_printf.h
@@ -63,7 +63,7 @@ size_t m_puts(const char* str);
 
 extern "C++" {
 
-template <typename... Args> int snprintf(char* buf, int length, const char* fmt, Args... args)
+template <typename... Args> int snprintf(char* buf, size_t length, const char* fmt, Args... args)
 {
 	return m_snprintf(buf, length, fmt, args...);
 }

diff --git a/Sming/Wiring/WVector.h b/Sming/Wiring/WVector.h
@@ -182,7 +182,7 @@ template <typename Element> class Vector : public Countable<Element>
 		removeAllElements();
 	}
 
-	bool ensureCapacity(unsigned int minCapacity);
+	bool ensureCapacity(size_t minCapacity);
 
 	void removeAllElements()
 	{
@@ -376,7 +376,7 @@ template <class Element> bool Vector<Element>::addElement(Element* objp)
 	return true;
 }
 
-template <class Element> bool Vector<Element>::ensureCapacity(unsigned int minCapacity)
+template <class Element> bool Vector<Element>::ensureCapacity(size_t minCapacity)
 {
 	if(_data.size >= minCapacity) {
 		return true;

diff --git a/samples/Basic_Storage/app/application.cpp b/samples/Basic_Storage/app/application.cpp
@@ -41,7 +41,7 @@ void printPart(Storage::Partition part)
 		String s = part.getDeviceName();
 		s += '/';
 		s += part.name();
-		m_printHex(s.c_str(), buf, std::min(128U, bufSize));
+		m_printHex(s.c_str(), buf, std::min(size_t(128U), bufSize));
 		Serial << _F("Elapsed: ") << elapsed.toString() << endl;
 		if(elapsed != 0) {
 			Serial << _F("Speed:   ") << 1000 * bufSize / elapsed << " KB/s" << endl;

diff --git a/tests/HostTests/modules/ArduinoString.cpp b/tests/HostTests/modules/ArduinoString.cpp
@@ -131,9 +131,9 @@ class ArduinoStringTest : public TestGroup
 			REQUIRE(str == "cleanclean");
 			// non-decimal negative #s should be as if they were unsigned
 			str = String((int)-100, 16);
-			REQUIRE(str == "ffffff9c");
+			REQUIRE_EQ(str, sizeof(long) == 4 ? "ffffff9c" : "ffffffffffffff9c");
 			str = String((long)-101, 16);
-			REQUIRE(str == "ffffff9b");
+			REQUIRE_EQ(str, sizeof(long) == 4 ? "ffffff9b" : "ffffffffffffff9b");
 			str = String((int)-100, 10);
 			REQUIRE(str == "-100");
 			str = String((long)-100, 10);
-Original file line number
+Diff line change
@@ Expand Up @@
     	}
-    	int bytesread = min(len, (unsigned int)bufSize);
+    	int bytesread = min(len, size_t(bufSize));
     	ACAM_DEBUG("ArduCAMStream::readMemoryBlock [%d] (%d bytes) remaining (%d bytes)\n", bcount++, bytesread, len);
@@ Expand Down @@
+4 −1		component.mk
+1 −1		samples/TensorFlow_HelloWorld/app/application.cpp
+4 −4		src/tensorflow/lite/micro/micro_utils.cpp
+5 −5		Tools/rc/resource/font/gfx.py
+0 −4		samples/Basic_Graphics/app/application.cpp
+0 −2		samples/Basic_Graphics/component.mk
+1 −1		src/Arch/Host/Virtual.cpp
+10 −3		src/include/Graphics/Asset.h
+3 −3		src/include/Graphics/Object.h