Fixed decimal point issue with ASS - thx Thierry :)

SubtitleEdit · Aug 29, 2018 · c1b38df · c1b38df
1 parent b195ce0
commit c1b38df
Showing 1 changed file with 9 additions and 15 deletions.
diff --git a/libse/SubtitleFormats/AdvancedSubStationAlpha.cs b/libse/SubtitleFormats/AdvancedSubStationAlpha.cs
@@ -209,7 +209,7 @@ private static void LoadStylesFromSubstationAlpha(Subtitle subtitle, string titl
                     try
                     {
                         var ssaStyle = GetSsaStyle(styleName, subtitle.Header);
-                        
+
                         string bold = "0";
                         if (ssaStyle.Bold)
                             bold = "-1";
@@ -253,7 +253,7 @@ private static void LoadStylesFromSubstationAlpha(Subtitle subtitle, string titl
                             GetSsaColorString(ssaStyle.Outline), GetSsaColorString(ssaStyle.Background), bold, italic, underline, ssaStyle.BorderStyle, ssaStyle.OutlineWidth.ToString(CultureInfo.InvariantCulture), ssaStyle.ShadowWidth.ToString(CultureInfo.InvariantCulture),
                             newAlignment, ssaStyle.MarginLeft, ssaStyle.MarginRight, ssaStyle.MarginVertical));
                         styleFound = true;
-                        
+
                     }
                     catch
                     {
@@ -1489,8 +1489,7 @@ public static string CheckForErrors(string header)
                                 }
                                 else if (i == fontsizeIndex)
                                 {
-                                    int number;
-                                    if (!int.TryParse(f, out number) || f.StartsWith('-'))
+                                    if (!int.TryParse(f, out _) || f.StartsWith('-'))
                                     {
                                         sb.AppendLine("'Fontsize' incorrect: " + rawLine);
                                         sb.AppendLine();
@@ -1554,17 +1553,15 @@ public static string CheckForErrors(string header)
                                 }
                                 else if (i == outlineIndex)
                                 {
-                                    float number;
-                                    if (!float.TryParse(f, out number) || f.StartsWith('-'))
+                                    if (!float.TryParse(f, NumberStyles.AllowDecimalPoint, CultureInfo.InvariantCulture, out _) || f.StartsWith('-'))
                                     {
                                         sb.AppendLine("'Outline' (width) incorrect: " + rawLine);
                                         sb.AppendLine();
                                     }
                                 }
                                 else if (i == shadowIndex)
                                 {
-                                    float number;
-                                    if (!float.TryParse(f, out number) || f.StartsWith('-'))
+                                    if (!float.TryParse(f, NumberStyles.AllowDecimalPoint, CultureInfo.InvariantCulture, out _) || f.StartsWith('-'))
                                     {
                                         sb.AppendLine("'Shadow' (width) incorrect: " + rawLine);
                                         sb.AppendLine();
@@ -1580,26 +1577,23 @@ public static string CheckForErrors(string header)
                                 }
                                 else if (i == marginLIndex)
                                 {
-                                    int number;
-                                    if (!int.TryParse(f, out number) || f.StartsWith('-'))
+                                    if (!int.TryParse(f, out _) || f.StartsWith('-'))
                                     {
                                         sb.AppendLine("'MarginL' incorrect: " + rawLine);
                                         sb.AppendLine();
                                     }
                                 }
                                 else if (i == marginRIndex)
                                 {
-                                    int number;
-                                    if (!int.TryParse(f, out number) || f.StartsWith('-'))
+                                    if (!int.TryParse(f, out _) || f.StartsWith('-'))
                                     {
                                         sb.AppendLine("'MarginR' incorrect: " + rawLine);
                                         sb.AppendLine();
                                     }
                                 }
                                 else if (i == marginVIndex)
                                 {
-                                    int number;
-                                    if (!int.TryParse(f, out number) || f.StartsWith('-'))
+                                    if (!int.TryParse(f, out _) || f.StartsWith('-'))
                                     {
                                         sb.AppendLine("'MarginV' incorrect: " + rawLine);
                                         sb.AppendLine();
@@ -1823,7 +1817,7 @@ public static SsaStyle GetSsaStyle(string styleName, string header)
                         }
                     }
                     if (styleName != null && style.Name != null && (styleName.Equals(style.Name, StringComparison.OrdinalIgnoreCase) ||
-                                                                    styleName.Equals("*Default", StringComparison.OrdinalIgnoreCase) && 
+                                                                    styleName.Equals("*Default", StringComparison.OrdinalIgnoreCase) &&
                                                                     style.Name.Equals("Default", StringComparison.OrdinalIgnoreCase)))
                     {
                         style.LoadedFromHeader = true;