PDFBOX-6085: rename variables so that similar code looks even more similar

git-svn-id: https://svn.apache.org/repos/asf/pdfbox/trunk@1929271 13f79535-47bb-0310-9956-ffa450edef68

Author: THausherr

fontbox/src/main/java/org/apache/fontbox/ttf/TTFSubsetter.java

@@ -516,10 +516,10 @@ private void addCompoundReferences() throws IOException
                 }
 
                 long lastOff = 0L;
-                for (Integer glyphId : glyphIds)
+                for (Integer gid : glyphIds)
                 {
-                    long offset = offsets[glyphId];
-                    long len = offsets[glyphId + 1] - offset;
+                    long offset = offsets[gid];
+                    long length = offsets[gid + 1] - offset;
                     isResult = is.skip(offset - lastOff);
 
                     if (Long.compare(isResult, offset - lastOff) != 0)
@@ -528,12 +528,12 @@ private void addCompoundReferences() throws IOException
                                 offset - lastOff, isResult);
                     }
 
-                    byte[] buf = new byte[(int)len];
+                    byte[] buf = new byte[(int) length];
                     isResult = is.read(buf);
 
-                    if (Long.compare(isResult, len) != 0)
+                    if (Long.compare(isResult, length) != 0)
                     {
-                        LOG.debug("Tried reading {} bytes but only {} bytes read", len, isResult);
+                        LOG.debug("Tried reading {} bytes but only {} bytes read", length, isResult);
                     }
 
                     // rewrite glyphIds for compound glyphs
@@ -583,7 +583,7 @@ else if ((flags & 1 << 3) != 0)
                         while ((flags & 1 << 5) != 0); // MORE_COMPONENTS
 
                     }
-                    lastOff = offsets[glyphId + 1];
+                    lastOff = offsets[gid + 1];
                 }
             }
             hasNested = glyphIdsToAdd != null;