sobakasu-image_science 1.1.3 → 1.1.4

data/History.txt

@@ -1,6 +1,12 @@
-== 1.1.3 2010-02-24
+== 1.1.4 / 2010-09-15
 
-* fixed call to FreeImage_Rotate() (used in newer versions of FreeImage)
+* added 'fit_within' command to bin/image_science.
+* added options information to bin/image_science -h
+* merged changes from scotje/image_science - fix for gif conversion to 8bit
+
+== 1.1.3 / 2010-02-23
+
+* fixed parameters to FreeImage_Rotate
 
 == 1.1.2 / 2010-02-12
 

data/bin/image_science

@@ -29,12 +29,13 @@
 #
 # == Commands
 #
-# The following commands are recognised
+# The following commands are recognised:
 # 
 # * info
 # * histogram
 # * get_version
 # * resize <width> <height>
+# * fit_within <max_width> <max_height>
 # * crop <left> <top> <right> <bottom>
 # * get_pixel_color <x> <y>
 # * set_pixel_color <x> <y> <red> <green> <blue> [<alpha>]
@@ -125,9 +126,18 @@ def usage(bonus_args = nil)
   cmd = @command || "[command]"
   usage = ["usage: image_science [OPTIONS]", cmd, bonus_args, "[image_file]"].
     compact.join(" ")
-  
+
+  usage += "\n\n"
+  usage += <<EOM
+ options:
+  -h: display this help message
+  -i: input file  (by default read from stdin, or last argument)
+  -o: output file (by default write to stdout, or a file named 'output')
+  -d: debug mode
+EOM
+
   if !@command
-    re = Regexp.new('== Commands(.*?)= Examples', Regexp::MULTILINE)
+    re = Regexp.new('== Commands\n(.*?)= Examples', Regexp::MULTILINE)
     commands = $1.gsub(/#/, '') if File.read(__FILE__).match(re)
     usage += commands.sub(/[\n\s]+\z/, '') + "\n\n"
   end
@@ -180,6 +190,9 @@ EOM
   when 'resize'
     w, h = expect_params(%W{<width> <height>})
     process_data(opts) { |i| i.send(@command, w, h); @changed = true }
+  when 'fit_within'
+    w, h = expect_params(%W{<max_width> <max_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 }

data/ext/image_science_ext.c.in

@@ -84,7 +84,11 @@ _prepare_bitmap_for_save(FIBITMAP *bitmap, FREE_IMAGE_FORMAT fif)
     new_bitmap = FreeImage_ConvertTo24Bits(bitmap);
   }
   if (fif == FIF_GIF && FreeImage_GetBPP(bitmap) != 8) {
-    new_bitmap = FreeImage_ConvertTo8Bits(bitmap);
+    if (FreeImage_GetBPP(bitmap) != 24) {
+      new_bitmap = FreeImage_ColorQuantize(FreeImage_ConvertTo24Bits(bitmap), FIQ_WUQUANT);
+    } else {
+      new_bitmap = FreeImage_ColorQuantize(bitmap, FIQ_WUQUANT);
+    }
   }
 
   if (new_bitmap) copy_icc_profile(bitmap, new_bitmap, fif);

data/lib/image_science.rb

@@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/../ext/image_science_ext'
 
 class ImageScience
 
-  VERSION = "1.1.3"
+  VERSION = "1.1.4"
 
   ##
   # Returns the type of the image as a string.

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sobakasu-image_science
 version: !ruby/object:Gem::Version 
-  version: 1.1.3
+  hash: 27
+  prerelease: false
+  segments: 
+  - 1
+  - 1
+  - 4
+  version: 1.1.4
 platform: ruby
 authors: 
 - Ryan Davis
@@ -10,19 +16,41 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-24 00:00:00 +10:30
+date: 2010-09-15 00:00:00 +09:30
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: hoe
+  name: rubyforge
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 2
+        - 0
+        - 4
+        version: 2.0.4
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.3.3
-    version: 
+        hash: 19
+        segments: 
+        - 2
+        - 6
+        - 2
+        version: 2.6.2
+  type: :development
+  version_requirements: *id002
 description: |-
   ImageScience is a clean and happy Ruby library that generates
   thumbnails -- and kicks the living crap out of RMagick. Oh, and it
@@ -73,23 +101,28 @@ rdoc_options:
 - README.txt
 require_paths: 
 - lib
-- ext
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: sobakasu-image_science
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: ImageScience is a clean and happy Ruby library that generates thumbnails -- and kicks the living crap out of RMagick