local-fastimage_resize 3.2.0 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 50c371403135f3114a00aa4bc6c5f4b6dfb9b33c
-  data.tar.gz: a94a1d8ac982dfed7ac8f2c923f90361e105472c
+SHA256:
+  metadata.gz: 7a7a5852a9c12e9eb1da31bc031d8b39556025aa14a3df7cd21e63c23fe022c0
+  data.tar.gz: d5cb5920f6434683f56bb828cfb6b4dcd1742ae28e6184fe7b9e559cd2a61947
 SHA512:
-  metadata.gz: 8f6caeb867b93b16d3ed126ca508cbc2ba020108f063ee8ce6dee6017e4b1dcc0a3f2e9224bd7f11e3c4647e0c1aa89ed22eb9d1c280e25ebe78a45ecb521331
-  data.tar.gz: 884d0de764ada380b77cd97841fc803eab00e52f9b3ad997f31cc20cc92fdf30737609bb8b94ed7adad16992ccf0091828e1b8f9730381cbb17bac9043c1f7d8
+  metadata.gz: 6d60ea4c09f3901652548da85b723ea6b48959ec60a0633823e1b2a7a05a4318da716b36839d39bd2d9a7521eb3296e1eee459e9849df68c5359844d1c764d1d
+  data.tar.gz: 8f145aeae41f9e0cfb9aec8d56bc7b5a7b9beddec9d5d31496268434f247bd99dcd3a9c74c5e7a62b36d035dc3a78897faa232a90585fc886fa841d453a595fe

data/.travis.yml

@@ -1,8 +1,9 @@
 language: ruby
 rvm:
-  - 2.1.9
-  - 2.2.5
-  - 2.3.1
+  - 2.2.10
+  - 2.3.7
+  - 2.4.4
+  - 2.5.1
 
 before_install:
   - gem install bundler

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+# 3.3.0 - 2018-04-24
+
+Support for Exif orientation.
+
+Images are rotated and flipped automatically based on Exif data, so that the
+generated thumbnails follow the specified orientation.
+
+Support for easy non-scaling operation
+
+By providing `0` for both width and height, the image will not be scaled but
+merely re-encoded to the target location. This may be useful in combination with
+the above mentioned automatic Exif orientation handling,
+
 # 3.2.0 - 2017-09-08
 
 Check for some error cases in gd calls which might have resulted in null-pointer exceptions and subsequent segfaults.

data/README.md

@@ -7,6 +7,7 @@ It features the following differences:
 
 * Removal of all remote image handling code
 * Replacing RubyInline with native extension
+* Support for Exif orientation
 * Minor changes to code organization
 
 [![Build

data/README.textile

@@ -29,15 +29,15 @@ h2. Examples
 <code>
   require 'fastimage_resize'
 
-  FastImage.resize("example.gif", 100, 20, :outfile=>"my.gif")
+  FastImage.resize("example.gif", 100, 20, outfile: "my.gif")
   => nil
 
   outfile = FastImage.resize("nonexistentfile.png", 50, 50)
-  =>FastImage::ImageFetchFailure: FastImage::ImageFetchFailure
+  => FastImage::ImageFetchFailure: FastImage::ImageFetchFailure
 
   outfile = FastImage.resize("afile.png", 50, 150)
   => #<File:/var/folders/vm/vd65y2597xl_by6c73_m9j1h0000gn/T/FastImage20111003-7638-x3l8r7-0.png>
-  
+
   File.open("afile.png", "r") {|f| FastImage.resize(f, 100, 100)}
   => #<File:/var/folders/vm/vd65y2597xl_by6c73_m9j1h0000gn/T/FastImage20111003-7638-y1ofh-0.png>
 </code>

data/Rakefile

@@ -14,4 +14,4 @@ Rake::ExtensionTask.new "fastimage_native_resize"
 
 Rake::Task[:test].prerequisites << :compile
 
-task :default => :test
+task default: :test

data/ext/fastimage_native_resize/fastimage_native_resize.c

@@ -1,19 +1,21 @@
 #include <ruby.h>
 #include <gd.h>
 
-// static void d(VALUE v) {
-//     ID sym_puts = rb_intern("puts");
-//     ID sym_inspect = rb_intern("inspect");
-//     rb_funcall(rb_mKernel, sym_puts, 1, rb_funcall(v, sym_inspect, 0));
-// }
-
-static VALUE fastimage_native_resize(VALUE self, VALUE rb_in, VALUE rb_out, VALUE rb_w, VALUE rb_h, VALUE rb_image_type, VALUE rb_jpeg_quality) {
+static VALUE fastimage_native_resize(
+        VALUE self,
+        VALUE rb_in, VALUE rb_out,
+        VALUE rb_w, VALUE rb_h,
+        VALUE rb_image_type,
+        VALUE rb_jpeg_quality,
+        VALUE rb_orientation
+       ) {
   char *filename_in  = StringValuePtr(rb_in);
   char *filename_out = StringValuePtr(rb_out);
   int w              = NUM2INT(rb_w);
   int h              = NUM2INT(rb_h);
   int image_type     = NUM2INT(rb_image_type);
   int jpeg_quality   = NUM2INT(rb_jpeg_quality);
+  int orientation    = NUM2INT(rb_orientation);
 
 
   gdImagePtr im_in, im_out;
@@ -53,16 +55,48 @@ static VALUE fastimage_native_resize(VALUE self, VALUE rb_in, VALUE rb_out, VALU
     return Qnil;
   }
 
+
+
+  /*  Handle orientation */
+  if (orientation == 5 || orientation == 6) {
+    im_in = gdImageRotateInterpolated(im_in, 270.0, 0);
+  }
+  if (orientation == 7 || orientation == 8) {
+    im_in = gdImageRotateInterpolated(im_in, 90.0, 0);
+  }
+  if (!im_in) {
+    fclose(in);
+    return Qnil;
+  }
+
+  if (orientation == 2 || orientation == 5 || orientation == 7) {
+    gdImageFlipHorizontal(im_in);
+  }
+  if (orientation == 3) {
+      gdImageFlipBoth(im_in);
+  }
+  if (orientation == 4) {
+    gdImageFlipVertical(im_in);
+  }
+
+
+
+  /* Compute target size */
   if (w == 0 || h == 0) {
     int originalWidth  = gdImageSX(im_in);
     int originalHeight = gdImageSY(im_in);
-    if (w == 0) {
+    if (h != 0) {
       w = (int)(h * originalWidth / originalHeight);
-    } else {
+    } else if (w != 0) {
       h = (int)(w * originalHeight / originalWidth);
+    } else {
+      w = originalWidth;
+      h = originalHeight;
     }
   }
 
+
+
   im_out = gdImageCreateTrueColor(w, h);  /* must be truecolor */
   if (im_out) {
     if (image_type == 1) {
@@ -107,5 +141,5 @@ void Init_fastimage_native_resize(void) {
 
   cFastImageResize = rb_const_get(rb_cObject, rb_intern("FastImage"));
 
-  rb_define_singleton_method(cFastImageResize, "native_resize", fastimage_native_resize, 6);
+  rb_define_singleton_method(cFastImageResize, "native_resize", fastimage_native_resize, 7);
 }

data/lib/fastimage/resize.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+#
 # FastImage Resize is an extremely light solution for resizing images in ruby by using libgd
 #
 # === Examples
 #
 #   require 'fastimage_resize'
 #
-#   FastImage.resize("image.gif", 100, 20, :outfile=>"thumbnail.gif")
+#   FastImage.resize("image.gif", 100, 20, outfile: "thumbnail.gif")
 #   => 1
 #
 # === Requirements
@@ -47,7 +49,7 @@ module FastImage::Resize
     #
     #   require 'fastimage_resize'
     #
-    #   FastImage.resize("http://stephensykes.com/images/ss.com_x.gif", 100, 20, :outfile=>"my.gif")
+    #   FastImage.resize("http://stephensykes.com/images/ss.com_x.gif", 100, 20, outfile: "my.gif")
     #
     # === Supported options
     # [:jpeg_quality]
@@ -56,7 +58,7 @@ module FastImage::Resize
     #   Name of a file to store the output in, in this case a temp file is not used
     #
     def resize(source, width, height, options={})
-      new(source, :raise_on_failure => true).resize(width, height, options)
+      new(source, raise_on_failure: true).resize(width, height, options)
     end
   end
 
@@ -75,7 +77,7 @@ module FastImage::Resize
       temp_file = nil
     end
 
-    FastImage.native_resize(path, file_out.to_s, width.to_i, height.to_i, type_index, jpeg_quality.to_i)
+    FastImage.native_resize(path, file_out.to_s, width.to_i, height.to_i, type_index, jpeg_quality.to_i, orientation)
 
     raise FastImage::ImageFetchFailure, 'Image could be created' unless File.exist?(file_out.to_s)
 

data/lib/fastimage/resize/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 class FastImage
   module Resize
-    VERSION = "3.2.0"
+    VERSION = "3.3.0"
   end
 end

data/local-fastimage_resize.gemspec

@@ -24,8 +24,8 @@ Gem::Specification.new do |s|
 
   s.add_dependency "local-fastimage", "~> 3.0"
 
-  s.add_development_dependency "bundler", "~> 1.12"
-  s.add_development_dependency "rake", "~> 10.0"
-  s.add_development_dependency "minitest", "~> 5.0"
-  s.add_development_dependency "rake-compiler", "~> 0.9.9"
+  s.add_development_dependency "bundler"
+  s.add_development_dependency "rake"
+  s.add_development_dependency "minitest"
+  s.add_development_dependency "rake-compiler"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: local-fastimage_resize
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.3.0
 platform: ruby
 authors:
 - Stephen Sykes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-08 00:00:00.000000000 Z
+date: 2018-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: local-fastimage
@@ -29,58 +29,58 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.9
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.9
+        version: '0'
 description: Local FastImage Resize is an extremely light solution for resizing images
   in ruby by using libgd.
 email:
@@ -97,7 +97,6 @@ files:
 - CHANGELOG.md
 - Gemfile
 - MIT_LICENCE
-- README
 - README.md
 - README.textile
 - Rakefile
@@ -128,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - libgd, see www.libgd.org
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Local FastImage Resize - Image resizing fast and simple

data/README

@@ -1,27 +0,0 @@
-FastImage Resize is an extremely light solution for resizing images in ruby by using libgd
-
-=== Examples
-
-  require 'fastimage_resize'
-
-  FastImage.resize("http://stephensykes.com/images/ss.com_x.gif", "my.gif", 100, 20)
-  => 1
-
-=== Requirements
-
-RubyInline
-
-  gem install RubyInline
-
-FastImage
-
-  gem install fastimage
-
-Libgd
-
-See http://www.libgd.org/
-Libgd is commonly available on most unix platforms, including OSX.
-
-=== References
-
-* http://blog.new-bamboo.co.uk/2007/12/3/super-f-simple-resizing