fix 64-to-32 type conversion errors on mac

Gin · Gin · commit a38c6403484a · 2025-06-06T20:28:00.000-07:00
diff --git a/ClientSource/Connection/SerialConnectionPOSIX.h b/ClientSource/Connection/SerialConnectionPOSIX.h
@@ -148,7 +148,7 @@ class SerialConnection : public StreamConnection{
     void recv_loop(){
         char buffer[32];
         while (!m_exit.load(std::memory_order_acquire)){
-            int actual = read(m_fd, buffer, sizeof(buffer));
+            ssize_t actual = read(m_fd, buffer, sizeof(buffer));
             if (actual > 0){
                 on_recv(buffer, actual);
             }
diff --git a/Common/Cpp/Sockets/ClientSocket_POSIX.h b/Common/Cpp/Sockets/ClientSocket_POSIX.h
@@ -78,7 +78,7 @@ class ClientSocket_POSIX final : public AbstractClientSocket{
 
         while (bytes > 0){
             size_t current = std::min<size_t>(bytes, BLOCK_SIZE);
-            int current_sent = ::send(m_socket, ptr, (int)current, MSG_DONTWAIT);
+            ssize_t current_sent = ::send(m_socket, ptr, (int)current, MSG_DONTWAIT);
             if (current_sent != -1){
                 sent += current;
                 if ((size_t)current_sent < current){
@@ -183,7 +183,7 @@ class ClientSocket_POSIX final : public AbstractClientSocket{
         char buffer[BUFFER_SIZE];
 
         while (true){
-            int bytes;
+            ssize_t bytes;
             int error = 0;
             {
                 std::unique_lock<std::mutex> lg(m_lock);
diff --git a/Common/Qt/Options/EditableTableWidget.cpp b/Common/Qt/Options/EditableTableWidget.cpp
@@ -59,7 +59,7 @@ EditableTableWidget::EditableTableWidget(QWidget& parent, EditableTableOption& v
         header << QString::fromStdString(name);
     }
     header << "" << "" << "";
-    m_table->setColumnCount(header.size());
+    m_table->setColumnCount(int(header.size()));
     m_table->setHorizontalHeaderLabels(header);
 
     QFont font;
diff --git a/Common/Qt/Options/StaticTableWidget.cpp b/Common/Qt/Options/StaticTableWidget.cpp
@@ -54,7 +54,7 @@ StaticTableWidget::StaticTableWidget(QWidget& parent, StaticTableOption& value)
     for (const std::string& name : m_value.make_header()){
         header << QString::fromStdString(name);
     }
-    m_table->setColumnCount(header.size());
+    m_table->setColumnCount(int(header.size()));
     m_table->setRowCount((int)table.size());
     m_table->setHorizontalHeaderLabels(header);
 
diff --git a/SerialPrograms/CMakeLists.txt b/SerialPrograms/CMakeLists.txt
@@ -2515,7 +2515,7 @@ else() # macOS and Linux
         # /usr/local/Cellar/opencv/4.5.5_3/include/opencv4/opencv2/core/mat.inl.hpp:2116:9: error: '_Atomic' is a C11 extension
         # when compiling OpenCV
         # target_compile_options(SerialPrograms PRIVATE -Wall -Wextra -Wpedantic -Werror -Wno-c11-extensions)
-        target_compile_options(SerialPrograms PRIVATE -Wall -Wextra -Wpedantic -Werror)
+        target_compile_options(SerialPrograms PRIVATE -Wall -Wextra -Wpedantic -Werror -Wshorten-64-to-32)
     else()
         # Assume GCC
         target_compile_options(SerialPrograms PRIVATE -Wall -Wextra -Wpedantic -Werror -fno-strict-aliasing)
diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/IO/AudioFileLoader.cpp b/SerialPrograms/Source/CommonFramework/AudioPipeline/IO/AudioFileLoader.cpp
@@ -186,7 +186,7 @@ void AudioFileLoader::sendBufferFromWavFileOnTimer(){
     const int wavBytesPerFrame = wavAudioFormat.bytesPerFrame();
     const int wavBytesToRead = (int)(wavBytesPerFrame * m_frames_per_timeout);
     m_rawBuffer.resize(wavBytesToRead);
-    const int wavBytesRead = m_wavFile->read(m_rawBuffer.data(), wavBytesToRead);
+    const int64_t wavBytesRead = m_wavFile->read(m_rawBuffer.data(), wavBytesToRead);
     m_rawBuffer.resize(wavBytesRead);
 
     if (wavBytesRead == 0){
diff --git a/SerialPrograms/Source/CommonFramework/Notifications/EventNotificationOption.cpp b/SerialPrograms/Source/CommonFramework/Notifications/EventNotificationOption.cpp
@@ -115,7 +115,7 @@ struct EventNotificationOption::Data{
         , m_null_screenshot(LockMode::UNLOCK_WHILE_RUNNING, "---")
         , m_screenshot(ImageAttachmentMode::NO_SCREENSHOT)
         , m_tags(false, LockMode::UNLOCK_WHILE_RUNNING, "Notifs", "")
-        , m_rate_limit_seconds(LockMode::UNLOCK_WHILE_RUNNING, rate_limit.count())
+        , m_rate_limit_seconds(LockMode::UNLOCK_WHILE_RUNNING, uint32_t(rate_limit.count()))
         , m_last_sent(WallClock::min())
         , m_global_enable(true)
     {}
@@ -132,7 +132,7 @@ struct EventNotificationOption::Data{
         , m_null_screenshot(LockMode::UNLOCK_WHILE_RUNNING, "---")
         , m_screenshot(ImageAttachmentMode::NO_SCREENSHOT)
         , m_tags(false, LockMode::UNLOCK_WHILE_RUNNING, tags_to_str(tags), "")
-        , m_rate_limit_seconds(LockMode::UNLOCK_WHILE_RUNNING, rate_limit.count())
+        , m_rate_limit_seconds(LockMode::UNLOCK_WHILE_RUNNING, uint32_t(rate_limit.count()))
         , m_last_sent(WallClock::min())
         , m_global_enable(true)
     {}
@@ -150,7 +150,7 @@ struct EventNotificationOption::Data{
         , m_null_screenshot(LockMode::UNLOCK_WHILE_RUNNING, "---")
         , m_screenshot(screenshot)
         , m_tags(false, LockMode::UNLOCK_WHILE_RUNNING, tags_to_str(tags), "")
-        , m_rate_limit_seconds(LockMode::UNLOCK_WHILE_RUNNING, rate_limit.count())
+        , m_rate_limit_seconds(LockMode::UNLOCK_WHILE_RUNNING, uint32_t(rate_limit.count()))
         , m_last_sent(WallClock::min())
         , m_global_enable(true)
     {}
diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt6.5.cpp b/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt6.5.cpp
@@ -245,7 +245,8 @@ VideoSnapshot CameraVideoSource::snapshot(){
     }
 
     WallClock time1 = current_time();
-    m_stats_conversion.report_data(m_logger, std::chrono::duration_cast<std::chrono::microseconds>(time1 - time0).count());
+    const int64_t duration = std::chrono::duration_cast<std::chrono::microseconds>(time1 - time0).count();
+    m_stats_conversion.report_data(m_logger, uint32_t(duration));
 
     //  Update the cached image.
     m_last_image = std::move(image);
diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt6.cpp b/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt6.cpp
@@ -216,7 +216,8 @@ VideoSnapshot CameraVideoSource::snapshot(){
     m_last_image_seqnum = frame_seqnum;
 
     WallClock time1 = current_time();
-    m_stats_conversion.report_data(m_logger, std::chrono::duration_cast<std::chrono::microseconds>(time1 - time0).count());
+    const int64_t duration = std::chrono::duration_cast<std::chrono::microseconds>(time1 - time0).count();
+    m_stats_conversion.report_data(m_logger, uint32_t(duration));
 
     return VideoSnapshot(m_last_image, m_last_image_timestamp);
 }
diff --git a/SerialPrograms/Source/CommonFramework/Windows/DpiScaler.cpp b/SerialPrograms/Source/CommonFramework/Windows/DpiScaler.cpp
@@ -34,7 +34,7 @@ int scale_dpi_height(int height){
 
 
 void scale_dpi_token(QString& str, int dpi){
-    int length = str.length();
+    size_t length = str.length();
     if (length < 3){
         return;
     }
@@ -44,7 +44,7 @@ void scale_dpi_token(QString& str, int dpi){
 
     //  Parse the integer in front.
     int64_t value = 0;
-    for (int c = 0; c < length - 2; c++){
+    for (size_t c = 0; c < length - 2; c++){
         QChar ch = str[c];
         if (!('0' <= ch && ch <= '9')){
             return;
diff --git a/SerialPrograms/Source/Integrations/DiscordWebhook.cpp b/SerialPrograms/Source/Integrations/DiscordWebhook.cpp
@@ -176,7 +176,7 @@ void DiscordWebhookSender::process_reply(QNetworkReply* reply){
     }else{
         QString error_string = reply->errorString();
         QString url = reply->url().toString();
-        int index = error_string.indexOf(url);
+        size_t index = error_string.indexOf(url);
         if (index >= 0){
             error_string.replace(index, url.size(), "****************");
         }
diff --git a/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_AutoMultiSpawn.cpp b/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_AutoMultiSpawn.cpp
@@ -260,7 +260,7 @@ std::vector<int> parse_multispawn_path(SingleSwitchProgramEnvironment& env, cons
             );
         }
         raw_path[next_pos] = '\0';
-        int despawn_count = strtol(raw_path.data() + pos+1, nullptr, 10);
+        int despawn_count = static_cast<int>(strtol(raw_path.data() + pos+1, nullptr, 10));
         if (despawn_count <= 0 || despawn_count > max_num_despawn){
             throw InternalProgramError(
                 &env.console.logger(),

Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ class SerialConnection : public StreamConnection{`
`148`	`148`	`void recv_loop(){`
`149`	`149`	`char buffer[32];`
`150`	`150`	`while (!m_exit.load(std::memory_order_acquire)){`
`151`		`- int actual = read(m_fd, buffer, sizeof(buffer));`
	`151`	`+ ssize_t actual = read(m_fd, buffer, sizeof(buffer));`
`152`	`152`	`if (actual > 0){`
`153`	`153`	`on_recv(buffer, actual);`
`154`	`154`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ EditableTableWidget::EditableTableWidget(QWidget& parent, EditableTableOption& v`
`59`	`59`	`header << QString::fromStdString(name);`
`60`	`60`	`}`
`61`	`61`	`header << "" << "" << "";`
`62`		`- m_table->setColumnCount(header.size());`
	`62`	`+ m_table->setColumnCount(int(header.size()));`
`63`	`63`	`m_table->setHorizontalHeaderLabels(header);`
`64`	`64`
`65`	`65`	`QFont font;`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ StaticTableWidget::StaticTableWidget(QWidget& parent, StaticTableOption& value)`
`54`	`54`	`for (const std::string& name : m_value.make_header()){`
`55`	`55`	`header << QString::fromStdString(name);`
`56`	`56`	`}`
`57`		`- m_table->setColumnCount(header.size());`
	`57`	`+ m_table->setColumnCount(int(header.size()));`
`58`	`58`	`m_table->setRowCount((int)table.size());`
`59`	`59`	`m_table->setHorizontalHeaderLabels(header);`
`60`	`60`
Original file line number	Diff line number	Diff line change
`@@ -245,7 +245,8 @@ VideoSnapshot CameraVideoSource::snapshot(){`
`245`	`245`	`}`
`246`	`246`
`247`	`247`	`WallClock time1 = current_time();`
`248`		`- m_stats_conversion.report_data(m_logger, std::chrono::duration_cast<std::chrono::microseconds>(time1 - time0).count());`
	`248`	`+ const int64_t duration = std::chrono::duration_cast<std::chrono::microseconds>(time1 - time0).count();`
	`249`	`+ m_stats_conversion.report_data(m_logger, uint32_t(duration));`
`249`	`250`
`250`	`251`	`// Update the cached image.`
`251`	`252`	`m_last_image = std::move(image);`
Original file line number	Diff line number	Diff line change
`@@ -216,7 +216,8 @@ VideoSnapshot CameraVideoSource::snapshot(){`
`216`	`216`	`m_last_image_seqnum = frame_seqnum;`
`217`	`217`
`218`	`218`	`WallClock time1 = current_time();`
`219`		`- m_stats_conversion.report_data(m_logger, std::chrono::duration_cast<std::chrono::microseconds>(time1 - time0).count());`
	`219`	`+ const int64_t duration = std::chrono::duration_cast<std::chrono::microseconds>(time1 - time0).count();`
	`220`	`+ m_stats_conversion.report_data(m_logger, uint32_t(duration));`
`220`	`221`
`221`	`222`	`return VideoSnapshot(m_last_image, m_last_image_timestamp);`
`222`	`223`	`}`