sobakasu-image_science 1.1.5 → 1.1.6

data/bin/image_science

@@ -48,6 +48,12 @@
 # * flip_vertical
 # * flip_horizontal
 # * rotate <angle> [<x_shift> <y_shift> <x_origin> <y_origin> <use_mask>]
+# * dpi
+# * dpi_x
+# * dpi_y
+# * dpm_x
+# * dpm_y
+# * resize_with_dpm <width> <height> <dpm_x> <dpm_y>
 #
 # Refer to the ImageScience documentation for allowed value ranges.
 #
@@ -68,8 +74,9 @@
 #  # 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
 
+$:.unshift(File.dirname(__FILE__) + '/../lib')
 require 'rubygems'
-require File.dirname(__FILE__) + '/../lib/image_science'
+require 'image_science'
 require 'getoptlong'
 
 ARG_SPEC = [ [ '--help', '-h', GetoptLong::NO_ARGUMENT ],
@@ -210,6 +217,11 @@ EOM
   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 'dpi_x', 'dpi_y', 'dpm_x', 'dpm_y', 'dpi'
+    process_data(opts) { |i| warn i.send(@command) }
+  when 'resize_with_dpm'
+    w, h, x, y = expect_params(%W{<width> <height> <dpm_x> <dpm_y>})
+    process_data(opts) { |i| i.resize_with_dpm(w, h, x, y); @changed = true }
   when 'rotate'
     a, *args = expect_params("<angle>", %W{<x_shift> <y_shift> <x_origin>
                                            <y_origin> <use_mask>})

data/ext/image_science_ext.c.in

@@ -719,6 +719,71 @@ static VALUE rotate(int argc, VALUE *argv, VALUE self) {
   }
 }
 
+// dpi methods from tcaddy
+
+/*
+ * Returns to dots-per-meter of x-axis (width) of image
+ */
+static VALUE dpm_x(VALUE self) {
+  FIBITMAP *bitmap;
+  GET_BITMAP(bitmap);
+
+  int dpm_x = FreeImage_GetDotsPerMeterX(bitmap);
+  return INT2FIX(FreeImage_GetDotsPerMeterX(bitmap));
+}
+
+/*
+ * Returns to dots-per-meter of y-axis (height) of image
+ */
+static VALUE dpm_y(VALUE self) {
+  FIBITMAP *bitmap;
+  GET_BITMAP(bitmap);
+
+  return INT2FIX(FreeImage_GetDotsPerMeterY(bitmap));
+}
+
+/*
+ * call-seq:
+ *   resize_with_dpm(width, height, dpm_x, dpm_y)
+ * 
+ * Resizes the image to +width+ and +height+ using a cubic-bspline
+ * filter, and converts to Dots-per-Meter.
+ * If a block is given, yields the new image, else returns
+ * true on success.
+ */
+static VALUE resize_with_dpm(VALUE self, VALUE wv, VALUE hv, VALUE dpm_xv, VALUE dpm_yv) {
+  int w, h, dpm_x, dpm_y;
+  FIBITMAP *bitmap, *image;
+  FREE_IMAGE_FORMAT fif;
+
+  w = FIX2INT(wv);
+  h = FIX2INT(hv);
+  dpm_x = FIX2INT(dpm_xv);
+  dpm_y = FIX2INT(dpm_yv);
+
+  if (w <= 0) rb_raise(rb_eArgError, "Width <= 0");
+  if (h <= 0) rb_raise(rb_eArgError, "Height <= 0");
+  if (dpm_x <= 0) rb_raise(rb_eArgError, "Dots-per-Meter X-Axis <= 0");
+  if (dpm_y <= 0) rb_raise(rb_eArgError, "Dots-per-Meter Y-Axis <= 0");
+
+  GET_BITMAP(bitmap);
+  fif = get_fif(self);
+  image = FreeImage_Rescale(bitmap, w, h, FILTER_CATMULLROM);
+  FreeImage_SetDotsPerMeterX(image, dpm_x);
+  FreeImage_SetDotsPerMeterY(image, dpm_y);
+  if (image) {
+    copy_icc_profile(bitmap, image, fif);
+
+    if(rb_block_given_p()) {
+      return wrap_and_yield(image, self, 0);
+    } else {
+      FreeImage_Unload(bitmap);
+      DATA_PTR(self) = image;
+    }
+  }
+  return image ? Qtrue : Qfalse;
+}
+
 /*
  * call-seq:
  *   ImageScience.new(filename, flags = 0)
@@ -778,6 +843,9 @@ void Init_image_science_ext(void)
   rb_define_method(isc, "flip_horizontal", flip_horizontal, 0);
   rb_define_method(isc, "flip_vertical", flip_vertical, 0);
   rb_define_method(isc, "rotate", rotate, -1);
+  rb_define_method(isc, "dpm_x", dpm_x, 0);
+  rb_define_method(isc, "dpm_y", dpm_x, 0);
+  rb_define_method(isc, "resize_with_dpm", resize_with_dpm, 4);
 
   /* FREE_IMAGE_TYPE constants */
   isc_image_types = rb_define_module_under(isc, "ImageTypes");

data/lib/image_science.rb

@@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/../ext/image_science_ext'
 
 class ImageScience
 
-  VERSION = "1.1.5"
+  VERSION = "1.1.6"
 
   ##
   # Returns the type of the image as a string.
@@ -145,6 +145,37 @@ class ImageScience
     set_pixel_color(x, y, *args)
   end
 
+  # methods from tcaddy (https://github.com/tcaddy/image_science) :nodoc:
+
+  # Convert a number from dots-per-meter to dots-per-inch
+  def self.dpm_to_dpi(dpm)
+    (dpm.to_f * (1.to_f/100.to_f) * ((2.54).to_f/1.to_f)).to_f
+  end
+  
+  ##
+  # Convert a number from dots-per-inch to dots-per-meter  
+  def self.dpi_to_dpm(dpi)
+    (dpi.to_f * (1.to_f/(2.54).to_f) * (100.to_f/1.to_f)).to_f
+  end
+  
+  ##
+  # Returns the DPI of x-axis (width) of the image, in dots-per-inch as float
+  def dpi_x
+    self.class.dpm_to_dpi(dpm_x)
+  end
+  
+  ##
+  # Returns the DPI of y-axis (height) of the image, in dots-per-inch as float
+  def dpi_y
+    self.class.dpm_to_dpi(dpm_y)
+  end
+  
+  ##
+  # Returns the DPI of image, as hash of float values
+  def dpi
+    {:x=>dpi_x,:y=>dpi_y}
+  end
+  
   private
   
   def self.fif_to_string(fif)

data/spec/image_science_spec.rb

@@ -245,7 +245,7 @@ describe ImageScience do
 
       describe "get_pixel_color" do
         expected = {
-          :jpg => [[62, 134, 122, 0],  [0, 14, 7, 0]],
+          :jpg => [[62, 134, 122, 0],  [0, 11, 6, 0]],
           :png => [[62, 134, 121, 0],  [1, 2, 2, 0]],
           :gif => [[59, 135, 119, 0],  [0, 2, 0, 0]],
           :bmp => [[62, 134, 121, 0],  [1, 2, 2, 0]],
@@ -512,6 +512,34 @@ describe ImageScience do
         end
       end
 
+      # dpi methods (from tcaddy)
+
+      describe "dpm_x" do        
+        it "should return the dpm on the x axis" do
+          ImageScience.with_image image_path(ext) do |img|
+            img.dpi_x.should == 72.009
+          end
+        end
+      end
+
+      describe "dpm_y" do
+        it "should return the dpm on the y axis" do
+          ImageScience.with_image image_path(ext) do |img|
+            img.dpi_y.should == 72.009
+          end
+        end
+      end
+
+      describe "resize_with_dpm" do
+        it "should resize the image to the specified dpm" do
+          ImageScience.with_image image_path(ext) do |img|
+            img.resize_with_dpm(30, 30, 100, 100).should be_true
+            img.dpm_x.should == 100
+            img.dpm_y.should == 100
+          end
+        end
+      end
+
     end
   end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 1
-  - 5
-  version: 1.1.5
+  - 6
+  version: 1.1.6
 platform: ruby
 authors: 
 - Ryan Davis
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-16 00:00:00 +10:30
+date: 2011-01-10 00:00:00 +10:30
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency