kolan/obsolete.ChilliProject
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ruby1.9 compatibility

Browse Source 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4602 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2011-01-01 11:45:12 +00:00
parent 9748567452
commit 2c830770cb
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
vendor/plugins/rfpdf/lib/rfpdf/fpdf.rb vendored
View File

@ -378,13 +378,21 @@ class FPDF
end end
@ColorFlag=(@FillColor!=@TextColor) @ColorFlag=(@FillColor!=@TextColor)
end end
def GetCharWidth(widths, index)
if index.is_a?(String)
widths[index.ord]
else
widths[index]
end
end
def GetStringWidth(s) def GetStringWidth(s)
# Get width of a string in the current font # Get width of a string in the current font
cw=@CurrentFont['cw'] cw=@CurrentFont['cw']
w=0 w=0
s.each_byte do |c| s.each_byte do |c|
w=w+cw[c] w=w+GetCharWidth(cw, c)
end end
w*@FontSize/1000.0 w*@FontSize/1000.0
end end
@ -707,7 +715,7 @@ class FPDF
ls=l ls=l
ns=ns+1 ns=ns+1
end end
l=l+cw[c[0]] l=l+GetCharWidth(cw, c[0])
if l>wmax if l>wmax
# Automatic line break # Automatic line break
if sep==-1 if sep==-1
@ -786,7 +794,7 @@ class FPDF
sep=i sep=i
ls=l ls=l
end end
l=l+cw[c]; l=l+GetCharWidth(cw, c);
if l>wmax if l>wmax
# Automatic line break # Automatic line break
if sep==-1 if sep==-1
@ -1079,7 +1087,7 @@ class FPDF
cw=font['cw'] cw=font['cw']
s='[' s='['
32.upto(255) do |i| 32.upto(255) do |i|
s << cw[i].to_s+' ' s << GetCharWidth(cw, i).to_s + ' '
end end
out(s+']') out(s+']')
out('endobj') out('endobj')