svn commit: r1922532 - in /pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/cmap: CMapParser.java CMapStrings.java

[le...@apache.org]

Author: lehmi
Date: Mon Dec 16 13:40:48 2024
New Revision: 1922532

URL: http://svn.apache.org/viewvc?rev=1922532&view=rev
Log:
PDFBOX-5902: cache CMap-string-mappings to avoid multiple instances of the very same string

Added:
    pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/cmap/CMapStrings.java   (with props)
Modified:
    pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/cmap/CMapParser.java

Modified: pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/cmap/CMapParser.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/cmap/CMapParser.java?rev=1922532&r1=1922531&r2=1922532&view=diff
==============================================================================
--- pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/cmap/CMapParser.java (original)
+++ pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/cmap/CMapParser.java Mon Dec 16 13:40:48 2024
@@ -806,7 +806,11 @@ public class CMapParser
 
     private String createStringFromBytes(byte[] bytes)
     {
-        return new String(bytes, bytes.length == 1 ? Charsets.ISO_8859_1 : Charsets.UTF_16BE);
+        if (bytes.length <= 2)
+        {
+            return CMapStrings.getMapping(bytes);
+        }
+        return new String(bytes, Charsets.UTF_16BE);
     }
 
     /**

Added: pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/cmap/CMapStrings.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/cmap/CMapStrings.java?rev=1922532&view=auto
==============================================================================
--- pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/cmap/CMapStrings.java (added)
+++ pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/cmap/CMapStrings.java Mon Dec 16 13:40:48 2024
@@ -0,0 +1,78 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.fontbox.cmap;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.fontbox.util.Charsets;
+
+/**
+ * Many CMaps are using the same values for the mapped strings. This class provides all common one- and two-byte
+ * mappings to avoid duplicate strings.
+ */
+public class CMapStrings
+{
+    private static final Map<Integer, String> twoByteMappings = new HashMap<Integer, String>();
+    private static final Map<Integer, String> oneByteMappings = new HashMap<Integer, String>();
+
+    static
+    {
+        // create all mappings when loading the class to avoid concurrency issues
+        fillMappings();
+    }
+
+    private CMapStrings()
+    {
+    }
+
+    private static void fillMappings()
+    {
+        for (int i = 0; i < 256; i++)
+        {
+            for (int j = 0; j < 256; j++)
+            {
+                byte[] bytes = { (byte) i, (byte) j };
+                twoByteMappings.put(CMap.toInt(bytes, 2),
+                        new String(bytes, Charsets.UTF_16BE));
+            }
+        }
+        for (int i = 0; i < 256; i++)
+        {
+            byte[] bytes = { (byte) i };
+            oneByteMappings.put(i, new String(bytes, Charsets.ISO_8859_1));
+        }
+    }
+
+    /**
+     * Get the mapped string value for the given combination of bytes. The mapping is limited to one and two-byte
+     * mappings. Any longer byte sequence produces null as return value.
+     * 
+     * @param bytes the given combination of bytes
+     * @return the string representation for the given combination of bytes
+     */
+    public static String getMapping(byte[] bytes)
+    {
+        if (bytes.length > 2)
+        {
+            return null;
+        }
+        return bytes.length == 1 ? oneByteMappings.get(CMap.toInt(bytes, 1))
+                : twoByteMappings.get(CMap.toInt(bytes, 2));
+    }
+}

Propchange: pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/cmap/CMapStrings.java
------------------------------------------------------------------------------
    svn:eol-style = native