Merged r11527 from trunk to 2.3-stable (#13338, #13329)

Ruby2.0: remove "warning: class variable access from toplevel" in lib/plugins/rfpdf/lib/tcpdf.rb.

Contributed by Jun NAITOH.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11533 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2013-03-03 12:10:48 +00:00
parent 58ebb87ae6
commit 4100d3beeb
1 changed files with 3 additions and 3 deletions

View File

@ -39,9 +39,6 @@ require 'core/rmagick'
# @package com.tecnick.tcpdf # @package com.tecnick.tcpdf
# #
@@version = "1.53.0.TC031"
@@fpdf_charwidths = {}
PDF_PRODUCER = 'TCPDF via RFPDF 1.53.0.TC031 (http://tcpdf.sourceforge.net)' PDF_PRODUCER = 'TCPDF via RFPDF 1.53.0.TC031 (http://tcpdf.sourceforge.net)'
module TCPDFFontDescriptor module TCPDFFontDescriptor
@ -79,6 +76,9 @@ class TCPDF
Rails.logger Rails.logger
end end
@@version = "1.53.0.TC031"
@@fpdf_charwidths = {}
cattr_accessor :k_cell_height_ratio cattr_accessor :k_cell_height_ratio
@@k_cell_height_ratio = 1.25 @@k_cell_height_ratio = 1.25