lib/paperclip.rb in paperclip-4.1.1 vs lib/paperclip.rb in paperclip-4.2.0

@@ -73,18 +73,21 @@
   # * log: Logs progress to the Rails log. Uses ActiveRecord's logger, so honors
   #   log levels, etc. Defaults to true.
   # * command_path: Defines the path at which to find the command line
   #   programs if they are not visible to Rails the system's search path. Defaults to
   #   nil, which uses the first executable found in the user's search path.
+  # * use_exif_orientation: Whether to inspect EXIF data to determine an
+  #   image's orientation. Defaults to true.
   def self.options
     @options ||= {
       :whiny => true,
       :image_magick_path => nil,
       :command_path => nil,
       :log => true,
       :log_command => true,
       :swallow_stderr => true,
-      :content_type_mappings => {}
+      :content_type_mappings => {},
+      :use_exif_orientation => true
     }
   end
 
   def self.io_adapters=(new_registry)
     @io_adapters = new_registry