Fix for OS/2 blocks with 0 for ascent/descent/line_gap.

twalpole · Dec 20, 2010 · 1d488ac · 1d488ac
1 parent b48c1e4
commit 1d488ac
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/lib/ttfunk.rb b/lib/ttfunk.rb
@@ -22,15 +22,15 @@ def initialize(contents)
 
 
     def ascent
-      @ascent ||= os2.exists? && os2.ascent || horizontal_header.ascent
+      @ascent ||= (os2.exists? && os2.ascent && os2.ascent.nonzero?) || horizontal_header.ascent
     end
 
     def descent
-      @descent ||= os2.exists? && os2.descent || horizontal_header.descent
+      @descent ||= (os2.exists? && os2.descent && os2.descent.nonzero?) || horizontal_header.descent
     end
 
     def line_gap
-      @line_gap ||= os2.exists? && os2.line_gap || horizontal_header.line_gap
+      @line_gap ||= (os2.exists? && os2.line_gap && os2.line_gap.nonzero?) || horizontal_header.line_gap
     end
 
     def bbox