Fix compiler warnings

Jaded-Encoding-Thaumaturgy · Nov 2, 2023 · 4f50a26 · 4f50a26
1 parent 9e39554
commit 4f50a26
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 12 deletions.
diff --git a/src/shared/WobblyProject.cpp b/src/shared/WobblyProject.cpp
@@ -1737,7 +1737,7 @@ std::array<int32_t, 3> WobblyProject::getMMetrics(int frame) const {
     if (frame < 0 || frame >= getNumFrames(PostSource))
         throw WobblyException("Can't get the mmetrics for frame " + std::to_string(frame) + ": frame number out of range.");
 
-    if (mmetrics.size() && frame < mmetrics.size() - 1)
+    if (mmetrics.size() && frame < (int)mmetrics.size() - 1)
         return { mmetrics[frame][0], mmetrics[frame][1], mmetrics[frame + 1][0] };
     if (mmetrics.size())
         return { mmetrics[frame][0], mmetrics[frame][1], mmetrics[frame][1] };
@@ -1750,7 +1750,7 @@ std::array<int32_t, 3>WobblyProject::getVMetrics(int frame) const {
     if (frame < 0 || frame >= getNumFrames(PostSource))
         throw WobblyException("Can't get the vmetrics for frame " + std::to_string(frame) + ": frame number out of range.");
 
-    if (vmetrics.size() && frame < vmetrics.size() - 1)
+    if (vmetrics.size() && frame < (int)vmetrics.size() - 1)
         return { vmetrics[frame][0], vmetrics[frame][1], vmetrics[frame + 1][0] };
     if (vmetrics.size())
         return { vmetrics[frame][0], vmetrics[frame][1], vmetrics[frame][1] };

diff --git a/src/shared/WobblyProject.h b/src/shared/WobblyProject.h
@@ -57,28 +57,34 @@ SOFTWARE.
 static inline uint8_t matchCharToIndex(char match) {
     if (match == 'p')
         return 0;
+
     if (match == 'c')
         return 1;
+
     if (match == 'n')
         return 2;
+
     if (match == 'b')
         return 3;
+
     if (match == 'u')
         return 4;
 
-    return 255;
+    return 0; // never reaches this
 }
 
 
 static inline uint8_t matchCharToIndexDMetrics(char match) {
     if (match == 'c')
         return 1;
+
     if (match == 'n')
         return 2;
+
     if (match == 'b')
         return 0;
 
-    return 255;
+    return 0; // never reaches this
 }
 
 struct UndoStep {

diff --git a/src/shared/WobblyShared.cpp b/src/shared/WobblyShared.cpp
@@ -31,13 +31,14 @@ struct PluginDetectionInfo {
 
 static PluginDetectionInfo requiredPlugins[] = {
     {"VIVTC", "org.ivtc.v", "VFM", "VDecimate"},
-    {"DMetrics", "com.vapoursynth.dmetrics", "DMetrics"},
-    {"SCXVID", "com.nodame.scxvid", "Scxvid"},
-    {"FieldHint", "com.nodame.fieldhint", "FieldHint"},
-    {"TDeintMod", "com.holywu.tdeintmod", "IsCombed"},
-    {"d2vsource", "com.sources.d2vsource", "Source"},
+    {"DMetrics", "com.vapoursynth.dmetrics", "DMetrics", nullptr},
+    {"SCXVID", "com.nodame.scxvid", "Scxvid", nullptr},
+    {"FieldHint", "com.nodame.fieldhint", "FieldHint", nullptr},
+    {"TDeintMod", "com.holywu.tdeintmod", "IsCombed", nullptr},
+    {"d2vsource", "com.sources.d2vsource", "Source", nullptr},
     {"L-SMASH-Works", "systems.innocent.lsmas", "LibavSMASHSource", "LWLibavSource"},
-    {"DGDecNV", "com.vapoursynth.dgdecodenv", "DGSource"} };
+    {"DGDecNV", "com.vapoursynth.dgdecodenv", "DGSource", nullptr}
+};
 
 static FilterState checkIfFiltersExists(const VSAPI *vsapi, VSCore *vscore, const char *id, const char *function_name1, const char *function_name2) {
     VSPlugin *plugin = vsapi->getPluginByID(id, vscore);

diff --git a/src/wibbly/WibblyWindow.cpp b/src/wibbly/WibblyWindow.cpp
@@ -752,8 +752,8 @@ void WibblyWindow::createCropWindow() {
 
             jobs[row].setCrop(crop_spin[0]->value(), crop_spin[1]->value(), crop_spin[2]->value(), crop_spin[3]->value());
 
-            for (int i = 0; i < 4; i++)
-                settings_last_crop[i] = crop_spin[i]->value();
+            for (int j = 0; j < 4; j++)
+                settings_last_crop[j] = crop_spin[j]->value();
 
             QList<QVariant> crop_list = { crop_spin[0]->value(), crop_spin[1]->value(), crop_spin[2]->value(), crop_spin[3]->value() };
             settings.setValue(KEY_LAST_CROP, crop_list);