Commit b675feab by jyurek

Added binmode settings for Windows.

git-svn-id: https://svn.thoughtbot.com/plugins/paperclip/trunk@403 7bbfaf0e-4d1d-0410-9690-a8bb5f8ef2aa
parent fafa7c6f
...@@ -15,7 +15,7 @@ module IOStream ...@@ -15,7 +15,7 @@ module IOStream
# and returns the IO or Tempfile as passed in if one is sent as the destination. # and returns the IO or Tempfile as passed in if one is sent as the destination.
def stream_to path_or_file, in_blocks_of = 8192 def stream_to path_or_file, in_blocks_of = 8192
dstio = case path_or_file dstio = case path_or_file
when String then File.new(path_or_file, "w+") when String then File.new(path_or_file, "wb+")
when IO then path_or_file when IO then path_or_file
when Tempfile then path_or_file when Tempfile then path_or_file
end end
......
...@@ -38,6 +38,7 @@ module Paperclip ...@@ -38,6 +38,7 @@ module Paperclip
def make def make
src = @file src = @file
dst = Tempfile.new([@basename, @format].compact.join(".")) dst = Tempfile.new([@basename, @format].compact.join("."))
dst.binmode
command = <<-end_command command = <<-end_command
#{ Paperclip.path_for_command('convert') } #{ Paperclip.path_for_command('convert') }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment