deal with deprecation changes in PDF

benfry · benfry · commit 624e9074aeb1 · 2020-01-20T14:54:38.000-05:00
diff --git a/java/libraries/pdf/.classpath b/java/libraries/pdf/.classpath
@@ -2,7 +2,7 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/processing-core"/>
 	<classpathentry kind="lib" path="library/itext.jar" sourcepath="itext-src.zip"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/processing4-core"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/java/libraries/pdf/src/processing/pdf/PGraphicsPDF.java b/java/libraries/pdf/src/processing/pdf/PGraphicsPDF.java
@@ -177,7 +177,7 @@ static protected DefaultFontMapper getMapper() {
 //      long t = System.currentTimeMillis();
       mapper = new DefaultFontMapper();
 
-      if (PApplet.platform == PConstants.MACOSX) {
+      if (PApplet.platform == PConstants.MACOS) {
         try {
           String homeLibraryFonts =
             System.getProperty("user.home") + "/Library/Fonts";
@@ -428,7 +428,7 @@ protected void imageImpl(PImage image,
     scale((x2 - x1) / imageWidth,
           (y2 - y1) / imageHeight);
     if (u2-u1 == imageWidth && v2-v1 == imageHeight) {
-      g2.drawImage(image.getImage(), 0, 0, null);
+      g2.drawImage((Image) image.getNative(), 0, 0, null);
     } else {
       PImage tmp = image.get(u1, v1, u2-u1, v2-v1);
       g2.drawImage((Image) tmp.getNative(), 0, 0, null);
