thumbnailer 1.1.1 → 1.2.0

data/Rakefile

@@ -16,6 +16,7 @@ spec = Gem::Specification.new do |s|
 
   s.files             = FileList['README', 'COPY*', 'Rakefile', 'lib/**/*.rb']
   s.requirements     << 'gd2'
+  s.requirements     << 'exifr'
   s.test_files        = FileList['test/*.rb']
 
   s.has_rdoc          = true

data/lib/thumbnailer.rb

@@ -1,8 +1,11 @@
 require 'gd2'
+require 'exifr'
 
 # Scales the given image to fit within a box of the required
 # size with either a transparent background or one specified
-# by the user.
+# by the user. Should the source image be a JPEG with the 
+# image orientation set in the EXIF data then the thumbnail
+# will be rotated to the correct orientation.
 #
 # The return value is the thumbnail data in +png+ format. Both the
 # default colour and the output type can be changed.
@@ -33,7 +36,7 @@ require 'gd2'
 #  f.close
 
 class ThumbNailer
-  VERSION = '1.1.1'
+  VERSION = '1.2.0'
 
   # The default colour, an impure black to be used for
   # transparency or background
@@ -64,7 +67,7 @@ class ThumbNailer
 	  end
 	  thumbnail.copy_from(image,dstX,dstY,0,0,dstW,dstH)
 
-	  return create_output(thumbnail)
+	  return create_output(thumbnail, source)
   end
 
   # Given the filename of an image and the required size
@@ -74,7 +77,7 @@ class ThumbNailer
   # If the image is smaller than the box then it will be
   # centered within the box as is.
   def self.box_with_background(source, size, r = @@r, g = @@g, b = @@b)
-    image = GD2::Image.import(source)
+    image = get_image(source)
 
     dstX, dstY, dstW, dstH, image = resize_source(image, size)
 
@@ -86,7 +89,7 @@ class ThumbNailer
 	  end
 	  thumbnail.copy_from(image,dstX,dstY,0,0,dstW,dstH)
 
-	  return create_output(thumbnail)
+	  return create_output(thumbnail, source)
   end
 
   # Change the output type to +png+ (default)
@@ -115,7 +118,9 @@ class ThumbNailer
 
   private
 
-  def self.create_output(image)
+  def self.create_output(image, source)
+    image = correct_orientation(image, source)
+
   	case @@OUTPUT_TYPE
   	when 'png'
   		return image.png
@@ -168,4 +173,40 @@ class ThumbNailer
   	
   	return dstX, dstY, dstW, dstH, image
   end
+
+  def self.correct_orientation(image, source)
+	  orientation = 0
+
+  	begin
+		  info = EXIFR::JPEG.new(source)
+		  orientation = info.orientation.to_i
+	  rescue Exception => e
+		  # Either not a jpg or has no EXIF data
+	  end
+
+	  case orientation
+	  when 2
+		  # ) transform="-flip horizontal";; 
+	  when 3
+		  image.rotate!(degrees_to_rad(-180.0), image.width.to_f / 2.0, image.height.to_f / 2.0)
+	  when 4
+		  # ) transform="-flip vertical";; 
+	  when 5
+		  # ) transform="-transpose";; 
+	  when 6
+		  image.rotate!(degrees_to_rad(-90.0), image.width.to_f / 2.0, image.height.to_f / 2.0)
+	  when 7
+		  # ) transform="-transverse";; 
+	  when 8
+		  image.rotate!(degrees_to_rad(-270.0), image.width.to_f / 2.0, image.height.to_f / 2.0)
+	  else
+		  # No rotation required
+	  end
+
+	  return image
+  end
+
+  def self.degrees_to_rad(degrees)
+	  return (degrees * (Math::PI / 180.0))
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: thumbnailer
 version: !ruby/object:Gem::Version 
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors: 
 - Peter Hickman
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-27 00:00:00 +00:00
+date: 2008-12-30 00:00:00 +00:00
 default_executable: 
 dependencies: []
 
@@ -52,6 +52,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: 
 - gd2
+- exifr
 rubyforge_project: thumbnailer
 rubygems_version: 1.3.1
 signing_key: