sobakasu-image_science 1.1.3

data/History.txt

@@ -0,0 +1,39 @@
+== 1.1.3 2010-02-24
+
+* fixed call to FreeImage_Rotate() (used in newer versions of FreeImage)
+
+== 1.1.2 / 2010-02-12
+
+* added bin/image_science script.
+* added buffer() method to get image data as a string.
+* crop(), with_crop(), resize(), thumbnail(), cropped_thumbnail() can now all be called without providing a block (modifies the image in-place).
+* resize() now accepts optional filter (see FreeImage::ImageFilters).
+* image_type() can now be called as an instance method.
+* added bmp, tiff, xpm files to test suite.
+* added support for ImageScience.new (takes filename or data)
+* added flip_horizontal, flip_vertical, rotate methods
+* added support for load/save flags to new() and buffer().
+* added set_pixel_color method
+* added fit_within method
+
+== 1.1.1 / 2010-02-06
+
+* merged changes from scambra/master (depth, colorspace, image_type, colortype, file_type methods)
+* reinstated lib/image_science.rb for methods implemented in ruby, c extension 
+is now named image_science_ext
+* added histogram, invert, adjust_contrast, adjust_brightness, adjust_gamma
+* fixed up rdoc
+* defines various FreeImage constants
+* generate ext/image_science_ext.c from ext/image_science_ext.c.in
+
+== 1.1.0 / 2010-02-05
+
+* converted to use extconf (removed ruby-inline)
+* converted tests to rspec
+* added tests for different file types (gif, png, jpg)
+
+== 1.0.0 / 2010-01-14
+
+* Fork of seattlerb/image_science
+* added get_pixel_color method 
+* build using LDFLAGS from rbconfig.rb

data/History.txt.orig

@@ -0,0 +1,77 @@
+=== 1.2.1 / 2009-08-14
+
+* 2 minor enhancements:
+
+  * Added luis' patches to make it build properly on windows.
+  * with_image now raises on missing/bad files.
+
+== 1.2.0 / 2009-06-23
+
+* 7 minor enhancements:
+
+  *	Moved quick_thumb to bin/image_science_thumb and properly added.
+  * Added -s (square) flag to bin/image_science_thumb
+  * Added autorotating on image load. (choonkeat)
+  * Added ruby_inline to clean globs
+  * Added with_image_from_memory. (sumbach)
+  * Switched to minitest.
+  * Updated rakefile for now hoe capabilities.
+
+* 3 bug fixes:
+
+  * Check and convert to 24 BPP if save type is jpg. Caused by 32bpp png to jpg.
+  * Fixed 1.9isms
+  * Fixed BMP support. Tweaked whitespace.
+
+== 1.1.3 / 2007-05-30
+
+* 2 minor enhancements:
+
+  * Added quick_thumb as an example to look at.
+  * Error handler doesn't raise by default. Raises if $DEBUG==true.
+
+== 1.1.2 / 2007-04-18
+
+* 2 bug fixes:
+
+  * reports bad height/width values for resize
+  * explicitly removes ICC color profiles from PNGs (bug in freeimage).
+
+== 1.1.1 / 2007-03-08
+
+* 5 minor enhancements:
+
+  * Added error handler that raises with information about what went wrong.
+  * thumbnail is now pure ruby, everything now uses resize.
+  * Produces cleaner JPEG files, with a small cost to file size/speed.
+  * resize now uses Catmull-Rom spline filter for better quality.
+  * resize copies existing ICC Profile to thumbnail, producing better color.
+  * ICC Profile NOT copied for PNG as it seems to be buggy.
+
+* 1 bug fix:
+
+  * Fixed rdoc
+
+== 1.1.0 / 2007-01-05
+
+* 3 major enhancements:
+
+  * Added resize(width, height)
+  * Added save(path)
+  * All thumbnail and resize methods yield instead of saving directly.
+
+* 1 minor enhancement:
+
+  * Will now try to use FreeImage from ports if /opt/local exists.
+
+* 2 bug fixes:
+
+  * Fixed the linker issue on PPC.
+  * Rakefile will now clean the image files created by bench.rb
+
+== 1.0.0 / 2006-12-01
+
+* 1 major enhancement
+
+  * Birthday!
+

data/Manifest.txt

@@ -0,0 +1,20 @@
+Manifest.txt
+History.txt
+History.txt.orig
+Rakefile
+README.txt
+bench.rb
+ext/extconf.rb
+ext/image_science_ext.c.in
+bin/image_science
+bin/image_science_thumb
+lib/image_science.rb
+spec/spec_helper.rb
+spec/fixtures/pix2.png
+spec/fixtures/pix2.gif
+spec/fixtures/pix2.jpg
+spec/fixtures/pix.jpg
+spec/fixtures/pix.png
+spec/fixtures/pix.gif
+spec/spec.opts
+spec/image_science_spec.rb

data/README.txt

@@ -0,0 +1,73 @@
+= ImageScience
+
+* http://seattlerb.rubyforge.org/ImageScience.html
+* http://rubyforge.org/projects/seattlerb
+
+== DESCRIPTION:
+
+ImageScience is a clean and happy Ruby library that generates
+thumbnails -- and kicks the living crap out of RMagick. Oh, and it
+doesn't leak memory like a sieve. :)
+
+For more information including build steps, see http://seattlerb.rubyforge.org/
+
+== FORK
+
+This is a fork of seattlerb/image_science.
+Converted to use extconf instead of ruby-inline.
+Added many new features.
+See History.txt for the full list of changes since the fork.
+
+== FEATURES/PROBLEMS:
+
+* Glorious graphics manipulation magi... errr, SCIENCE! in less than 200 LoC!
+* Supports square and proportional thumbnails, as well as arbitrary resizes.
+* Pretty much any graphics format you could want. No really.
+
+== SYNOPSYS:
+
+  ImageScience.with_image(file) do |img|
+    img.cropped_thumbnail(100) do |thumb|
+      thumb.save "#{file}_cropped.png"
+    end
+
+    img.thumbnail(100) do |thumb|
+      thumb.save "#{file}_thumb.png"
+    end
+  end
+
+== REQUIREMENTS:
+
+* FreeImage
+* ImageScience
+
+== INSTALL:
+
+* Download and install FreeImage. See notes at url above.
+* sudo gem install -y image_science
+* see http://seattlerb.rubyforge.org/ImageScience.html for more info.
+
+== LICENSE:
+
+(The MIT License)
+
+Copyright (c) 2006-2009 Ryan Davis, Seattle.rb
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -0,0 +1,13 @@
+require 'rubygems'
+gem 'hoe'
+require 'hoe'
+
+Hoe.spec 'sobakasu-image_science' do
+  developer('Ryan Davis', 'ryand-ruby@zenspider.com')
+  developer('Andrew Williams', 'sobakasu@gmail.com')
+  clean_globs << 'blah*png' << 'images/*_thumb.*'
+  spec_extras[:extensions] = "ext/extconf.rb"
+  extra_rdoc_files << 'bin/image_science'
+end
+
+Dir['tasks/**/*.rake'].each { |t| load t }

data/bench.rb

@@ -0,0 +1,63 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+require 'benchmark'
+require 'image_science'
+
+max = (ARGV.shift || 100).to_i
+ext = ARGV.shift || "png"
+
+file = "blah_big.#{ext}"
+
+if RUBY_PLATFORM =~ /darwin/ then
+  # how fucking cool is this???
+  puts "taking screenshot for thumbnailing benchmarks"
+  system "screencapture -SC #{file}"
+else
+  abort "You need to plonk down #{file} or buy a mac"
+end unless test ?f, "#{file}"
+
+ImageScience.with_image(file.sub(/#{ext}$/, 'png')) do |img|
+  img.save(file)
+end if ext != "png"
+
+puts "# of iterations = #{max}"
+Benchmark::bm(20) do |x|
+  x.report("null_time") {
+    for i in 0..max do
+      # do nothing
+    end
+  }
+
+  x.report("cropped") {
+    for i in 0..max do
+      ImageScience.with_image(file) do |img|
+        img.cropped_thumbnail(100) do |thumb|
+          thumb.save("blah_cropped.#{ext}")
+        end
+      end
+    end
+  }
+
+  x.report("proportional") {
+    for i in 0..max do
+      ImageScience.with_image(file) do |img|
+        img.thumbnail(100) do |thumb|
+          thumb.save("blah_thumb.#{ext}")
+        end
+      end
+    end
+  }
+
+  x.report("resize") {
+    for i in 0..max do
+      ImageScience.with_image(file) do |img|
+        img.resize(200, 200) do |resize|
+          resize.save("blah_resize.#{ext}")
+        end
+      end
+    end
+  }
+end
+
+# File.unlink(*Dir["blah*#{ext}"])

data/bin/image_science

@@ -0,0 +1,221 @@
+#!/usr/bin/env ruby
+#
+# = Usage
+#
+# image_science [OPTIONS] [command] [param ...] [file]
+#
+# == Options
+#
+# -h, --help:
+#
+# show help
+#
+# -i, --input
+#
+# specify input file.
+# by default input is read from stdin.
+# if stdin is attached to a tty, the last argument is used as a filename.
+# e.g. image_science info pic.jpg
+#
+# -o, --output
+#
+# specify output file.
+# by default output is written to stdout, or a file named 'output'
+# if stdout is attached to a tty.
+#
+# -d, --debug:
+#
+# debug mode
+#
+# == Commands
+#
+# The following commands are recognised
+# 
+# * info
+# * histogram
+# * get_version
+# * resize <width> <height>
+# * crop <left> <top> <right> <bottom>
+# * get_pixel_color <x> <y>
+# * set_pixel_color <x> <y> <red> <green> <blue> [<alpha>]
+# * adjust_gamma <value>      
+# * adjust_brightness <value>
+# * adjust_contrast <value>  
+# * invert
+# * thumbnail <size>
+# * cropped_thumbnail <size>
+# * flip_vertical
+# * flip_horizontal
+# * rotate <angle> [<x_shift> <y_shift> <x_origin> <y_origin> <use_mask>]
+#
+# Refer to the ImageScience documentation for allowed value ranges.
+#
+# = Examples
+#
+#  # convert an image from one format to another
+#  > image_science -i pix.jpg -o pix.gif
+#
+#  # create a thumbnail of size 100 pixels from pix.jpg, writes to 'output':
+#  > image_science thumbnail 100 pix.jpg
+#
+#  # as above, but create a png named pix_thumb.png:
+#  > image_science thumbnail 100 pix.jpg -o pix_thumb.png
+#
+#  # resize to 200x100, increase brightness by 30%, save as png:
+#  > image_science resize 200 100 pix.jpg | image_science adjust_brightness 30 -o pix_new.png
+#
+#  # display effects of gamma adjustments on pixel color (writes to 'output'):
+#  > image_science get_pixel_color 0 0 pix.jpg | image_science adjust_gamma 0.5 | image_science get_pixel_color 0 0
+
+require 'rubygems'
+require File.dirname(__FILE__) + '/../lib/image_science'
+require 'getoptlong'
+
+ARG_SPEC = [ [ '--help', '-h', GetoptLong::NO_ARGUMENT ],
+             [ '--test', '-n', GetoptLong::NO_ARGUMENT ],
+             [ '--input', '-i', GetoptLong::REQUIRED_ARGUMENT ],
+             [ '--output', '-o', GetoptLong::REQUIRED_ARGUMENT ],
+             [ '--debug', '-d', GetoptLong::NO_ARGUMENT ],
+           ]
+
+private
+
+# parse command line arguments
+def command_line_options
+  opts = GetoptLong.new(*ARG_SPEC)
+  options = {}
+  opts.each do |opt,arg|
+    opt[0,2] = ''
+    opt = opt.to_sym
+    case opt
+    when :help
+      puts usage("[param ...]")
+      exit 0
+    else
+      options[opt] = arg ? arg : true
+    end
+  end
+  options
+end
+
+def process_data(opts)
+  if input = opts[:input]
+    method = :with_image
+  else
+    method = :with_image_from_memory
+    input = STDIN.binmode.read
+  end
+
+  output = opts[:output] || ($stdout.tty? ? "output" : nil)
+
+  ImageScience.send(method, input) do |i|
+    yield i if block_given?
+    if @changed || !$stdout.tty? || opts[:output]
+      if output
+        i.save(output)
+      else
+        $stdout.sync = true
+        print i.data
+      end
+    end
+  end
+end
+
+def usage(bonus_args = nil)
+  cmd = @command || "[command]"
+  usage = ["usage: image_science [OPTIONS]", cmd, bonus_args, "[image_file]"].
+    compact.join(" ")
+  
+  if !@command
+    re = Regexp.new('== Commands(.*?)= Examples', Regexp::MULTILINE)
+    commands = $1.gsub(/#/, '') if File.read(__FILE__).match(re)
+    usage += commands.sub(/[\n\s]+\z/, '') + "\n\n"
+  end
+  
+  usage
+end
+
+def expect_params(required, optional = [])
+  required = [required] unless required.kind_of?(Array)
+  pl = @params.length
+  
+  if (pl < required.length) || (pl > required.length + optional.length) ||
+      @params.any? { |i| i.nil? }
+    usage_str = required.join(" ")
+    usage_str += " [%s]" % optional.join(" ") unless optional.empty?
+    raise usage(usage_str)
+  end
+  (@params.length == 1) ? @params[0] : @params
+end
+
+begin
+  opts = command_line_options
+  @command, *params = ARGV
+  opts[:input] = params.pop if !opts[:input] && $stdin.tty?
+  @params = params.collect { |i| i ? i.to_f : nil }
+
+  unless @command || (opts[:input] || opts[:output])
+    puts usage("[param ...]")
+    exit 1
+  end
+
+  # Note: using warn for string output so that image data can be chained
+  # through on the command line.
+  case @command
+  when nil  # no command, just use -i and -o
+    process_data(opts)
+  when 'info'
+    process_data(opts) do |i|
+      warn <<EOM
+image type: #{i.image_type}
+dimensions: #{i.width} x #{i.height}
+colorspace: #{i.colorspace}
+     depth: #{i.depth}
+EOM
+    end
+  when 'histogram'
+    process_data(opts) { |i| warn i.histogram.inspect }
+  when 'get_version'
+    warn "FreeImage #{ImageScience.get_version}"
+  when 'resize'
+    w, h = expect_params(%W{<width> <height>})
+    process_data(opts) { |i| i.send(@command, w, h); @changed = true }
+  when 'get_pixel_color'
+    x, y = expect_params(%W{<x> <y>})
+    process_data(opts) { |i| warn i.get_pixel_color(x, y).inspect }
+  when 'set_pixel_color'
+    x, y, *rgb = expect_params(%W{<x> <y> <red> <green> <blue>}, %W{<alpha>})
+    process_data(opts) { |i| i.set_pixel_color(x, y, rgb); @changed = true }
+  when /^adjust_/
+    value = expect_params("<value>")
+    process_data(opts) { |i| i.send(@command, value); @changed = true }
+  when 'invert', 'flip_vertical', 'flip_horizontal'
+    process_data(opts) { |i| i.send(@command); @changed = true }
+  when 'thumbnail', 'cropped_thumbnail'
+    value = expect_params("<size>")
+    process_data(opts) { |i| i.send(@command, value); @changed = true }
+  when 'crop'
+    l, r, t, b = expect_params(%W{<left> <top> <right> <bottom>})
+    process_data(opts) { |i| i.crop(l, r, t, b); @changed = true }
+  when 'rotate'
+    a, *args = expect_params("<angle>", %W{<x_shift> <y_shift> <x_origin>
+                                           <y_origin> <use_mask>})
+    process_data(opts) do |i|
+      args.empty? ? i.rotate(a) : i.rotate(a, *args)
+      @changed = true
+    end
+  else
+    raise "unrecognised command '#{@command}'"
+  end
+
+rescue SystemExit
+rescue Interrupt
+  warn ""
+rescue Exception => e
+  warn "ERROR: #{e.message}"
+  if opts && opts[:debug]
+    bt = e.backtrace
+    bt = bt.join("\n") if bt.kind_of?(Array)
+    warn bt
+  end
+end

data/bin/image_science_thumb

@@ -0,0 +1,31 @@
+#!/usr/bin/env ruby
+
+$s ||= false
+
+abort "#{File.basename $0} max_length files..." unless ARGV.size > 1
+
+require 'rubygems'
+require 'image_science'
+
+max_length = ARGV.shift.to_i
+
+msg = $s ? :cropped_thumbnail : :thumbnail
+
+ARGV.each do |file|
+  begin
+    result = ImageScience.with_image file do |img|
+      begin
+        img.send(msg, max_length) do |thumb|
+          # add _thumb and switch from gif to png. Really. gif just sucks.
+          out = file.sub(/(\.[^\.]+)$/, '_thumb\1').sub(/gif$/, 'png')
+          thumb.save(out)
+        end
+      rescue => e
+        warn "Exception thumbnailing #{file}: #{e}"
+      end
+    end
+    p file => result
+  rescue => e
+    warn "Exception opening #{file}: #{e}"
+  end
+end

data/ext/extconf.rb

@@ -0,0 +1,87 @@
+require 'mkmf'
+
+# expand comments in image_science_ext.c.in and generate image_science_ext.c.
+# creates constant definitions (rb_define_const)
+def expand_constants
+
+  File.open("conftest.c", "w") { |f| f.puts "#include <FreeImage.h>" }
+  cpp = cpp_command('')
+  system "#{cpp} > confout"
+
+  constants = {}
+  headers = []
+
+  config = File.readlines("confout")
+  config.each do |include|
+    next unless include.match(/"(.*?FreeImage.h)"/)
+    filename = include.split('"')[1]
+    headers << filename
+  end
+  
+  headers.uniq!
+
+  # add typedef constants
+  config.each do |define|
+    next unless define.match(/^\s*(\w+)\s*=\s*\d/)  # typedef
+    name = $1
+    next unless name.match(/^(FIT|FICC|FIC|FIF|FILTER)_/)
+    constants[$1] ||= []
+    constants[$1] << [name]
+  end
+
+  raw_headers = headers.collect { |i| File.read(i) }.join
+  
+  # add #defined constants (load/save flags)
+  constants['FLAG'] ||= []
+  flag_defines = raw_headers.scan(/(flag constants\s*---.*?)^\/\//m)
+  flag_defines.each do |flag_data|
+    flag_data[0].split(/\n/).each do |define|
+      next unless define.match(/^\#define\s*(\w+)\s(.*?(\/\/.+)$)?/)  # #define
+      constants['FLAG'] << [$1, $3]
+    end
+  end
+
+  File.unlink("confout")
+
+  constants.keys.each { |i| constants[i].uniq! }
+
+  File.open("image_science_ext.c", "w") do |newf|
+    File.foreach("image_science_ext.c.in") do |l|
+      if l.match(/\/\* expand FreeImage constants\s+(\w+)\s+(\w+)\s*\*\//)
+        klass_name = $1
+        const_type = $2
+        const_list = constants[const_type]
+        unless const_list
+          puts "warning: no constants found matching #{const_type}"
+          next
+        end
+        const_list.each do |c, comment|
+          if comment
+            comment.sub!('//', '')
+            comment.sub!(/[\r\n]+$/, '')
+            comment.gsub!(/:/, '-')  # colons break rdoc..
+            comment.strip!
+            newf.puts %Q{  /* #{comment} */}
+          end
+          newf.puts %Q{  rb_define_const(#{klass_name}, "#{c}", INT2FIX(#{c}));}
+        end
+      else
+        newf.puts l
+      end
+    end
+  end
+
+end
+
+dir_config('freeimage')
+
+ok = have_header('FreeImage.h') &&
+  have_library('stdc++') && # sometimes required on OSX
+  have_library('freeimage', 'FreeImage_Load')
+
+if(ok)
+  have_func('FreeImage_Rotate')
+  have_func('FreeImage_RotateClassic')
+  expand_constants
+  create_makefile("image_science_ext")
+end