Author: ssteiner
Date: Thu Dec 7 15:26:49 2017
New Revision: 1817383
URL: http://svn.apache.org/viewvc?rev=1817383&view=rev
Log:
FOP-2753: PDF to PS allow fop fonts as fallback
Added:
xmlgraphics/fop-pdf-images/trunk/test/resources/fontsnotembeddedcid.pdf
(with props)
Modified:
xmlgraphics/fop-pdf-images/trunk/src/java/org/apache/fop/render/pdf/pdfbox/ImageConverterPDF2G2D.java
xmlgraphics/fop-pdf-images/trunk/test/java/org/apache/fop/render/pdf/ImageConverterPDF2G2DTestCase.java
Modified:
xmlgraphics/fop-pdf-images/trunk/src/java/org/apache/fop/render/pdf/pdfbox/ImageConverterPDF2G2D.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop-pdf-images/trunk/src/java/org/apache/fop/render/pdf/pdfbox/ImageConverterPDF2G2D.java?rev=1817383&r1=1817382&r2=1817383&view=diff
==============================================================================
---
xmlgraphics/fop-pdf-images/trunk/src/java/org/apache/fop/render/pdf/pdfbox/ImageConverterPDF2G2D.java
(original)
+++
xmlgraphics/fop-pdf-images/trunk/src/java/org/apache/fop/render/pdf/pdfbox/ImageConverterPDF2G2D.java
Thu Dec 7 15:26:49 2017
@@ -320,6 +320,10 @@ public class ImageConverterPDF2G2D exten
public CIDFontMapping getCIDFont(String baseFont, PDFontDescriptor
fontDescriptor,
PDCIDSystemInfo cidSystemInfo) {
+ TrueTypeFont ttFont = getTrueTypeFont(baseFont);
+ if (ttFont != null) {
+ return new CIDFontMapping(null, ttFont, true);
+ }
return defaultFontMapper.getCIDFont(baseFont, fontDescriptor,
cidSystemInfo);
}
}
Modified:
xmlgraphics/fop-pdf-images/trunk/test/java/org/apache/fop/render/pdf/ImageConverterPDF2G2DTestCase.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop-pdf-images/trunk/test/java/org/apache/fop/render/pdf/ImageConverterPDF2G2DTestCase.java?rev=1817383&r1=1817382&r2=1817383&view=diff
==============================================================================
---
xmlgraphics/fop-pdf-images/trunk/test/java/org/apache/fop/render/pdf/ImageConverterPDF2G2DTestCase.java
(original)
+++
xmlgraphics/fop-pdf-images/trunk/test/java/org/apache/fop/render/pdf/ImageConverterPDF2G2DTestCase.java
Thu Dec 7 15:26:49 2017
@@ -46,11 +46,15 @@ import org.apache.fop.render.pdf.pdfbox.
public class ImageConverterPDF2G2DTestCase {
private static final String FONTSNOTEMBEDDED =
"test/resources/fontsnotembedded.pdf";
+ private static final String FONTSNOTEMBEDDEDCID =
"test/resources/fontsnotembeddedcid.pdf";
@Test
public void testFontsNotEmbedded() throws IOException, ImageException {
Assert.assertTrue(pdfToPS(FONTSNOTEMBEDDED, "Helvetica-Bold"));
Assert.assertFalse(pdfToPS(FONTSNOTEMBEDDED, "xyz"));
+
+ Assert.assertTrue(pdfToPS(FONTSNOTEMBEDDEDCID, "NewsMinIWA-Th"));
+ Assert.assertFalse(pdfToPS(FONTSNOTEMBEDDEDCID, "xyz"));
}
private boolean pdfToPS(String pdf, String font) throws IOException,
ImageException {
@@ -68,7 +72,7 @@ public class ImageConverterPDF2G2DTestCa
Rectangle2D rect = new Rectangle2D.Float(0, 0, 100, 100);
GraphicContext gc = new GraphicContext();
g2d.setGraphicContext(gc);
- ig.getGraphics2DImagePainter().paint(g2d, rect);
+ g.paint(g2d, rect);
doc.close();
return lazyFont.font.fontUsed;
}
Added: xmlgraphics/fop-pdf-images/trunk/test/resources/fontsnotembeddedcid.pdf
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop-pdf-images/trunk/test/resources/fontsnotembeddedcid.pdf?rev=1817383&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
xmlgraphics/fop-pdf-images/trunk/test/resources/fontsnotembeddedcid.pdf
------------------------------------------------------------------------------
svn:executable = *
Propchange:
xmlgraphics/fop-pdf-images/trunk/test/resources/fontsnotembeddedcid.pdf
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscr...@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-h...@xmlgraphics.apache.org
