Author: tilman
Date: Wed Oct 22 09:58:23 2025
New Revision: 1929271
Log:
PDFBOX-6085: rename variables so that similar code looks even more similar
Modified:
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/TTFSubsetter.java
Modified:
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/TTFSubsetter.java
==============================================================================
--- pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/TTFSubsetter.java
Wed Oct 22 08:30:14 2025 (r1929270)
+++ pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/TTFSubsetter.java
Wed Oct 22 09:58:23 2025 (r1929271)
@@ -516,10 +516,10 @@ public final class TTFSubsetter
}
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 @@ public final class TTFSubsetter
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 @@ public final class TTFSubsetter
while ((flags & 1 << 5) != 0); // MORE_COMPONENTS
}
- lastOff = offsets[glyphId + 1];
+ lastOff = offsets[gid + 1];
}
}
hasNested = glyphIdsToAdd != null;