Fix gcc warnings.

leozide · leozide · commit 6c71cfeaeebe · 2025-07-05T12:47:27.000-07:00
diff --git a/common/project.cpp b/common/project.cpp
@@ -1859,8 +1859,8 @@ bool Project::ExportPOVRay(const QString& FileName)
 	lcPiecesLibrary* Library = lcGetPiecesLibrary();
 	std::map<const PieceInfo*, std::pair<char[LC_PIECE_NAME_LEN + 1], int>> PieceTable;
 	size_t NumColors = gColorList.size();
-	std::vector<std::array<char, LC_MAX_COLOR_NAME>> LgeoColorTable(NumColors);
-	std::vector<std::array<char, LC_MAX_COLOR_NAME>> ColorTable(NumColors);
+	std::vector<std::array<char, LC_MAX_COLOR_NAME + 3>> LgeoColorTable(NumColors);
+	std::vector<std::array<char, LC_MAX_COLOR_NAME + 3>> ColorTable(NumColors);
 
 	const std::vector<std::unique_ptr<lcLight>>& Lights = gMainWindow->GetActiveModel()->GetLights();
 	const lcCamera* Camera = gMainWindow->GetActiveView()->GetCamera();
@@ -2295,7 +2295,8 @@ bool Project::ExportPOVRay(const QString& FileName)
 			if (ColorIdx >= NumColors)
 				continue;
 
-			strncpy(LgeoColorTable[ColorIdx].data(), Name, LC_MAX_COLOR_NAME);
+			strncpy(LgeoColorTable[ColorIdx].data(), Name, LgeoColorTable[ColorIdx].size());
+			LgeoColorTable[ColorIdx][LgeoColorTable[ColorIdx].size() - 1] = 0;
 		}
 	}
 
@@ -2321,16 +2322,16 @@ bool Project::ExportPOVRay(const QString& FileName)
 				}
 				else
 				{
-					char MacroName[LC_MAX_COLOR_NAME];
+					const char* MacroName;
+
 					if (lcIsColorChrome(ColorIdx))
-						sprintf(MacroName, "Chrome");
+						MacroName = "Chrome";
 					else if (lcIsColorRubber(ColorIdx))
-						sprintf(MacroName, "Rubber");
+						MacroName = "Rubber";
 					else
-						sprintf(MacroName, "Opaque");
+						MacroName = "Opaque";
 
-					sprintf(Line, "#ifndef (lc_%s)\n#declare lc_%s = %sColor(%g, %g, %g)\n#end\n\n",
-							Color->SafeName, Color->SafeName, MacroName, Color->Value[0], Color->Value[1], Color->Value[2]);
+					sprintf(Line, "#ifndef (lc_%s)\n#declare lc_%s = %sColor(%g, %g, %g)\n#end\n\n", Color->SafeName, Color->SafeName, MacroName, Color->Value[0], Color->Value[1], Color->Value[2]);
 				}
 			}
 			else
