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 2023/12/05 13:24:22 UTC

svn commit: r1914359 - /pdfbox/branches/3.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FileSystemFontProvider.java

Author: tilman
Date: Tue Dec  5 13:24:22 2023
New Revision: 1914359

URL: http://svn.apache.org/viewvc?rev=1914359&view=rev
Log:
PDFBOX-5727: fix CRC32 checksum (didn't work at all)

Modified:
    pdfbox/branches/3.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FileSystemFontProvider.java

Modified: pdfbox/branches/3.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FileSystemFontProvider.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/3.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FileSystemFontProvider.java?rev=1914359&r1=1914358&r2=1914359&view=diff
==============================================================================
--- pdfbox/branches/3.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FileSystemFontProvider.java (original)
+++ pdfbox/branches/3.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FileSystemFontProvider.java Tue Dec  5 13:24:22 2023
@@ -28,12 +28,11 @@ import java.net.URI;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.security.AccessControlException;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import java.util.zip.CRC32;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -51,7 +50,6 @@ import org.apache.fontbox.type1.Type1Fon
 import org.apache.fontbox.util.autodetect.FontFileFinder;
 import org.apache.pdfbox.io.IOUtils;
 import org.apache.pdfbox.io.RandomAccessReadBufferedFile;
-import org.apache.pdfbox.util.Hex;
 
 /**
  * A FontProvider which searches for fonts on the local filesystem.
@@ -877,17 +875,9 @@ final class FileSystemFontProvider exten
 
     private static String computeHash(byte[] ba)
     {
-        MessageDigest md;
-        try
-        {
-            md = MessageDigest.getInstance("CRC32");
-            byte[] dig = md.digest(ba);
-            return Hex.getString(dig);
-        }
-        catch (NoSuchAlgorithmException ex)
-        {
-            // never happens
-            return "";
-        }
+        CRC32 crc = new CRC32();
+        crc.update(ba);
+        long l = crc.getValue();
+        return Long.toHexString(l);
     }
 }