local-fastimage_resize 3.0.1 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35d30f9c5c3d94e005b8fc135fc1dd05b7f6673d
-  data.tar.gz: e49f5802cd1dc2f9122a594659a1b018acb3ff3c
+  metadata.gz: a0c5bfc9f73ad0d6abacc15c319720f88b5b1c17
+  data.tar.gz: 909df1ea148b610d11c149a90638b1459bee7505
 SHA512:
-  metadata.gz: f5e113bafa6aa697a41c0e27e8b0f3e19005643093dae7c31b59cfd5f4ce5e1597d3ef0d45680691f1a1abf25e8afa4b88a588156eafee578ae3b4c429101248
-  data.tar.gz: bb2dfa53b43dd1203a56d44fe6bec054110b44007e9cfaba432c58d0ad2ff8bc4ac52d5426b1d38b6151123c8227a1c1f9c655961deb6666cce7bc7607577d8d
+  metadata.gz: f8b726c8da9c6d2fdb0eb7b767f1e67f14c2b710d7ac9e6c1090a3f916ca92eb87a7df677f9e5b61e92730ae3fbc6ef62b2c569179cc36e5e51b08ed56825edd
+  data.tar.gz: e2015adb26c7add9b02831a058aea7479ec3f3de27988c8d86c205984ea0146557a61d29c73d48a877774c9c3f9731f8b683d8587d0ad923a4cc3de159f1617e

data/.gitignore

@@ -1,2 +1,5 @@
 /Gemfile.lock
 /pkg/
+/tmp/
+/lib/fastimage_native_resize.bundle
+/lib/fastimage_native_resize.so

data/.travis.yml

@@ -0,0 +1,18 @@
+language: ruby
+rvm:
+  - 2.4.10
+  - 2.5.8
+  - 2.6.6
+  - 2.7.2
+  - 3.0.0
+
+before_install:
+  - gem install bundler
+
+cache: bundler
+sudo: false
+
+addons:
+  apt:
+    packages:
+    - libgd2-noxpm-dev

data/CHANGELOG.md

@@ -1,7 +1,39 @@
+# 3.4.0 - 2021-02-10
+
+Support for resizing TIFF images. Output of such an operation is always a PNG
+image.
+
+# 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.
+
+If the resized image could not be created for any reason, we now raise a `FastImage::ImageFetchFailure` exception.
+
+# 3.1.1 - 2016-06-03
+
+Fix native code structure to work after gem install.
+
+# 3.1.0 - 2016-06-03
+
+Replacing RubyInline with native extension.
+
 # 3.0.1 - 2016-06-02
 
 Updating meta data in gemspec, no code changes.
 
 # 3.0.0 - 2016-06-02
 
-Removing remote image support
+Removing remote image support.

data/README.md

@@ -6,8 +6,13 @@ Resize](https://github.com/sdsykes/fastimage_resize) gem.
 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
+Status](https://travis-ci.org/planio-gmbh/local-fastimage_resize.svg?branch=master)](https://travis-ci.org/planio-gmbh/local-fastimage_resize)
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -31,6 +36,19 @@ Or install it yourself as:
 Again, make sure to `require "fastimage/resize"`.
 
 
+### External dependencies
+
+`local-fastimage_resize`, just as `fastimage_resize`, depends on
+[libgd](http://www.libgd.org). Therefore you need to have the development
+headers installed on your system.
+
+* *Mac OS* (Homebrew): `brew install gd`
+* *Debian*: `apt-get install libgd-dev`
+* *Ubuntu*: `apt-get install libgd2-noxpm-dev`
+
+The Ubuntu package with XPM support will work just as well. It's just, that
+`fastimage_resize` will not make any use of it.
+
 
 ## Usage
 

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

@@ -1,4 +1,5 @@
 require "bundler/gem_tasks"
+
 require "rake/testtask"
 
 Rake::TestTask.new(:test) do |t|
@@ -7,4 +8,10 @@ Rake::TestTask.new(:test) do |t|
   t.test_files = FileList['test/**/*_test.rb']
 end
 
-task :default => :test
+require "rake/extensiontask"
+
+Rake::ExtensionTask.new "fastimage_native_resize"
+
+Rake::Task[:test].prerequisites << :compile
+
+task default: :test

data/ext/fastimage_native_resize/extconf.rb

@@ -0,0 +1,5 @@
+require "mkmf"
+
+abort "missing libgd" unless have_library("gd")
+
+create_makefile "fastimage_native_resize"

data/ext/fastimage_native_resize/fastimage_native_resize.c

@@ -0,0 +1,149 @@
+#include <ruby.h>
+#include <gd.h>
+
+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;
+  FILE *in, *out;
+  int trans = 0, x = 0, y = 0, f = 0;
+
+  in = fopen(filename_in, "rb");
+  if (!in) return Qnil;
+
+  switch(image_type) {
+    case 0: im_in = gdImageCreateFromJpeg(in);
+            break;
+    case 1: im_in = gdImageCreateFromPng(in);
+            break;
+    case 2: im_in = gdImageCreateFromGif(in);
+            trans = gdImageGetTransparent(im_in);
+            /* find a transparent pixel, then turn off transparency
+               so that it copies correctly */
+            if (trans >= 0) {
+              for (x=0; x<gdImageSX(im_in); x++) {
+                for (y=0; y<gdImageSY(im_in); y++) {
+                  if (gdImageGetPixel(im_in, x, y) == trans) {
+                    f = 1;
+                    break;
+                  }
+                }
+                if (f) break;
+              }
+              gdImageColorTransparent(im_in, -1);
+              if (!f) trans = -1;  /* no transparent pixel found */
+            }
+            break;
+    case 3: im_in = gdImageCreateFromTiff(in);
+            break;
+  }
+
+  if (!im_in) {
+    fclose(in);
+    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 (h != 0) {
+      w = (int)(h * originalWidth / originalHeight);
+    } 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) {
+      gdImageAlphaBlending(im_out, 0);  /* handle transparency correctly */
+      gdImageSaveAlpha(im_out, 1);
+    }
+    fclose(in);
+  } else {
+    fclose(in);
+    return Qnil;
+  }
+
+  /* Now copy the original */
+  gdImageCopyResampled(im_out, im_in, 0, 0, 0, 0,
+    gdImageSX(im_out), gdImageSY(im_out),
+    gdImageSX(im_in), gdImageSY(im_in));
+
+  out = fopen(filename_out, "wb");
+  if (out) {
+    switch(image_type) {
+      case 0: gdImageJpeg(im_out, out, jpeg_quality);
+              break;
+      case 1: gdImagePng(im_out, out);
+              break;
+      case 2: gdImageTrueColorToPalette(im_out, 0, 256);
+              if (trans >= 0) {
+                trans = gdImageGetPixel(im_out, x, y);  /* get the color index of our transparent pixel */
+                gdImageColorTransparent(im_out, trans); /* may not always work as hoped */
+              }
+              gdImageGif(im_out, out);
+              break;
+      case 3: gdImagePng(im_out, out);
+              break;
+    }
+    fclose(out);
+  }
+  gdImageDestroy(im_in);
+  gdImageDestroy(im_out);
+  return Qnil;
+}
+
+void Init_fastimage_native_resize(void) {
+  VALUE cFastImageResize;
+
+  cFastImageResize = rb_const_get(rb_cObject, rb_intern("FastImage"));
+
+  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
@@ -19,13 +21,13 @@
 #
 # * http://blog.new-bamboo.co.uk/2007/12/3/super-f-simple-resizing
 
-require 'inline'
 require 'tempfile'
 require 'fastimage'
+require 'fastimage_native_resize'
 
 module FastImage::Resize
-  SUPPORTED_FORMATS = [:jpeg, :png, :gif]
-  FILE_EXTENSIONS = [:jpg, :png, :gif]  # prefer jpg to jpeg as an extension
+  SUPPORTED_FORMATS = [:jpeg, :png, :gif, :tiff]
+  FILE_EXTENSIONS = [:jpg, :png, :gif, :tiff]  # prefer jpg to jpeg as an extension
 
   class FormatNotSupported < FastImage::FastImageException # :nodoc:
   end
@@ -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,102 +77,13 @@ module FastImage::Resize
       temp_file = nil
     end
 
-    resize_image(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)
 
     temp_file
   rescue RuntimeError => e
-    raise ImageFetchFailure, e.message
-  end
-
-  private
-
-  def resize_image(filename_in, filename_out, w, h, image_type, jpeg_quality); end
-
-  inline do |builder|
-    builder.include '"gd.h"'
-    builder.add_link_flags "-lgd"
-
-    builder.c <<-"END"
-      VALUE resize_image(char *filename_in, char *filename_out, int w, int h, int image_type, int jpeg_quality) {
-        gdImagePtr im_in, im_out;
-        FILE *in, *out;
-        int trans = 0, x = 0, y = 0, f = 0;
-
-        in = fopen(filename_in, "rb");
-        if (!in) return Qnil;
-
-        switch(image_type) {
-          case 0: im_in = gdImageCreateFromJpeg(in);
-                  break;
-          case 1: im_in = gdImageCreateFromPng(in);
-                  break;
-          case 2: im_in = gdImageCreateFromGif(in);
-                  trans = gdImageGetTransparent(im_in);
-                  /* find a transparent pixel, then turn off transparency
-                     so that it copies correctly */
-                  if (trans >= 0) {
-                    for (x=0; x<gdImageSX(im_in); x++) {
-                      for (y=0; y<gdImageSY(im_in); y++) {
-                        if (gdImageGetPixel(im_in, x, y) == trans) {
-                          f = 1;
-                          break;
-                        }
-                      }
-                      if (f) break;
-                    }
-                    gdImageColorTransparent(im_in, -1);
-                    if (!f) trans = -1;  /* no transparent pixel found */
-                  }
-                  break;
-          default: return Qnil;
-        }
-
-        if (w == 0 || h == 0) {
-          int originalWidth  = gdImageSX(im_in);
-          int originalHeight = gdImageSY(im_in);
-          if (w == 0) {
-            w = (int)(h * originalWidth / originalHeight);
-          } else {
-            h = (int)(w * originalHeight / originalWidth);
-          }
-        }
-
-        im_out = gdImageCreateTrueColor(w, h);  /* must be truecolor */
-
-        if (image_type == 1) {
-          gdImageAlphaBlending(im_out, 0);  /* handle transparency correctly */
-          gdImageSaveAlpha(im_out, 1);
-        }
-
-        fclose(in);
-
-        /* Now copy the original */
-        gdImageCopyResampled(im_out, im_in, 0, 0, 0, 0,
-          gdImageSX(im_out), gdImageSY(im_out),
-          gdImageSX(im_in), gdImageSY(im_in));
-
-        out = fopen(filename_out, "wb");
-        if (out) {
-          switch(image_type) {
-            case 0: gdImageJpeg(im_out, out, jpeg_quality);
-                    break;
-            case 1: gdImagePng(im_out, out);
-                    break;
-            case 2: gdImageTrueColorToPalette(im_out, 0, 256);
-                    if (trans >= 0) {
-                      trans = gdImageGetPixel(im_out, x, y);  /* get the color index of our transparent pixel */
-                      gdImageColorTransparent(im_out, trans); /* may not always work as hoped */
-                    }
-                    gdImageGif(im_out, out);
-                    break;
-          }
-          fclose(out);
-        }
-        gdImageDestroy(im_in);
-        gdImageDestroy(im_out);
-        return Qnil;
-      }
-    END
+    raise FastImage::ImageFetchFailure, e.message
   end
 end
 

data/lib/fastimage/resize/version.rb

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

data/local-fastimage_resize.gemspec

@@ -17,13 +17,15 @@ Gem::Specification.new do |s|
 
   s.license = "MIT"
 
-  s.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  s.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(bin|test)/}) }
   s.require_paths = ["lib"]
 
-  s.add_dependency "RubyInline", ">= 3.8.2"
+  s.extensions = "ext/fastimage_native_resize/extconf.rb"
+
   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 "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.0.1
+  version: 3.4.0
 platform: ruby
 authors:
 - Stephen Sykes
@@ -9,22 +9,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-02 00:00:00.000000000 Z
+date: 2021-02-11 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: RubyInline
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.8.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.8.2
 - !ruby/object:Gem::Dependency
   name: local-fastimage
   requirement: !ruby/object:Gem::Requirement
@@ -43,44 +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: '0'
+- !ruby/object:Gem::Dependency
+  name: rake-compiler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
 description: Local FastImage Resize is an extremely light solution for resizing images
   in ruby by using libgd.
 email:
@@ -88,18 +88,21 @@ email:
 - gregor@plan.io
 - support@plan.io
 executables: []
-extensions: []
+extensions:
+- ext/fastimage_native_resize/extconf.rb
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - MIT_LICENCE
-- README
 - README.md
 - README.textile
 - Rakefile
 - VERSION.yml
+- ext/fastimage_native_resize/extconf.rb
+- ext/fastimage_native_resize/fastimage_native_resize.c
 - lib/fastimage/resize.rb
 - lib/fastimage/resize/version.rb
 - local-fastimage_resize.gemspec
@@ -124,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - libgd, see www.libgd.org
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.14.4
 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