image_voodoo 0.8.7 → 0.8.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 709c3a00ec625b53da4d6d207acaa3f90e65bf2e
-  data.tar.gz: 5aacbf95ce98e716d1835e3f247be935e35ab8b9
+  metadata.gz: 10db8a256e32e37a28b94c9246049f7029484a49
+  data.tar.gz: 27ec82a19aff0bc3171a2c0bff8338c1c7ef19e6
 SHA512:
-  metadata.gz: 40c4daa327de23784c6b9c376057853049f5ac23a574a50a99e94cb12e5fdd2cbcc285e4578752fc00014425e900b289b6d0cdc154bca90ef9f9eb7fe748f4f3
-  data.tar.gz: 622bb1cdec6c00a93cf804a1abf12aa67da81e34d40fb179b819da7c6ef6a6f560d884f27337765175f5307341fb019a735a4bbe0e0c258ba56770d56831618b
+  metadata.gz: 9bf960b9cd108f06ea22ba69a5f01f7d5ee3ca10dec63fe7a79cf6d2fe986f9a6753ef1969c8eabfa95af8509e0b19211b6ea7c0718d6106c42d998e255e6e36
+  data.tar.gz: 27e8b1a524c25f7a72b3b15c3a9e37e4bf983111410a8be64d78b45c55ce133ed185ec5cf47ab527b565828d106515fdf053ccc41ee0298b1b1b6df75fc923f3

data/.travis.yml

@@ -0,0 +1,2 @@
+rvm:
+  - jruby-19mode

data/LICENSE-2.0.txt

@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

data/README.exif

@@ -0,0 +1,18 @@
+Copyright 2002-2012 Drew Noakes
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+More information about this project is available at:
+
+   http://drewnoakes.com/code/exif/
+   http://code.google.com/p/metadata-extractor/

data/README.md

@@ -13,6 +13,7 @@ http://github.com/jruby/image_voodoo
 * 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.
+* Now supports reading a variety of EXIF data.  This also supports new function --orient based on how phones typically save photo data.
 
 ## SYNOPSIS:
 

data/Rakefile

@@ -1,2 +1,13 @@
 require 'bundler'
+require 'rake/testtask'
 Bundler::GemHelper.install_tasks
+
+task :default => :test
+
+desc "Run tests"
+task :test do
+  Rake::TestTask.new do |t|
+    t.libs << "lib:vendor"
+    t.test_files = FileList['test/test*.rb']
+  end
+end

data/bin/image_voodoo

@@ -2,6 +2,7 @@
 
 require 'optparse'
 
+headless = true
 actions = []
 images = []
 original_image = nil
@@ -59,14 +60,33 @@ opts = OptionParser.new do |opts|
     actions << lambda {|img| img.flip_horizontally }
   end
 
+  opts.on("-m", "--metadata") do
+    actions << lambda {|img| puts img.metadata }
+  end
+
   opts.on("-n", "--negative", "Make a negative out of the image") do
     actions << lambda {|img| img.negative }
   end
 
+  opts.on("-o", "--orient", "Rotate image to orient it based on metadata") do
+    actions << lambda {|img| img.correct_orientation }
+  end
+
   opts.on("-q", "--quality 0..1", Float, "Set % of quality for lossy compression") do |quality|
     actions << lambda {|img| img.quality(quality) }
   end
 
+  opts.on("-R", "--rotate 0..360", Float, "Set angle to rotate image") do |angle|
+    actions << lambda {|img| img.rotate(angle.to_f) }
+  end
+
+  opts.on("-r", "--resize WIDTHxHEIGHT", "Create a new image with the specified", "dimensions") do |dim|
+    width, height = dim.split(/x/i).map {|v| v.to_i}
+    opts.usage "You need to specify proper dimensions" unless width && width > 0 && height && height > 0
+    actions << lambda {|img| img.resize(width,height) }
+  end
+
+
   opts.on("-s", "--save FILENAME", "Save the results to a new file") do |f|
     actions << lambda {|img| img.save(f); img }
   end
@@ -81,6 +101,8 @@ opts = OptionParser.new do |opts|
 
   opts.on("-p", "--preview", "Preview the image. Close the frame window",
     "to continue, or quit the application to", "abort the action pipeline") do
+
+    headless = false
     actions << lambda do |img|
       done = false
       img.preview { done = true }
@@ -97,12 +119,6 @@ opts = OptionParser.new do |opts|
     actions << lambda {|img| images.pop || original_image }
   end
 
-  opts.on("-r", "--resize WIDTHxHEIGHT", "Create a new image with the specified", "dimensions") do |dim|
-    width, height = dim.split(/x/i).map {|v| v.to_i}
-    opts.usage "You need to specify proper dimensions" unless width && width > 0 && height && height > 0
-    actions << lambda {|img| img.resize(width,height) }
-  end
-
   opts.on("-f", "--format", "Print the image format") do
     actions << lambda {|img| puts img.format; img }
   end
@@ -122,6 +138,10 @@ opts.parse!(ARGV)
 opts.usage("You need to supply a source image filename.") unless ARGV.first
 opts.usage("You need to supply one or more actions.") unless actions.size > 0
 
+# For this binstub we only want to load non-headless if we are using
+# the preview feature. top of See lib/image_voodoo.rb for more info...
+class ImageVoodoo; NEEDS_HEAD = true; end unless headless
+
 require 'image_voodoo'
 file_name = ARGV.first
 method = file_name =~ /^http:/ ? :from_url : :with_image

data/lib/image_voodoo.rb

@@ -1,3 +1,12 @@
+# Before we load image_voodoo we can specify whether we want it to load full
+# AWT ala http://www.oracle.com/technetwork/articles/javase/headless-136834.html
+# Most users are using image_voodoo as a library for manipulation and do not
+# want a full peer window popping up.
+unless defined? ImageVoodoo::NEEDS_HEAD
+  java.lang.System.set_property 'java.awt.headless', 'true'
+end
+  
+
 ##
 #
 # = ImageVoodoo
@@ -44,9 +53,8 @@ class ImageVoodoo
      require 'image_voodoo/awt'
   end
 
-  def initialize(src, format=nil)
-    @src = src
-    @format = format
+  def initialize(io, src, format=nil)
+    @io, @src, @format = io, src, format
     @quality = nil # nil means no specific quality ever specified
   end
 
@@ -82,6 +90,17 @@ class ImageVoodoo
     String.from_java_bytes java_bytes
   end
 
+  ##
+  # If current image was taken by a phone it might save the orientation
+  # in format it was physically taken and added IFD0 Orientation information
+  # instead of rotating it.  This method will perform that rotation based
+  # on Orientation metadata.
+  #
+  def correct_orientation
+    target = guard { correct_orientation_impl }
+    block_given? ? yield(target) : target
+  end
+
   ##
   #
   # Creates a square thumbnail of the image cropping the longest edge to
@@ -124,6 +143,14 @@ class ImageVoodoo
   end
   alias_method :grayscale, :greyscale
 
+  ##
+  #
+  # Extracts metadata from an image.
+  #
+  def metadata
+    guard { metadata_impl }
+  end
+
   ##
   #
   # Creates a negative and yields/returns the new image.
@@ -159,6 +186,15 @@ class ImageVoodoo
     raise ArgumentError, ne.message
   end
 
+  ##
+  #
+  # Rotates the image by angle (specified in degrees).
+  #
+  def rotate(angle)
+    target = guard { rotate_impl(angle) }
+    block_given? ? yield(target) : target
+  end
+
   ##
   #
   # Saves the image out to path. Changing the file extension will convert
@@ -208,7 +244,7 @@ class ImageVoodoo
   # A top-level image loader opens path and then yields/returns the image.
   #
   def self.with_image(path)
-    raise ArgumentError, "file does not exist" unless File.file?(path)
+    raise ArgumentError, "file does not exist: #{path}" unless File.file?(path)
     image = guard { with_image_impl(JFile.new(path)) }
     image && block_given? ? yield(image) : image
   end

data/lib/image_voodoo/awt.rb

@@ -20,10 +20,6 @@ class ImageVoodoo
   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
   ##
   #
@@ -105,7 +101,7 @@ class ImageVoodoo
   def paint(src=dup_src)
     yield src.graphics
     src.graphics.dispose
-    ImageVoodoo.new(src, @format)
+    ImageVoodoo.new(@io, src, @format)
   end
 
   ##
@@ -132,7 +128,7 @@ class ImageVoodoo
   # *AWT* Create an image of width x height filled with a single color.
   #
   def self.canvas(width, height, rgb='000000')
-    image = ImageVoodoo.new(BufferedImage.new(width, height, ARGB))
+    image = ImageVoodoo.new(@io, BufferedImage.new(width, height, ARGB))
     image.rect(0, 0, width, height, rgb)
   end
 
@@ -147,15 +143,18 @@ class ImageVoodoo
   def self.with_image_impl(file)
     format = detect_format_from_input(file)
     buffered_image = read_image_from_input(file)
-    buffered_image ? ImageVoodoo.new(buffered_image, format) : nil
+    buffered_image ? ImageVoodoo.new(file, 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)
+    ImageIO.read(input)
+  rescue IIOException
+    require 'CMYKDemo.jar'
+
+    cmyk_spi = org.monte.media.jpeg.CMYKJPEGImageReaderSpi.new
+    cmyk_reader = org.monte.media.jpeg.CMYKJPEGImageReader.new cmyk_spi
+    cmyk_reader.input = ImageIO.createImageInputStream(input)
+    cmyk_reader.read 0
   end
 
   def self.detect_format_from_input(input)
@@ -168,7 +167,9 @@ class ImageVoodoo
     input_stream = ByteArrayInputStream.new(bytes)
     format = detect_format_from_input(input_stream)
     input_stream.reset
-    ImageVoodoo.new(read_image_from_input(input_stream), format)
+    buffered_image = read_image_from_input(input_stream)
+    input_stream.reset
+    ImageVoodoo.new(input_stream, buffered_image, format)
   end
 
   #
@@ -229,6 +230,27 @@ class ImageVoodoo
     out.to_byte_array
   end
 
+  def correct_orientation_impl
+    case metadata.orientation
+    when 2 then
+      flip_horizontally
+    when 3 then
+      rotate 180
+    when 4 then
+      flip_vertically
+    when 5 then
+      flip_horizontally
+      rotate 270
+    when 6 then
+      rotate 90
+    when 7 then
+      flip_horizontally
+      rotate 270
+    else
+      self
+    end
+  end
+
   def flip_horizontally_impl
     paint {|g| g.draw_image @src, 0, 0, width, height, width, 0, 0, height, nil}
   end
@@ -241,6 +263,12 @@ class ImageVoodoo
     transform(GREY_OP)
   end
 
+  def metadata_impl
+    require 'image_voodoo/metadata'
+    
+    @metadata ||= ImageVoodoo::Metadata.new(@io)
+  end
+
   def negative_impl
     transform(NEGATIVE_OP)
   end
@@ -252,6 +280,21 @@ class ImageVoodoo
     end
   end
 
+  def rotate_impl(degrees)
+    radians = degrees * Math::PI / 180
+    sin, cos = Math.sin(radians).abs, Math.cos(radians).abs
+    new_width = (width * cos + height * sin).floor
+    new_height = (width * sin + height * cos).floor
+
+    paint(BufferedImage.new(new_width, new_height, color_type)) do |g|
+      
+      g.java_send :translate, [::Java::int, ::Java::int],
+                  (new_width - width)/2, (new_height - height)/2
+      g.rotate(radians, width / 2, height / 2);
+      g.draw_image @src, 0, 0, nil
+    end
+  end
+
   #
   # Save using the format string (jpg, gif, etc..) to the open Java File
   # instance passed in.
@@ -261,7 +304,7 @@ class ImageVoodoo
   end
 
   def with_crop_impl(left, top, right, bottom)
-    ImageVoodoo.new(@src.get_subimage(left, top, right-left, bottom-top), @format)
+    ImageVoodoo.new(@io, @src.get_subimage(left, top, right-left, bottom-top), @format)
   end
 
   def write_new_image(format, stream)