fix: wrong refactoring

src/main/java/org/mabb/fontverter/opentype/GlyphTable.java

@@ -47,9 +47,9 @@ protected byte[] generateUnpaddedData() throws IOException {
 		}
     }
 
-    public void readData(byte[] data) throws IOException {
-        super.readData(data);
-        
+	public void readData(byte[] data) throws IOException {
+		super.readData(data);
+
 		try (FontDataInputStream reader = new FontDataInputStream(data)) {
 			Long[] offsets = font.getLocaTable().getOffsets();
 
@@ -68,14 +68,18 @@ public void readData(byte[] data) throws IOException {
 					continue;
 				}
 
-				reader.seek(offset.intValue());
-				byte[] glyphData = reader.readBytes((int) length);
+				try {
+					reader.seek(offset.intValue());
+					byte[] glyphData = reader.readBytes((int) length);
 
-				TtfGlyph glyph = TtfGlyph.parse(glyphData, font);
-				glyphs.add(glyph);
+					TtfGlyph glyph = TtfGlyph.parse(glyphData, font);
+					glyphs.add(glyph);
+				} catch (Exception ex) {
+					log.error("", ex);
+				}
 			}
 		}
-    }
+	}
 
     public List<TtfGlyph> getGlyphs() {
         return glyphs;

src/main/java/org/mabb/fontverter/opentype/TtfInstructions/instructions/DebugInstruction.java

@@ -31,7 +31,7 @@ public void read(FontDataInputStream in) throws IOException {
     }
 
     public void execute(InstructionStack stack) throws IOException {
-//        Long n = stack.popUint32();
+        stack.popUint32();
         // todo, in debugger versions of vm should invoke the font developers debugger not sure
         // how to do this
     }

src/main/java/org/mabb/fontverter/opentype/TtfInstructions/instructions/control/IdefInstruction.java

@@ -32,6 +32,7 @@ public void read(FontDataInputStream in) throws IOException {
     }
 
     public void execute(InstructionStack stack) throws IOException {
-//        Number opCode = stack.popEint8();
+//        Number opCode = 
+    	stack.popEint8();
     }
 }

src/main/java/org/mabb/fontverter/opentype/TtfInstructions/instructions/control/LoopCallInstruction.java

@@ -32,11 +32,13 @@ public void read(FontDataInputStream in) throws IOException {
     }
 
     public void execute(InstructionStack stack) throws IOException {
-//        Integer functionId = (Integer) stack.pop();
-        Number loopCount = stack.popNumber();
+//        Integer functionId = (Integer) 
+        stack.pop();
+//        Number loopCount = 
+        		stack.popNumber();
 
-        for (int i = 0; i < loopCount.longValue(); i++) {
-            // todo call function from maxp table
-        }
+//        for (int i = 0; i < loopCount.longValue(); i++) {
+//            // todo call function from maxp table
+//        }
     }
 }

src/main/java/org/mabb/fontverter/opentype/TtfInstructions/instructions/graphic/AlignPoints.java

@@ -32,7 +32,9 @@ public void read(FontDataInputStream in) throws IOException {
     }
 
     public void execute(InstructionStack stack) throws IOException {
-//        long p1 = stack.popUint32();
-//        long p2 = stack.popUint32();
+//        long p1 = 
+        stack.popUint32();
+//        long p2 = 
+        stack.popUint32();
     }
 }

src/main/java/org/mabb/fontverter/opentype/TtfInstructions/instructions/graphic/AlignToReferencePoint.java

@@ -32,8 +32,11 @@ public void read(FontDataInputStream in) throws IOException {
     }
 
     public void execute(InstructionStack stack) throws IOException {
-//        long point1Id = stack.popUint32();
-//        long point2Id = stack.popUint32();
-//        long ploopValue = stack.popUint32();
+//        long point1Id = 
+    	stack.popUint32();
+//        long point2Id = 
+    	stack.popUint32();
+//        long ploopValue = 
+    	stack.popUint32();
     }
 }

src/main/java/org/mabb/fontverter/opentype/TtfInstructions/instructions/graphic/FlipPointInstruction.java

@@ -32,9 +32,12 @@ public void read(FontDataInputStream in) throws IOException {
     }
 
     public void execute(InstructionStack stack) throws IOException {
-//        Long p1 = stack.popUint32();
-//        Long p2 = stack.popUint32();
-//        Long ploopValue = stack.popUint32();
+//        Long p1 = 
+    	stack.popUint32();
+//        Long p2 = 
+    	stack.popUint32();
+//        Long ploopValue = 
+    	stack.popUint32();
         // modifies graphical state stuff, not yet there with graphical state handeling
     }
 }

src/main/java/org/mabb/fontverter/opentype/TtfInstructions/instructions/graphic/FlipRangeOffInstruction.java

@@ -32,8 +32,10 @@ public void read(FontDataInputStream in) throws IOException {
     }
 
     public void execute(InstructionStack stack) throws IOException {
-//        Long high = stack.popUint32();
-//        Long low = stack.popUint32();
+//        Long high = 
+    	stack.popUint32();
+//        Long low = 
+    	stack.popUint32();
         // modifies graphical state stuff, not yet there with graphical state handeling
     }
 }

src/main/java/org/mabb/fontverter/opentype/TtfInstructions/instructions/graphic/FlipRangeOnInstruction.java

@@ -32,8 +32,10 @@ public void read(FontDataInputStream in) throws IOException {
     }
 
     public void execute(InstructionStack stack) throws IOException {
-//        Long high = stack.popUint32();
-//        Long low = stack.popUint32();
+//        Long high = 
+    	stack.popUint32();
+//        Long low = 
+    	stack.popUint32();
         // modifies graphical state stuff, not yet there with graphical state handeling
     }
 }

src/main/java/org/mabb/fontverter/opentype/TtfInstructions/instructions/graphic/GetCoordinateInstruction.java

@@ -35,7 +35,8 @@ public void read(FontDataInputStream in) throws IOException {
     }
 
     public void execute(InstructionStack stack) throws IOException {
-//        Long pointNum = stack.popUint32();
+//        Long pointNum = 
+    	stack.popUint32();
 
         // todo needs to use projection vector
         Float coordinateLocation = 0f;

src/main/java/org/mabb/fontverter/opentype/TtfInstructions/instructions/graphic/InterpolatePointInstruction.java

@@ -32,9 +32,12 @@ public void read(FontDataInputStream in) throws IOException {
     }
 
     public void execute(InstructionStack stack) throws IOException {
-//        Long p1 = stack.popUint32();
-//        Long p2 = stack.popUint32();
-//        Long ploop = stack.popUint32();
+//        Long p1 = 
+    	stack.popUint32();
+//        Long p2 = 
+    	stack.popUint32();
+//        Long ploop = 
+    	stack.popUint32();
         // todo graphical state
     }
 }

src/main/java/org/mabb/fontverter/opentype/TtfInstructions/instructions/graphic/IntersectionInstruction.java

@@ -32,12 +32,17 @@ public void read(FontDataInputStream in) throws IOException {
     }
 
     public void execute(InstructionStack stack) throws IOException {
-//        Long line1Start = stack.popUint32();
-//        Long line1End = stack.popUint32();
-//        Long line2Start = stack.popUint32();
-//        Long line2End = stack.popUint32();
+//        Long line1Start = 
+        stack.popUint32();
+//        Long line1End = 
+        stack.popUint32();
+//        Long line2Start = 
+        stack.popUint32();
+//        Long line2End = 
+        stack.popUint32();
 
-//        Long movePoint = stack.popUint32();
+//        Long movePoint = 
+        stack.popUint32();
         // todo graphical state
     }
 }

src/main/java/org/mabb/fontverter/opentype/TtfInstructions/instructions/graphic/MeasureDistanceInstruction.java

@@ -37,8 +37,10 @@ public void read(FontDataInputStream in) throws IOException {
     }
 
     public void execute(InstructionStack stack) throws IOException {
-//        Long pointId2 = stack.popUint32();
-//        Long pointId1 = stack.popUint32();
+//        Long pointId2 = 
+        stack.popUint32();
+//        Long pointId1 = 
+        stack.popUint32();
 
         // todo graphics state to grab actual point values
         Float distance = 0.0f;

src/main/java/org/mabb/fontverter/opentype/TtfInstructions/instructions/graphic/MoveDirectAbsolutePointInstruction.java

@@ -36,7 +36,8 @@ public void read(FontDataInputStream in) throws IOException {
     }
 
     public void execute(InstructionStack stack) throws IOException {
-//        Long pointId = stack.popUint32();
+//        Long pointId = 
+    	stack.popUint32();
 
         // todo graphics state handeling
     }

src/main/java/org/mabb/fontverter/opentype/TtfInstructions/instructions/graphic/MoveDirectRelativePointInstruction.java

@@ -46,7 +46,8 @@ public void read(FontDataInputStream in) throws IOException {
     }
 
     public void execute(InstructionStack stack) throws IOException {
-//        Long pointId = stack.popUint32();
+//        Long pointId = 
+    	stack.popUint32();
 
         // todo graphics state handeling
     }

src/main/java/org/mabb/fontverter/opentype/TtfInstructions/instructions/graphic/MoveIndirectAbsolutePointInstruction.java

@@ -36,8 +36,10 @@ public void read(FontDataInputStream in) throws IOException {
     }
 
     public void execute(InstructionStack stack) throws IOException {
-//        Float cvtEntry = stack.popF26Dot6();
-//        Long pointId = stack.popUint32();
+//        Float cvtEntry = 
+    	stack.popF26Dot6();
+//        Long pointId = 
+    	stack.popUint32();
 
         // todo graphics state handeling
     }

src/main/java/org/mabb/fontverter/opentype/TtfInstructions/instructions/graphic/MoveIndirectRelativePointInstruction.java

@@ -46,8 +46,10 @@ public void read(FontDataInputStream in) throws IOException {
     }
 
     public void execute(InstructionStack stack) throws IOException {
-//        Float cvtEntry = stack.popF26Dot6();
-//        Long pointId = stack.popUint32();
+//        Float cvtEntry = 
+    	stack.popF26Dot6();
+//        Long pointId = 
+    	stack.popUint32();
 
         // todo graphics state handeling
     }

src/main/java/org/mabb/fontverter/opentype/TtfInstructions/instructions/graphic/MoveStackIndirectRelPoint.java

@@ -36,8 +36,10 @@ public void read(FontDataInputStream in) throws IOException {
     }
 
     public void execute(InstructionStack stack) throws IOException {
-//        Float distance = stack.popF26Dot6();
-//        Long pointId = stack.popUint32();
+//        Float distance = 
+    	stack.popF26Dot6();
+//        Long pointId = 
+    	stack.popUint32();
 
         // todo graphics state handeling
     }

src/main/java/org/mabb/fontverter/opentype/TtfInstructions/instructions/graphic/SetCoordinatesInstruction.java

@@ -32,8 +32,10 @@ public void read(FontDataInputStream in) throws IOException {
     }
 
     public void execute(InstructionStack stack) throws IOException {
-//        Float coordinateValue = stack.popF26Dot6();
-//        Long pointId = stack.popUint32();
+//        Float coordinateValue = 
+    	stack.popF26Dot6();
+//        Long pointId = 
+    	stack.popUint32();
 
         // todo graphics state handeling
     }

src/main/java/org/mabb/fontverter/opentype/TtfInstructions/instructions/graphic/SetDualProjectVectorLineInstruction.java

@@ -36,8 +36,10 @@ public void read(FontDataInputStream in) throws IOException {
     }
 
     public void execute(InstructionStack stack) throws IOException {
-//        Long point2Id = stack.popUint32();
-//        Long point1Id = stack.popUint32();
+//        Long point2Id = 
+    	stack.popUint32();
+//        Long point1Id = 
+    	stack.popUint32();
 
         // todo graphics state handeling
     }

src/main/java/org/mabb/fontverter/opentype/TtfInstructions/instructions/graphic/SetFreedomVectorToLineInstruction.java

@@ -36,8 +36,10 @@ public void read(FontDataInputStream in) throws IOException {
     }
 
     public void execute(InstructionStack stack) throws IOException {
-//        Long pointId2 = stack.popUint32();
-//        Long pointId1 = stack.popUint32();
+//        Long pointId2 = 
+    	stack.popUint32();
+//        Long pointId1 = 
+    	stack.popUint32();
         // todo graphics state handeling
     }
 }

src/main/java/org/mabb/fontverter/opentype/TtfInstructions/instructions/graphic/SetProjectionVectorToLineInstruction.java

@@ -36,8 +36,10 @@ public void read(FontDataInputStream in) throws IOException {
     }
 
     public void execute(InstructionStack stack) throws IOException {
-//        Long pointId2 = stack.popUint32();
-//        Long pointId1 = stack.popUint32();
+//        Long pointId2 = 
+    	stack.popUint32();
+//        Long pointId1 = 
+    	stack.popUint32();
         // todo graphics state handeling
     }
 }

src/main/java/org/mabb/fontverter/opentype/TtfInstructions/instructions/graphic/ShiftCountourWithReferencePointInstruction.java

@@ -36,7 +36,8 @@ public void read(FontDataInputStream in) throws IOException {
     }
 
     public void execute(InstructionStack stack) throws IOException {
-//        Long contourId = stack.popUint32();
+//        Long contourId = 
+    	stack.popUint32();
         // todo graphics state handeling
     }
 }

src/main/java/org/mabb/fontverter/opentype/TtfInstructions/instructions/graphic/ShiftPointByPixelInstruction.java

@@ -32,7 +32,8 @@ public void read(FontDataInputStream in) throws IOException {
     }
 
     public void execute(InstructionStack stack) throws IOException {
-//        Float shift = stack.popF26Dot6();
+//        Float shift = 
+    	stack.popF26Dot6();
         // todo graphics state handeling
     }
 }

src/main/java/org/mabb/fontverter/opentype/TtfInstructions/instructions/graphic/ShiftPointWithReferencePointInstruction.java

@@ -36,9 +36,12 @@ public void read(FontDataInputStream in) throws IOException {
     }
 
     public void execute(InstructionStack stack) throws IOException {
-//        Long pointId1 = stack.popUint32();
-//        Long pointId2 = stack.popUint32();
-//        Long ploopvalue = stack.popUint32();
+//        Long pointId1 = 
+    	stack.popUint32();
+//        Long pointId2 = 
+    	stack.popUint32();
+//        Long ploopvalue = 
+    	stack.popUint32();
         // todo graphics state handeling
     }
 }

src/main/java/org/mabb/fontverter/opentype/TtfInstructions/instructions/graphic/ShiftZoneWithReferencePointInstruction.java

@@ -36,7 +36,8 @@ public void read(FontDataInputStream in) throws IOException {
     }
 
     public void execute(InstructionStack stack) throws IOException {
-//        Long zoneId = stack.popUint32();
+//        Long zoneId = 
+    	stack.popUint32();
         // todo graphics state handeling
     }
 }

src/main/java/org/mabb/fontverter/opentype/TtfInstructions/instructions/graphic/UntouchPointInstruction.java

@@ -32,7 +32,8 @@ public void read(FontDataInputStream in) throws IOException {
     }
 
     public void execute(InstructionStack stack) throws IOException {
-//        Long id = stack.popUint32();
+//        Long id = 
+    	stack.popUint32();
         // todo graphics state handeling
     }
 }