image_science 1.0.0 → 1.1.0

data/History.txt

@@ -1,3 +1,15 @@
+== 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

data/README.txt

@@ -35,7 +35,7 @@ For more information including build steps, see http://seattlerb.rubyforge.org/
 == INSTALL:
 
 * Download and install FreeImage. See notes at url above.
-* sudo gem install -y ImageScience
+* sudo gem install -y image_science
 
 == LICENSE:
 

data/Rakefile

@@ -10,6 +10,8 @@ Hoe.new('image_science', ImageScience::VERSION) do |p|
   p.summary = p.description[/^[^.]+\./]
   p.url = p.paragraphs_of('README.txt', 0).first.split(/\n/)[1..-1].first.strip
   p.changes = p.paragraphs_of('History.txt', 0..1).join("\n\n")
+  p.extra_deps << 'RubyInline'
+  p.clean_globs << 'blah*png'
 end
 
 # vim: syntax=Ruby

data/bench.rb

@@ -27,7 +27,9 @@ Benchmark::bm(20) do |x|
   x.report("cropped") {
     for i in 0..max do
       ImageScience.with_image(file) do |img|
-        img.cropped_thumbnail("blah_cropped.png", 100)
+        img.cropped_thumbnail(100) do |thumb|
+          thumb.save("blah_cropped.png")
+        end
       end
     end
   }
@@ -35,8 +37,22 @@ Benchmark::bm(20) do |x|
   x.report("proportional") {
     for i in 0..max do
       ImageScience.with_image(file) do |img|
-        img.thumbnail("blah_thumb.png", 100)
+        img.thumbnail(100) do |thumb|
+          thumb.save("blah_thumb.png")
+        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.png")
+        end
       end
     end
   }
 end
+
+# File.unlink(*Dir["blah*png"])

data/lib/image_science.rb

@@ -11,17 +11,16 @@ require 'inline'
 # http://seattlerb.rubyforge.org/ImageScience.html
 
 class ImageScience
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 
   ##
-  # The top-level image loader opens +path+ and then passes the image
-  # instance to the given block.
+  # The top-level image loader opens +path+ and then yields the image.
 
   def self.with_image(path); end # :yields: image
 
   ##
   # Crops an image to +left+, +top+, +right+, and +bottom+ and then
-  # passes the new image to the given block.
+  # yields the new image.
 
   def with_crop(left, top, right, bottom); end # :yields: image
 
@@ -35,33 +34,58 @@ class ImageScience
 
   def height; end
 
+  ##
+  # Resizes the image to +width+ and +height+ using a cubic-bspline
+  # filter and yields the new image.
+
+  def resize(width, height); end # :yields: image
+
   ##
   # Creates a proportional thumbnail of the image scaled so its widest
-  # edge is resized to +size+ and writes the new image to +path+.
+  # edge is resized to +size+ and yields the new image.
 
-  def thumbnail(path, size); end
+  def thumbnail(size); end # :yields: image
 
   ##
   # Creates a square thumbnail of the image cropping the longest edge
-  # to match the shortest edge, resizes to +size+, and writes the new
-  # image to +path+.
+  # to match the shortest edge, resizes to +size+, and yields the new
+  # image.
 
-  def cropped_thumbnail(path, size)
+  def cropped_thumbnail(size) # :yields: image
     w, h = width, height
-    l, t, r, b, half = 0, 0, w, h, (w > h ? (w - h) : (h - w)) / 2
+    l, t, r, b, half = 0, 0, w, h, (w - h).abs / 2
 
     l, r = half, half + h if w > h
     t, b = half, half + w if h > w
 
     with_crop(l, t, r, b) do |img|
-      img.thumbnail(path, size)
+      img.thumbnail(size) do |thumb|
+        yield thumb
+      end
     end
   end
 
   inline do |builder|
+    if test ?d, "/opt/local" then
+      builder.add_compile_flags "-I/opt/local/include"
+      builder.add_link_flags "-L/opt/local/lib"
+    end
     builder.add_link_flags "-lfreeimage"
+    builder.add_link_flags "-lstdc++" # only needed on PPC for some reason. lame
     builder.include '"FreeImage.h"'
 
+    builder.prefix <<-"END"
+      #define GET_BITMAP(name) FIBITMAP *(name); Data_Get_Struct(self, FIBITMAP, (name)); if (!(name)) rb_raise(rb_eTypeError, "Bitmap has already been freed")
+
+      VALUE unload(VALUE self) {
+        GET_BITMAP(bitmap);
+
+        FreeImage_Unload(bitmap);
+        DATA_PTR(self) = NULL;
+        return Qnil;
+      }
+    END
+
     builder.c_singleton <<-"END"
       VALUE with_image(char * input) {
         FREE_IMAGE_FORMAT fif = FIF_UNKNOWN; 
@@ -74,8 +98,7 @@ class ImageScience
           if (bitmap = FreeImage_Load(fif, input, 0)) {
             VALUE obj = Data_Wrap_Struct(self, NULL, NULL, bitmap);
             rb_iv_set(obj, "@file_type", INT2FIX(fif));
-            result = rb_yield(obj);
-            FreeImage_Unload(bitmap);
+            result = rb_ensure(rb_yield, obj, unload, obj);
           }
           return result;
         }
@@ -85,14 +108,13 @@ class ImageScience
 
     builder.c <<-"END"
       VALUE with_crop(int l, int t, int r, int b) {
-        FIBITMAP *bitmap, *copy;
+        FIBITMAP *copy;
         VALUE result = Qnil;
-        Data_Get_Struct(self, FIBITMAP, bitmap);
+        GET_BITMAP(bitmap);
 
         if (copy = FreeImage_Copy(bitmap, l, t, r, b)) {
           VALUE obj = Data_Wrap_Struct(CLASS_OF(self), NULL, NULL, copy);
-          result = rb_yield(obj);
-          FreeImage_Unload(copy);
+          result = rb_ensure(rb_yield, obj, unload, obj);
         }
         return result;
       }
@@ -100,30 +122,46 @@ class ImageScience
 
     builder.c <<-"END"
       int height() {
-        FIBITMAP *bitmap;
-        Data_Get_Struct(self, FIBITMAP, bitmap);
+        GET_BITMAP(bitmap);
+
         return FreeImage_GetHeight(bitmap);
       }
     END
 
     builder.c <<-"END"
       int width() {
-        FIBITMAP *bitmap;
-        Data_Get_Struct(self, FIBITMAP, bitmap);
+        GET_BITMAP(bitmap);
+
         return FreeImage_GetWidth(bitmap);
       }
     END
 
     builder.c <<-"END"
-      VALUE thumbnail(char * output, int size) {
-        FIBITMAP *bitmap;
+      VALUE thumbnail(int size) {
+        GET_BITMAP(bitmap);
+        FIBITMAP *image = FreeImage_MakeThumbnail(bitmap, size, TRUE);
+        VALUE obj = Data_Wrap_Struct(CLASS_OF(self), NULL, NULL, image);
+        return rb_ensure(rb_yield, obj, unload, obj);
+      }
+    END
+
+    builder.c <<-"END"
+      VALUE resize(int w, int h) {
+        GET_BITMAP(bitmap);
+        FIBITMAP *image = FreeImage_Rescale(bitmap, w, h, FILTER_BSPLINE);
+        VALUE obj = Data_Wrap_Struct(CLASS_OF(self), NULL, NULL, image);
+        return rb_ensure(rb_yield, obj, unload, obj);
+      }
+    END
+
+    builder.c <<-"END"
+      VALUE save(char * output) {
         FREE_IMAGE_FORMAT fif = FreeImage_GetFIFFromFilename(output);
         if (fif == FIF_UNKNOWN) fif = FIX2INT(rb_iv_get(self, "@file_type"));
         if ((fif != FIF_UNKNOWN) && FreeImage_FIFSupportsWriting(fif)) { 
-          Data_Get_Struct(self, FIBITMAP, bitmap);
-          FIBITMAP *thumbnail = FreeImage_MakeThumbnail(bitmap, size, TRUE);
-          if (FreeImage_Save(fif, thumbnail, output, 0)) {
-            FreeImage_Unload(thumbnail);
+          GET_BITMAP(bitmap);
+
+          if (FreeImage_Save(fif, bitmap, output, 0)) {
             return Qtrue;
           }
           return Qfalse;

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
+rubygems_version: 0.9.0.8
 specification_version: 1
 name: image_science
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
-date: 2006-12-13 00:00:00 -05:00
+  version: 1.1.0
+date: 2007-01-05 00:00:00 -08:00
 summary: ImageScience is a clean and happy Ruby library that generates thumbnails -- and kicks the living crap out of RMagick.
 require_paths: 
 - lib
@@ -55,5 +55,14 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.1.4
+        version: 1.1.6
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: RubyInline
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">"
+      - !ruby/object:Gem::Version 
+        version: 0.0.0
     version: