Skip to content

Commit ec132a6

Browse files
EvileyeBlackEgoist
authored andcommitted
Fix unit tests failing with changed locale minus.
The behaviour was broken when the locale negative sign was changed from '-' to other characters. This change updates behaviour so that it passes those tests which were failing.
1 parent 62baffc commit ec132a6

File tree

5 files changed

+17
-25
lines changed

5 files changed

+17
-25
lines changed

itext/itext.io/itext/io/font/CidFont.cs

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -112,24 +112,18 @@ private void InitializeCidFontNameAndStyle(String fontName) {
112112

113113
private void InitializeCidFontProperties(IDictionary<String, Object> fontDesc) {
114114
fontIdentification.SetPanose((String)fontDesc.Get("Panose"));
115-
fontMetrics.SetItalicAngle(Convert.ToInt32((String)fontDesc.Get("ItalicAngle"), System.Globalization.CultureInfo.InvariantCulture
116-
));
117-
fontMetrics.SetCapHeight(Convert.ToInt32((String)fontDesc.Get("CapHeight"), System.Globalization.CultureInfo.InvariantCulture
118-
));
119-
fontMetrics.SetTypoAscender(Convert.ToInt32((String)fontDesc.Get("Ascent"), System.Globalization.CultureInfo.InvariantCulture
120-
));
121-
fontMetrics.SetTypoDescender(Convert.ToInt32((String)fontDesc.Get("Descent"), System.Globalization.CultureInfo.InvariantCulture
122-
));
123-
fontMetrics.SetStemV(Convert.ToInt32((String)fontDesc.Get("StemV"), System.Globalization.CultureInfo.InvariantCulture
124-
));
125-
pdfFontFlags = Convert.ToInt32((String)fontDesc.Get("Flags"), System.Globalization.CultureInfo.InvariantCulture
126-
);
115+
fontMetrics.SetItalicAngle(Convert.ToInt32((String)fontDesc.Get("ItalicAngle")));
116+
fontMetrics.SetCapHeight(Convert.ToInt32((String)fontDesc.Get("CapHeight")));
117+
fontMetrics.SetTypoAscender(Convert.ToInt32((String)fontDesc.Get("Ascent")));
118+
fontMetrics.SetTypoDescender(Convert.ToInt32((String)fontDesc.Get("Descent")));
119+
fontMetrics.SetStemV(Convert.ToInt32((String)fontDesc.Get("StemV")));
120+
pdfFontFlags = Convert.ToInt32((String)fontDesc.Get("Flags"));
127121
String fontBBox = (String)fontDesc.Get("FontBBox");
128122
StringTokenizer tk = new StringTokenizer(fontBBox, " []\r\n\t\f");
129-
int llx = Convert.ToInt32(tk.NextToken(), System.Globalization.CultureInfo.InvariantCulture);
130-
int lly = Convert.ToInt32(tk.NextToken(), System.Globalization.CultureInfo.InvariantCulture);
131-
int urx = Convert.ToInt32(tk.NextToken(), System.Globalization.CultureInfo.InvariantCulture);
132-
int ury = Convert.ToInt32(tk.NextToken(), System.Globalization.CultureInfo.InvariantCulture);
123+
int llx = Convert.ToInt32(tk.NextToken());
124+
int lly = Convert.ToInt32(tk.NextToken());
125+
int urx = Convert.ToInt32(tk.NextToken());
126+
int ury = Convert.ToInt32(tk.NextToken());
133127
fontMetrics.UpdateBbox(llx, lly, urx, ury);
134128
registry = (String)fontDesc.Get("Registry");
135129
String uniMap = GetCompatibleUniMap(registry);

itext/itext.io/itext/io/font/Pfm2afm.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ private String ReadString() {
9999

100100
private void Outval(int n) {
101101
output.Write(' ');
102-
output.Write(n);
102+
output.Write(n.ToString(System.Globalization.CultureInfo.InvariantCulture));
103103
}
104104

105105
/*

itext/itext.io/itext/io/font/Type1Font.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -405,10 +405,10 @@ protected internal virtual void Process() {
405405
}
406406

407407
case "B": {
408-
B = new int[] { Convert.ToInt32(tokc.NextToken(), System.Globalization.CultureInfo.InvariantCulture), Convert.ToInt32
409-
(tokc.NextToken(), System.Globalization.CultureInfo.InvariantCulture), Convert.ToInt32(tokc.NextToken(
410-
), System.Globalization.CultureInfo.InvariantCulture), Convert.ToInt32(tokc.NextToken(), System.Globalization.CultureInfo.InvariantCulture
411-
) };
408+
B = new int[] { Convert.ToInt32(tokc.NextToken(), System.Globalization.CultureInfo.InvariantCulture),
409+
Convert.ToInt32(tokc.NextToken(), System.Globalization.CultureInfo.InvariantCulture),
410+
Convert.ToInt32(tokc.NextToken(), System.Globalization.CultureInfo.InvariantCulture),
411+
Convert.ToInt32(tokc.NextToken(), System.Globalization.CultureInfo.InvariantCulture) };
412412
break;
413413
}
414414
}

itext/itext.styledxmlparser/itext/styledxmlparser/css/selector/item/CssPseudoClassNthSelectorItem.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,7 @@ protected internal virtual void GetNthArguments() {
9898
}
9999
String bParticle = arguments.Substring(indexOfN + 1).Trim();
100100
if (!String.IsNullOrEmpty(bParticle)) {
101-
this.nthB = Convert.ToInt32(bParticle[0] + bParticle.Substring(1).Trim(), System.Globalization.CultureInfo.InvariantCulture
102-
);
101+
this.nthB = Convert.ToInt32(bParticle[0] + bParticle.Substring(1).Trim(), System.Globalization.CultureInfo.InvariantCulture);
103102
}
104103
else {
105104
this.nthB = 0;

itext/itext.styledxmlparser/itext/styledxmlparser/jsoup/select/QueryParser.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -466,8 +466,7 @@ private void CssNthChild(bool backwards, bool ofType) {
466466
else {
467467
if (mB.Success) {
468468
a = 0;
469-
b = Convert.ToInt32(iText.IO.Util.StringUtil.Group(mB).ReplaceFirst("^\\+", ""), System.Globalization.CultureInfo.InvariantCulture
470-
);
469+
b = Convert.ToInt32(iText.IO.Util.StringUtil.Group(mB).ReplaceFirst("^\\+", ""), System.Globalization.CultureInfo.InvariantCulture);
471470
}
472471
else {
473472
throw new Selector.SelectorParseException("Could not parse nth-index " + PortUtil.EscapedSingleBracket + "{0}"

0 commit comments

Comments
 (0)