rbpdf 1.18.0 → 1.18.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ccebb276b977433e745a1d90ff80ea4f1fce31b3
-  data.tar.gz: bda1035faa902f9c7c5c60001593abb1c6af5bba
+  metadata.gz: c1933519745cfcf8ecb037bbb90abd2756ce438c
+  data.tar.gz: 23af83ebf1ab6d77a7f64e62f5225cda74d418ed
 SHA512:
-  metadata.gz: 7a209d6d416f3d2030f1e321e959e559ee4485f5348c05133d0373c1b8ff4c8288e3f4d31f9a3bc53491df5244b92d5e50d6d6171749ea26c8dfcf8f85ea845b
-  data.tar.gz: 5295a9118dbda7b36f1d2f442bb8a6f2f3b365b1bf08088c5cbed725b920200dd9d0e15fea1ee1139f7c3d82cf8138d00cdc6f19da24ee60223ea9be66d81ccd
+  metadata.gz: f4da9bb136d4fb89cecd8bb9ac0d3c9c617ffe0dc2110e3883b09fb43b36121cae886f2c1a14826042afb5d0997b09fdbce90a6bc06f8c73602de8b8587417a9
+  data.tar.gz: ffaf67be7f514e66fdce7ac8ac7730627709296c00624747c27b0f0141776029faeadc581a50216779efe8ea798894370e991c17ededbd90ba43556921db52af

data/CHANGELOG

@@ -1,3 +1,9 @@
+1.18.1 2014-09-15 
+       - ImagePngAlpha function fixed for the error case where an alpha channel cannot be deleted.
+       - getimagesize function fixed for MAC OS rmagick.
+       - getimagesize function fixed for grayscale JPEG Image.
+       - 16-bit PNG with alpha channel image support improved. (use RMagick liblary)
+
 1.18.0 2014-08-16 
        - rfpdf product name and TCPDF class name changed to RBPDF.
        - ImagePngAlpha function added.

data/lib/core/rmagick.rb

@@ -38,6 +38,9 @@ module Rbpdf
         return false if (f.read(4)!='IHDR')
         out[0] = freadint(f)
         out[1] = freadint(f)
+        out[2] = 'PNG'
+        out[3] = "height=\"#{out[1]}\" width=\"#{out[0]}\""
+        out['mime'] = 'image/png'
       end
 
       return out
@@ -69,12 +72,17 @@ module Rbpdf
     
     # This needs work to cover more situations
     # I can't see how to just list the number of channels with ImageMagick / rmagick
-    if image.colorspace.to_s == "CMYKColorspace"
-        out['channels'] = 4
-    elsif (image.colorspace.to_s == "RGBColorspace") and (image.image_type.to_s != "GrayscaleType")
-      out['channels'] = 3
-    else
-      out['channels'] = 0
+    case image.colorspace.to_s.downcase
+    when 'cmykcolorspace'
+      out['channels'] = 4
+    when 'rgbcolorspace', 'srgbcolorspace' # Mac OS X : sRGBColorspace
+      if image.image_type.to_s == 'GrayscaleType' and image.class_type.to_s == 'PseudoClass'
+        out['channels'] = 0
+      else
+        out['channels'] = 3
+      end
+    when 'graycolorspace'
+        out['channels'] = 0
     end
 
     out['bits'] = image.channel_depth

data/lib/rbpdf.rb

@@ -4857,8 +4857,10 @@ class RBPDF
           info=parsepng(file);
         elsif (type == 'gif')
           tmpFile = imageToPNG(file)
-          info=parsepng(tmpFile.path)
-          tmpFile.delete
+          if tmpFile != false
+            info=parsepng(tmpFile.path)
+            tmpFile.delete
+          end
         else
           #Allow for additional formats
           mtd='parse' + type;
@@ -4867,8 +4869,11 @@ class RBPDF
           end
           info=send(mtd, file);
         end
-        if info == 'pngalpha' and Object.const_defined?(:Magick)
-          return ImagePngAlpha(file, x, y, w, h, 'PNG', link, align, resize, dpi, palign)
+        if info == 'pngalpha' and ismask == false and Object.const_defined?(:Magick)
+          info = ImagePngAlpha(file, x, y, w, h, 'PNG', link, align, resize, dpi, palign)
+          if false != info
+            return
+          end
         end
       end
       if !info
@@ -5017,7 +5022,12 @@ class RBPDF
   def imageToPNG(file)
     img = Magick::ImageList.new(file)
     img.format = 'PNG'       # convert to PNG from gif 
-    img.opacity = 0          # PNG alpha channel delete
+    if img.alpha? 
+      img.opacity = 0          # PNG alpha channel delete
+      if img.alpha? 
+        return false
+      end
+    end
 
     #use a temporary file....
     tmpFile = Tempfile.new(['', '_' + File::basename(file) + '.png'], @@k_path_cache);
@@ -5063,13 +5073,6 @@ class RBPDF
     w=freadint(f);
     h=freadint(f);
     bpc=f.read(1).unpack('C')[0]
-    if (bpc>8)
-      if Object.const_defined?(:Magick)
-        return false
-      else
-        Error('No RMagick: 16-bit depth not supported: ' + file)
-      end
-    end
 
     ct=f.read(1).unpack('C')[0]
     if (ct==0)
@@ -5094,6 +5097,15 @@ class RBPDF
       # Error('Unknown filter method: ' + file)
       return false
     end
+
+    if (bpc>8)
+      if Object.const_defined?(:Magick)
+        return false
+      else
+        Error('No RMagick: 16-bit depth not supported: ' + file)
+      end
+    end
+
     if (f.read(1).unpack('C')[0]!=0)
       # Error('Interlacing not supported: ' + file)
       return false
@@ -5121,7 +5133,7 @@ class RBPDF
         else
           pos=t.include?(0.chr);
           if (pos!=false)
-            trns = [pos]
+            trns = ['1']
           end
         end
         f.read(4);
@@ -5189,8 +5201,12 @@ class RBPDF
   # [@see] Image()
   #
   def ImagePngAlpha(file, x='', y='', w=0, h=0, type='', link='', align='', resize=false, dpi=300, palign='')
-    tempfile_alpha = image_alpha_mask(file)
     tempfile_plain = imageToPNG(file)
+    if tempfile_plain == false
+      return false
+    end
+
+    tempfile_alpha = image_alpha_mask(file)
 
     # embed mask image
     imgmask = Image(tempfile_alpha.path, x, y, w, h, 'PNG', '', '', resize, dpi, '', true, false)
@@ -6855,7 +6871,7 @@ protected
       if (!info['trns'].nil? and info['trns'].kind_of?(Array))
         trns='';
         count_info = info['trns'].length
-        0.upto(count_info) do |i|
+        count_info.times do |i|
           trns << info['trns'][i] + ' ' + info['trns'][i] + ' ';
         end
         out << ' /Mask [' + trns + ']'

data/lib/rbpdf/version.rb

@@ -1,3 +1,3 @@
 module Rbpdf
-  VERSION = "1.18.0"
+  VERSION = "1.18.1"
 end

data/test/rbpdf_image_rmagick_test.rb

@@ -0,0 +1,260 @@
+require 'test_helper'
+
+class RbpdfTest < ActiveSupport::TestCase
+
+  class MYPDF < RBPDF
+    def imageToPNG(file)
+      super
+    end
+    def parsepng(file)
+      super
+    end
+  end
+
+  test "image getimagesize PNG test" do
+    pdf = RBPDF.new
+    pdf.add_page
+    img_file = File.join(File.dirname(__FILE__), 'logo_rbpdf_8bit.png')
+
+    info = pdf.getimagesize(img_file)
+    pixw = info[0]
+    pixh = info[1]
+    fileinfo = info[2]
+    assert_equal info[0], 240                       # width
+    assert_equal info[1], 89                        # height
+    assert_equal info[2], 'PNG'                     # Image Type
+    assert_equal info[3], 'height="89" width="240"'
+    assert_equal info['mime'], 'image/png'
+  end
+
+  test "image getimagesize GIF test" do
+    return unless Object.const_defined?(:Magick)
+
+    pdf = RBPDF.new
+    pdf.add_page
+    img_file = File.join(File.dirname(__FILE__), 'logo_rbpdf_8bit.gif')
+
+    info = pdf.getimagesize(img_file)
+    pixw = info[0]
+    pixh = info[1]
+    fileinfo = info[2]
+    assert_equal info[0], 240                       # width
+    assert_equal info[1], 89                        # height
+    assert_equal info[2], 'GIF'                     # Image Type
+    assert_equal info[3], 'height="89" width="240"'
+    assert_equal info['mime'], 'image/gif'
+    assert_equal info['channels'], 3                # RGB
+    assert_equal info['bits'], 8                    # depth
+  end
+
+  test "image getimagesize GIF alpha test" do
+    return unless Object.const_defined?(:Magick)
+
+    pdf = RBPDF.new
+    pdf.add_page
+    img_file = File.join(File.dirname(__FILE__), 'logo_rbpdf_8bit_alpha.gif')
+
+    info = pdf.getimagesize(img_file)
+    pixw = info[0]
+    pixh = info[1]
+    fileinfo = info[2]
+    assert_equal info[0], 240                       # width
+    assert_equal info[1], 89                        # height
+    assert_equal info[2], 'GIF'                     # Image Type
+    assert_equal info[3], 'height="89" width="240"'
+    assert_equal info['mime'], 'image/gif'
+    assert_equal info['channels'], 3                # RGB
+    assert_equal info['bits'], 8                    # depth
+  end
+
+  test "image getimagesize JPEG RGB test" do
+    return unless Object.const_defined?(:Magick)
+
+    pdf = RBPDF.new
+    pdf.add_page
+    img_file = File.join(File.dirname(__FILE__), 'logo_rbpdf_8bit.jpg')
+
+    info = pdf.getimagesize(img_file)
+    pixw = info[0]
+    pixh = info[1]
+    fileinfo = info[2]
+    assert_equal info[0], 240                       # width
+    assert_equal info[1], 89                        # height
+    assert_equal info[2], 'JPEG'                    # Image Type
+    assert_equal info[3], 'height="89" width="240"'
+    assert_equal info['mime'], 'image/jpeg'
+    assert_equal info['channels'], 3                # RGB
+    assert_equal info['bits'], 8                    # depth
+  end
+
+  test "image getimagesize JPEG monotone RGB test" do
+    return unless Object.const_defined?(:Magick)
+
+    pdf = RBPDF.new
+    pdf.add_page
+    img_file = File.join(File.dirname(__FILE__), 'logo_rbpdf_mono_rgb.jpg')
+
+    info = pdf.getimagesize(img_file)
+    pixw = info[0]
+    pixh = info[1]
+    fileinfo = info[2]
+    assert_equal info[0], 240                       # width
+    assert_equal info[1], 89                        # height
+    assert_equal info[2], 'JPEG'                    # Image Type
+    assert_equal info[3], 'height="89" width="240"'
+    assert_equal info['mime'], 'image/jpeg'
+    assert_equal info['channels'], 3                # RGB
+    assert_equal info['bits'], 8                    # depth
+  end
+
+  test "image getimagesize JPEG monotone Gray test" do
+    return unless Object.const_defined?(:Magick)
+
+    pdf = RBPDF.new
+    pdf.add_page
+    img_file = File.join(File.dirname(__FILE__), 'logo_rbpdf_mono_gray.jpg')
+
+    info = pdf.getimagesize(img_file)
+    pixw = info[0]
+    pixh = info[1]
+    fileinfo = info[2]
+    assert_equal info[0], 240                       # width
+    assert_equal info[1], 89                        # height
+    assert_equal info[2], 'JPEG'                    # Image Type
+    assert_equal info[3], 'height="89" width="240"'
+    assert_equal info['mime'], 'image/jpeg'
+    assert_equal info['channels'], 0                # Gray
+    assert_equal info['bits'], 8                    # depth
+  end
+
+  test "image getimagesize PNG monotone test" do
+    pdf = RBPDF.new
+    pdf.add_page
+    img_file = File.join(File.dirname(__FILE__), 'logo_rbpdf_mono_rgb.png')
+
+    info = pdf.getimagesize(img_file)
+    pixw = info[0]
+    pixh = info[1]
+    fileinfo = info[2]
+    assert_equal info[0], 240                       # width
+    assert_equal info[1], 89                        # height
+    assert_equal info[2], 'PNG'                     # Image Type
+    assert_equal info[3], 'height="89" width="240"'
+    assert_equal info['mime'], 'image/png'
+  end
+
+  test "imageToPNG delete GIF test" do
+    pdf = MYPDF.new
+    pdf.add_page
+    img_file = File.join(File.dirname(__FILE__), 'logo_rbpdf_8bit.gif')
+
+    if Object.const_defined?(:Magick)
+      tempfile = pdf.imageToPNG(img_file)
+      assert_not_equal tempfile, false
+
+      info = pdf.parsepng(tempfile.path)
+
+      assert_not_equal info, 'pngalpha'
+      assert_equal info['bpc'], 8
+      assert_equal info['cs'], 'Indexed'
+    end
+  end
+
+  test "imageToPNG delete GIF alpha channel test" do
+    pdf = MYPDF.new
+    pdf.add_page
+    img_file = File.join(File.dirname(__FILE__), 'logo_rbpdf_8bit_alpha.gif')
+
+    if Object.const_defined?(:Magick)
+      tempfile = pdf.imageToPNG(img_file)
+      assert_not_equal tempfile, false
+
+      info = pdf.parsepng(tempfile.path)
+
+      assert_not_equal info, 'pngalpha'
+      assert_equal info['bpc'], 8
+      assert_equal info['cs'], 'Indexed'
+    end
+  end
+
+  test "imageToPNG delete PNG alpha channel test" do
+    pdf = MYPDF.new
+    pdf.add_page
+    img_file = File.join(File.dirname(__FILE__), 'png_test_alpha.png')
+
+    if Object.const_defined?(:Magick)
+      tempfile = pdf.imageToPNG(img_file)
+      assert_not_equal tempfile, false
+
+      info = pdf.parsepng(tempfile.path)
+
+      assert_not_equal info, 'pngalpha'
+      assert_equal info['bpc'], 8
+      assert_equal info['cs'], 'DeviceRGB'
+    end
+  end
+
+  test "image_alpha_mask DeviceGray test" do
+    pdf = MYPDF.new
+    pdf.add_page
+    img_file = File.join(File.dirname(__FILE__), 'png_test_alpha.png')
+
+    if Object.const_defined?(:Magick)
+      tempfile = pdf.image_alpha_mask(img_file)
+
+      info = pdf.parsepng(tempfile.path)
+
+      assert_not_equal info, 'pngalpha'
+      assert_equal info['bpc'], 8
+      assert_equal info['cs'], 'DeviceGray'
+    end
+  end
+
+  test "Image PNG test" do
+    pdf = RBPDF.new
+    pdf.add_page
+    img_file = File.join(File.dirname(__FILE__), 'logo_rbpdf_8bit.png')
+    info = pdf.image(img_file, 10, 10, 100, '', '', 'https://rubygems.org/gems/rbpdf', '', false, 300)
+    assert_equal info, 1
+  end
+
+  test "Image PNG alpha test" do
+    return unless Object.const_defined?(:Magick)
+
+    pdf = RBPDF.new
+    pdf.add_page
+    img_file = File.join(File.dirname(__FILE__), 'png_test_alpha.png')
+    info = pdf.image(img_file, 10, 10, 100, '', '', 'https://rubygems.org/gems/rbpdf', '', false, 300)
+    assert_equal info, nil
+  end
+
+  test "Image GIF test" do
+    return unless Object.const_defined?(:Magick)
+
+    pdf = RBPDF.new
+    pdf.add_page
+    img_file = File.join(File.dirname(__FILE__), 'logo_rbpdf_8bit.gif')
+    info = pdf.image(img_file, 10, 10, 100, '', '', 'https://rubygems.org/gems/rbpdf', '', false, 300)
+    assert_equal info, 1
+  end
+
+  test "Image GIF alpha test" do
+    return unless Object.const_defined?(:Magick)
+
+    pdf = RBPDF.new
+    pdf.add_page
+    img_file = File.join(File.dirname(__FILE__), 'logo_rbpdf_8bit_alpha.gif')
+    info = pdf.image(img_file, 10, 10, 100, '', '', 'https://rubygems.org/gems/rbpdf', '', false, 300)
+    assert_equal info, 1
+  end
+
+  test "Image JPEG test" do
+    return unless Object.const_defined?(:Magick)
+
+    pdf = RBPDF.new
+    pdf.add_page
+    img_file = File.join(File.dirname(__FILE__), 'logo_rbpdf_8bit.jpg')
+    info = pdf.image(img_file, 10, 10, 100, '', '', 'https://rubygems.org/gems/rbpdf', '', false, 300)
+    assert_equal info, 1
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbpdf
 version: !ruby/object:Gem::Version
-  version: 1.18.0
+  version: 1.18.1
 platform: ruby
 authors:
 - NAITOH Jun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-17 00:00:00.000000000 Z
+date: 2014-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -143,6 +143,17 @@ files:
 - lib/unicode_data.rb
 - logo_example.png
 - rbpdf.gemspec
+- test/logo_rbpdf_8bit.gif
+- test/logo_rbpdf_8bit.jpg
+- test/logo_rbpdf_8bit.png
+- test/logo_rbpdf_8bit_alpha.gif
+- test/logo_rbpdf_mono_gray.jpg
+- test/logo_rbpdf_mono_gray.png
+- test/logo_rbpdf_mono_rgb.jpg
+- test/logo_rbpdf_mono_rgb.png
+- test/png_test_alpha.png
+- test/png_test_msk_alpha.png
+- test/png_test_non_alpha.png
 - test/rbpdf_bidi_test.rb
 - test/rbpdf_bookmark_test.rb
 - test/rbpdf_cell_test.rb
@@ -156,6 +167,7 @@ files:
 - test/rbpdf_func_test.rb
 - test/rbpdf_html_test.rb
 - test/rbpdf_htmlcell_test.rb
+- test/rbpdf_image_rmagick_test.rb
 - test/rbpdf_image_test.rb
 - test/rbpdf_test.rb
 - test/rbpdf_transaction_test.rb
@@ -195,6 +207,17 @@ signing_key:
 specification_version: 4
 summary: RBPDF via TCPDF.
 test_files:
+- test/logo_rbpdf_8bit.gif
+- test/logo_rbpdf_8bit.jpg
+- test/logo_rbpdf_8bit.png
+- test/logo_rbpdf_8bit_alpha.gif
+- test/logo_rbpdf_mono_gray.jpg
+- test/logo_rbpdf_mono_gray.png
+- test/logo_rbpdf_mono_rgb.jpg
+- test/logo_rbpdf_mono_rgb.png
+- test/png_test_alpha.png
+- test/png_test_msk_alpha.png
+- test/png_test_non_alpha.png
 - test/rbpdf_bidi_test.rb
 - test/rbpdf_bookmark_test.rb
 - test/rbpdf_cell_test.rb
@@ -208,6 +231,7 @@ test_files:
 - test/rbpdf_func_test.rb
 - test/rbpdf_html_test.rb
 - test/rbpdf_htmlcell_test.rb
+- test/rbpdf_image_rmagick_test.rb
 - test/rbpdf_image_test.rb
 - test/rbpdf_test.rb
 - test/rbpdf_transaction_test.rb