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

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

Author: THausherr

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

@@ -942,13 +942,13 @@ private byte[] buildHmtxTable() throws IOException
             }
 
             long lastOffset = 0;
-            for (Integer glyphId : glyphIds)
+            for (Integer gid : glyphIds)
             {
                 // offset in original file
                 long offset;
-                if (glyphId <= lastgid)
+                if (gid <= lastgid)
                 {
-                    if (invisibleGlyphIds.contains(glyphId))
+                    if (invisibleGlyphIds.contains(gid))
                     {
                         // force zero width (no change to last offset)
                         // 4 bytes total, 2 bytes each for: advance width = 0, left side bearing = 0
@@ -957,7 +957,7 @@ private byte[] buildHmtxTable() throws IOException
                     else
                     {
                         // copy width and lsb
-                        offset = glyphId * 4l;
+                        offset = gid * 4l;
                         lastOffset = copyBytes(is, bos, offset, lastOffset, 4);
                     }
                 }
@@ -975,7 +975,7 @@ private byte[] buildHmtxTable() throws IOException
                     }
 
                     // copy lsb only, as we are beyond numOfHMetrics
-                    offset = h.getNumberOfHMetrics() * 4l + (glyphId - h.getNumberOfHMetrics()) * 2l;
+                    offset = h.getNumberOfHMetrics() * 4l + (gid - h.getNumberOfHMetrics()) * 2l;
                     lastOffset = copyBytes(is, bos, offset, lastOffset, 2);
                 }
             }