image_voodoo 0.8.5 → 0.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9c58e8e0f8b9c9388e30b313dc18e6cc3b9bea0
-  data.tar.gz: bcf41a5a7f38c576b3c95323ca0e486e3288223a
+  metadata.gz: 05fad5e0d03bf3bb9b5e00e891cf42195a2da7e5
+  data.tar.gz: 690d86a449b4ba579d1c1c75c3690a9ec6020934
 SHA512:
-  metadata.gz: 0e6ea0d28e142e9092454ea8e40ab5d87c8a099924611423660e8c496802854df38c5c7b403512d20a9039a6addd14178f0076819af09b1e59cdfafd6dbabe77
-  data.tar.gz: dee71d6424b06ae4fd2f19557ad4374eb8edc6763c7425a47c9b347d742c8c16dd6b421309310942c40d6def9c6ab208c5099e03cd1759ce467ccec314a8e01c
+  metadata.gz: ca9c398db76f6a2c0fe1f85e072f18bae35d045d707d6ba7e0acb96c9fbe0c9687d9096b9958fb16bb7f221525b0ffcbdc6fb554f8edfb04b5b6a62cadd4d93e
+  data.tar.gz: 72fa3952dd8f9e828cefdfbc5079ada1979b4be5a1ef65f758e37b82af8403e753464ad4504b825986fe76e8c4211d0f1193105650e654bb813469e9bf9ae26d

data/README.md

@@ -11,6 +11,8 @@ http://github.com/jruby/image_voodoo
 
 * Uses java.awt and javax.image APIs native to Java to perform image manipulation; no other dependencies needed.
 * Includes image_voodoo command-line utility for quick resizing of images, "image_voodoo --help" for usage.
+* Due to lack of TIFF support in ImageIO it is also not supported yet by image_voodoo. If you need it, create an issue in GitHub.
+* **JPEG CMYK support** is thanks to work of Werner Randelshofer and [Monte Media Library](http://www.randelshofer.ch/monte/). Monte Media Library is provided under [CC BY 3.0](http://creativecommons.org/licenses/by/3.0/) license.
 
 ## SYNOPSIS:
 

data/image_voodoo.gemspec

@@ -17,6 +17,6 @@ Gem::Specification.new do |s|
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
+  s.require_paths = ["lib", "vendor"]
   s.has_rdoc      = true
 end

data/lib/image_voodoo/awt.rb

@@ -18,6 +18,11 @@ class ImageVoodoo
   java_import javax.imageio.ImageWriteParam
   java_import javax.imageio.stream.FileImageOutputStream
   java_import javax.swing.JFrame
+  java_import javax.imageio.IIOException
+
+  require 'CMYKDemo.jar'
+  java_import org.monte.media.jpeg.CMYKJPEGImageReader
+  java_import org.monte.media.jpeg.CMYKJPEGImageReaderSpi
 
   # FIXME: Move and rewrite in terms of new shape
   ##
@@ -141,10 +146,18 @@ class ImageVoodoo
 
   def self.with_image_impl(file)
     format = detect_format_from_input(file)
-    buffered_image = ImageIO.read(file)
+    buffered_image = read_image_from_input(file)
     buffered_image ? ImageVoodoo.new(buffered_image, format) : nil
   end
 
+  def self.read_image_from_input(input)
+      ImageIO.read(input)
+    rescue IIOException
+      cmyk_reader = CMYKJPEGImageReader.new(CMYKJPEGImageReaderSpi.new)
+      cmyk_reader.setInput(ImageIO.createImageInputStream(input))
+      cmyk_reader.read(0)
+  end
+
   def self.detect_format_from_input(input)
     stream = ImageIO.createImageInputStream(input)
     readers = ImageIO.getImageReaders(stream)
@@ -154,7 +167,8 @@ class ImageVoodoo
   def self.with_bytes_impl(bytes)
     input_stream = ByteArrayInputStream.new(bytes)
     format = detect_format_from_input(input_stream)
-    ImageVoodoo.new(ImageIO.read(input_stream), format)
+    input_stream.reset
+    ImageVoodoo.new(read_image_from_input(input_stream), format)
   end
 
   #

data/lib/image_voodoo/version.rb

@@ -1,3 +1,3 @@
 class ImageVoodoo
-  VERSION = "0.8.5"
+  VERSION = "0.8.6"
 end

data/test/test_image_science.rb

@@ -142,6 +142,7 @@ class TestImageScience < Test::Unit::TestCase
       bytes_string = img.bytes('JPEG')
       image = ImageScience.with_bytes(bytes_string)
       assert_equal 'JPEG', image.format
+      assert image.to_java.is_a?(java.awt.image.BufferedImage), "JAVA representation of image should be a BufferedImage instance"
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: image_voodoo
 version: !ruby/object:Gem::Version
-  version: 0.8.5
+  version: 0.8.6
 platform: ruby
 authors:
 - Thomas E. Enebo, Charles Nutter, Nick Sieger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-26 00:00:00.000000000 Z
+date: 2014-08-27 00:00:00.000000000 Z
 dependencies: []
 description: Image manipulation in JRuby with ImageScience compatible API
 email: tom.enebo@gmail.com
@@ -42,6 +42,7 @@ files:
 - samples/lossy.rb
 - test/pix.png
 - test/test_image_science.rb
+- vendor/CMYKDemo.jar
 homepage: http://github.com/jruby/image_voodoo
 licenses: []
 metadata: {}
@@ -49,6 +50,7 @@ post_install_message:
 rdoc_options: []
 require_paths:
 - lib
+- vendor
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="