You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by ss...@apache.org on 2022/04/06 10:38:53 UTC
svn commit: r1899611 - in /xmlgraphics/fop-pdf-images/trunk: lib/jacocoant.jar test/java/org/apache/fop/render/pdf/FOPPDFSingleMultiByteFontTestCase.java test/java/org/apache/fop/render/pdf/ImageConverterPDF2AFPTestCase.java
Author: ssteiner
Date: Wed Apr 6 10:38:52 2022
New Revision: 1899611
URL: http://svn.apache.org/viewvc?rev=1899611&view=rev
Log:
Fix warnings
Modified:
xmlgraphics/fop-pdf-images/trunk/lib/jacocoant.jar
xmlgraphics/fop-pdf-images/trunk/test/java/org/apache/fop/render/pdf/FOPPDFSingleMultiByteFontTestCase.java
xmlgraphics/fop-pdf-images/trunk/test/java/org/apache/fop/render/pdf/ImageConverterPDF2AFPTestCase.java
Modified: xmlgraphics/fop-pdf-images/trunk/lib/jacocoant.jar
URL: http://svn.apache.org/viewvc/xmlgraphics/fop-pdf-images/trunk/lib/jacocoant.jar?rev=1899611&r1=1899610&r2=1899611&view=diff
==============================================================================
Binary files - no diff available.
Modified: xmlgraphics/fop-pdf-images/trunk/test/java/org/apache/fop/render/pdf/FOPPDFSingleMultiByteFontTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop-pdf-images/trunk/test/java/org/apache/fop/render/pdf/FOPPDFSingleMultiByteFontTestCase.java?rev=1899611&r1=1899610&r2=1899611&view=diff
==============================================================================
--- xmlgraphics/fop-pdf-images/trunk/test/java/org/apache/fop/render/pdf/FOPPDFSingleMultiByteFontTestCase.java (original)
+++ xmlgraphics/fop-pdf-images/trunk/test/java/org/apache/fop/render/pdf/FOPPDFSingleMultiByteFontTestCase.java Wed Apr 6 10:38:52 2022
@@ -74,7 +74,7 @@ public class FOPPDFSingleMultiByteFontTe
Assert.assertEquals(sbfont.getFontName(), "MyriadPro-Regular_Type1f0encstdcs");
Assert.assertEquals(sbfont.getEncodingName(), "WinAnsiEncoding");
Assert.assertEquals(sbfont.mapChar('W'), 'W');
- String x = IOUtils.toString(sbfont.getInputStream());
+ String x = IOUtils.toString(sbfont.getInputStream(), "utf8");
Assert.assertTrue(x, x.contains("Adobe Systems"));
Assert.assertEquals(sbfont.getEncoding().getName(), "FOPPDFEncoding");
Assert.assertTrue(Arrays.asList(sbfont.getEncoding().getCharNameMap()).contains("A"));
Modified: xmlgraphics/fop-pdf-images/trunk/test/java/org/apache/fop/render/pdf/ImageConverterPDF2AFPTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop-pdf-images/trunk/test/java/org/apache/fop/render/pdf/ImageConverterPDF2AFPTestCase.java?rev=1899611&r1=1899610&r2=1899611&view=diff
==============================================================================
--- xmlgraphics/fop-pdf-images/trunk/test/java/org/apache/fop/render/pdf/ImageConverterPDF2AFPTestCase.java (original)
+++ xmlgraphics/fop-pdf-images/trunk/test/java/org/apache/fop/render/pdf/ImageConverterPDF2AFPTestCase.java Wed Apr 6 10:38:52 2022
@@ -34,7 +34,7 @@ public class ImageConverterPDF2AFPTestCa
@Test
public void testConverter() throws Exception {
PDDocument orgdoc = PDFBoxAdapterTestCase.load(PDFBoxAdapterTestCase.ANNOT);
- String orgPage = IOUtils.toString(orgdoc.getPage(1).getContents());
+ String orgPage = IOUtils.toString(orgdoc.getPage(1).getContents(), "utf8");
Assert.assertEquals(orgdoc.getNumberOfPages(), 2);
ImageInfo info = new ImageInfo("x.pdf#page=2", ImagePDF.MIME_PDF);
ImagePDF imagePDF = new ImagePDF(info, orgdoc);
@@ -42,7 +42,7 @@ public class ImageConverterPDF2AFPTestCa
ImageRawStream stream = (ImageRawStream) converter.convert(imagePDF, null);
PDDocument doc = PDDocument.load(stream.createInputStream());
PDPage page = doc.getPage(0);
- Assert.assertEquals(orgPage, IOUtils.toString(page.getContents()));
+ Assert.assertEquals(orgPage, IOUtils.toString(page.getContents(), "utf8"));
Assert.assertEquals(doc.getNumberOfPages(), 1);
Assert.assertEquals(stream.getMimeType(), ImagePDF.MIME_PDF);
orgdoc.close();
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org