You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ti...@apache.org on 2020/06/15 17:45:49 UTC
svn commit: r1878860 - in /pdfbox/branches/issue45:
fontbox/src/main/java/org/apache/fontbox/ttf/OS2WindowsMetricsTable.java
pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/TrueTypeEmbedder.java
Author: tilman
Date: Mon Jun 15 17:45:49 2020
New Revision: 1878860
URL: http://svn.apache.org/viewvc?rev=1878860&view=rev
Log:
PDFBOX-4882: correct FSTYPE_RESTRICTED constant; remove segment that disabled the detection code
Modified:
pdfbox/branches/issue45/fontbox/src/main/java/org/apache/fontbox/ttf/OS2WindowsMetricsTable.java
pdfbox/branches/issue45/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/TrueTypeEmbedder.java
Modified: pdfbox/branches/issue45/fontbox/src/main/java/org/apache/fontbox/ttf/OS2WindowsMetricsTable.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/issue45/fontbox/src/main/java/org/apache/fontbox/ttf/OS2WindowsMetricsTable.java?rev=1878860&r1=1878859&r2=1878860&view=diff
==============================================================================
--- pdfbox/branches/issue45/fontbox/src/main/java/org/apache/fontbox/ttf/OS2WindowsMetricsTable.java (original)
+++ pdfbox/branches/issue45/fontbox/src/main/java/org/apache/fontbox/ttf/OS2WindowsMetricsTable.java Mon Jun 15 17:45:49 2020
@@ -152,7 +152,7 @@ public class OS2WindowsMetricsTable exte
* <p>For Restricted License embedding to take effect, it must be the only level of embedding
* selected.
*/
- public static final short FSTYPE_RESTRICTED = 0x0001;
+ public static final short FSTYPE_RESTRICTED = 0x0002;
/**
* Preview and Print embedding: the font may be embedded, and temporarily loaded on the
Modified: pdfbox/branches/issue45/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/TrueTypeEmbedder.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/issue45/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/TrueTypeEmbedder.java?rev=1878860&r1=1878859&r2=1878860&view=diff
==============================================================================
--- pdfbox/branches/issue45/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/TrueTypeEmbedder.java (original)
+++ pdfbox/branches/issue45/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/TrueTypeEmbedder.java Mon Jun 15 17:45:49 2020
@@ -137,15 +137,13 @@ abstract class TrueTypeEmbedder implemen
if (ttf.getOS2Windows() != null)
{
int fsType = ttf.getOS2Windows().getFsType();
- int exclusive = fsType & 0x8; // bits 0-3 are a set of exclusive bits
-
- if ((exclusive & OS2WindowsMetricsTable.FSTYPE_RESTRICTED) ==
+ if ((fsType & OS2WindowsMetricsTable.FSTYPE_RESTRICTED) ==
OS2WindowsMetricsTable.FSTYPE_RESTRICTED)
{
// restricted License embedding
return false;
}
- else if ((exclusive & OS2WindowsMetricsTable.FSTYPE_BITMAP_ONLY) ==
+ else if ((fsType & OS2WindowsMetricsTable.FSTYPE_BITMAP_ONLY) ==
OS2WindowsMetricsTable.FSTYPE_BITMAP_ONLY)
{
// bitmap embedding only