Skip to content

Commit 15abc4f

Browse files
BlackEgoistiText-CI
BlackEgoist
authored and
iText-CI
committed
Update message formatting in SvgConverterIntegrationTest
DEVSIX-3014 Autoported commit. Original commit hash: [b040aed8b]
1 parent ced792f commit 15abc4f

File tree

7 files changed

+34
-25
lines changed

7 files changed

+34
-25
lines changed

‎itext.tests/itext.svg.tests/itext/svg/converter/SvgConverterIntegrationTest.cs

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ source product.
4343
using System;
4444
using System.Collections.Generic;
4545
using System.IO;
46+
using iText.IO.Util;
4647
using iText.Kernel.Geom;
4748
using iText.Kernel.Pdf;
4849
using iText.Kernel.Pdf.Canvas;
@@ -215,7 +216,7 @@ public virtual void DrawOnSpecifiedPositionX() {
215216
String name = "eclipse";
216217
int x = 50;
217218
int y = 0;
218-
String destName = name + "_" + x + "_" + y;
219+
String destName = MessageFormatUtil.Format("{0}_{1}_{2}", name, x, y);
219220
FileStream fis = new FileStream(sourceFolder + name + ".svg", FileMode.Open, FileAccess.Read);
220221
DrawOnSpecifiedPositionDocument(fis, destinationFolder + destName + ".pdf", x, y);
221222
NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(destinationFolder + destName + ".pdf", sourceFolder
@@ -227,7 +228,7 @@ public virtual void DrawOnSpecifiedPositionY() {
227228
String name = "eclipse";
228229
int x = 0;
229230
int y = 100;
230-
String destName = name + "_" + x + "_" + y;
231+
String destName = MessageFormatUtil.Format("{0}_{1}_{2}", name, x, y);
231232
FileStream fis = new FileStream(sourceFolder + name + ".svg", FileMode.Open, FileAccess.Read);
232233
DrawOnSpecifiedPositionDocument(fis, destinationFolder + destName + ".pdf", x, y);
233234
NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(destinationFolder + destName + ".pdf", sourceFolder
@@ -239,7 +240,7 @@ public virtual void DrawOnSpecifiedPositionXY() {
239240
String name = "eclipse";
240241
int x = 50;
241242
int y = 100;
242-
String destName = name + "_" + x + "_" + y;
243+
String destName = MessageFormatUtil.Format("{0}_{1}_{2}", name, x, y);
243244
FileStream fis = new FileStream(sourceFolder + name + ".svg", FileMode.Open, FileAccess.Read);
244245
DrawOnSpecifiedPositionDocument(fis, destinationFolder + destName + ".pdf", x, y);
245246
NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(destinationFolder + destName + ".pdf", sourceFolder
@@ -251,7 +252,7 @@ public virtual void DrawOnSpecifiedPositionNegativeX() {
251252
String name = "eclipse";
252253
int x = -50;
253254
int y = 0;
254-
String destName = String.Format(System.Globalization.CultureInfo.InvariantCulture, "{0}_{1}_{2}", name, x, y);
255+
String destName = MessageFormatUtil.Format("{0}_{1}_{2}", name, x, y);
255256
FileStream fis = new FileStream(sourceFolder + name + ".svg", FileMode.Open, FileAccess.Read);
256257
DrawOnSpecifiedPositionDocument(fis, destinationFolder + destName + ".pdf", x, y);
257258
NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(destinationFolder + destName + ".pdf", sourceFolder
@@ -263,7 +264,7 @@ public virtual void DrawOnSpecifiedPositionNegativeY() {
263264
String name = "eclipse";
264265
int x = 0;
265266
int y = -100;
266-
String destName = String.Format(System.Globalization.CultureInfo.InvariantCulture, "{0}_{1}_{2}", name, x, y);
267+
String destName = MessageFormatUtil.Format("{0}_{1}_{2}", name, x, y);
267268
FileStream fis = new FileStream(sourceFolder + name + ".svg", FileMode.Open, FileAccess.Read);
268269
DrawOnSpecifiedPositionDocument(fis, destinationFolder + destName + ".pdf", x, y);
269270
NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(destinationFolder + destName + ".pdf", sourceFolder
@@ -275,7 +276,7 @@ public virtual void DrawOnSpecifiedPositionNegativeXY() {
275276
String name = "eclipse";
276277
int x = -50;
277278
int y = -100;
278-
String destName = String.Format(System.Globalization.CultureInfo.InvariantCulture, "{0}_{1}_{2}", name, x, y);
279+
String destName = MessageFormatUtil.Format("{0}_{1}_{2}", name, x, y);
279280
FileStream fis = new FileStream(sourceFolder + name + ".svg", FileMode.Open, FileAccess.Read);
280281
DrawOnSpecifiedPositionDocument(fis, destinationFolder + destName + ".pdf", x, y);
281282
NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(destinationFolder + destName + ".pdf", sourceFolder
@@ -287,7 +288,7 @@ public virtual void DrawOnSpecifiedPositionPartialOnPage() {
287288
String name = "eclipse";
288289
int x = -50;
289290
int y = -50;
290-
String destName = String.Format(System.Globalization.CultureInfo.InvariantCulture, "{0}_{1}_{2}", name, x, y);
291+
String destName = MessageFormatUtil.Format("{0}_{1}_{2}", name, x, y);
291292
FileStream fis = new FileStream(sourceFolder + name + ".svg", FileMode.Open, FileAccess.Read);
292293
DrawOnSpecifiedPositionDocument(fis, destinationFolder + destName + ".pdf", x, y);
293294
NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(destinationFolder + destName + ".pdf", sourceFolder

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

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -112,18 +112,24 @@ 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")));
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"));
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+
);
121127
String fontBBox = (String)fontDesc.Get("FontBBox");
122128
StringTokenizer tk = new StringTokenizer(fontBBox, " []\r\n\t\f");
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());
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);
127133
fontMetrics.UpdateBbox(llx, lly, urx, ury);
128134
registry = (String)fontDesc.Get("Registry");
129135
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.ToString(System.Globalization.CultureInfo.InvariantCulture));
102+
output.Write(n);
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),
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) };
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+
) };
412412
break;
413413
}
414414
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,8 @@ 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);
101+
this.nthB = Convert.ToInt32(bParticle[0] + bParticle.Substring(1).Trim(), System.Globalization.CultureInfo.InvariantCulture
102+
);
102103
}
103104
else {
104105
this.nthB = 0;

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,8 @@ 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);
469+
b = Convert.ToInt32(iText.IO.Util.StringUtil.Group(mB).ReplaceFirst("^\\+", ""), System.Globalization.CultureInfo.InvariantCulture
470+
);
470471
}
471472
else {
472473
throw new Selector.SelectorParseException("Could not parse nth-index " + PortUtil.EscapedSingleBracket + "{0}"

‎port-hash

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
52f4ddbdb2ad3b8a4969261f2c49579121155d89
1+
b040aed8b907ab9b707ab9dada73c8957bfe5b62

0 commit comments

Comments
 (0)