From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Wed, 30 Mar 2011 03:28:10 +0000 (+0000)
Subject: PDF: transplant r4602 (#61).
X-Git-Tag: 1.2.0~591
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=2d97a7453ba4df44f3c27882544b702dfec7c115;p=redmine.git

PDF: transplant r4602 (#61).

Ruby1.9 compatibility.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5254 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/vendor/plugins/rfpdf/lib/rfpdf/fpdf.rb b/vendor/plugins/rfpdf/lib/rfpdf/fpdf.rb
index 679cfb265..30714fa3a 100644
--- a/vendor/plugins/rfpdf/lib/rfpdf/fpdf.rb
+++ b/vendor/plugins/rfpdf/lib/rfpdf/fpdf.rb
@@ -389,13 +389,21 @@ class FPDF
         end
         @ColorFlag=(@FillColor!=@TextColor)
     end
+    
+    def GetCharWidth(widths, index)
+      if index.is_a?(String)
+        widths[index.ord]
+      else
+        widths[index]
+      end
+    end
 
     def GetStringWidth(s)
         # Get width of a string in the current font
         cw=@CurrentFont['cw']
         w=0
         s.each_byte do |c|
-            w=w+cw[c]
+            w=w+GetCharWidth(cw, c)
         end
         w*@FontSize/1000.0
     end
@@ -790,7 +798,7 @@ class FPDF
                     ls=l
                     ns=ns+1
                 end
-                l=l+cw[char]
+                l=l+GetCharWidth(cw, char)
                 if l>wmax
                     # Automatic line break
                     if sep==-1
@@ -866,7 +874,7 @@ class FPDF
                 sep=i
                 ls=l
             end
-            l=l+cw[c];
+            l=l+GetCharWidth(cw, c);
             if l>wmax
                 # Automatic line break
                 if sep==-1
@@ -1159,7 +1167,7 @@ class FPDF
                 cw=font['cw']
                 s='['
                 32.upto(255) do |i|
-                    s << cw[i].to_s+' '
+                    s << GetCharWidth(cw, i).to_s + ' '
                 end
                 out(s+']')
                 out('endobj')