Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
P
paperclip
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ikcrm_common
paperclip
Commits
0d93e0f0
Unverified
Commit
0d93e0f0
authored
8 years ago
by
aboutqx
Committed by
Mike Burns
7 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add is_windows to option
parent
76a33f05
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
3 deletions
+4
-3
lib/paperclip.rb
+1
-0
lib/paperclip/geometry_detector_factory.rb
+1
-1
lib/paperclip/processor.rb
+2
-2
No files found.
lib/paperclip.rb
View file @
0d93e0f0
...
...
@@ -98,6 +98,7 @@ module Paperclip
swallow_stderr:
true
,
use_exif_orientation:
true
,
whiny:
true
,
is_windows:
Gem
.
win_platform?
}
end
...
...
This diff is collapsed.
Click to expand it.
lib/paperclip/geometry_detector_factory.rb
View file @
0d93e0f0
...
...
@@ -17,7 +17,7 @@ module Paperclip
orientation
=
Paperclip
.
options
[
:use_exif_orientation
]
?
"%[exif:orientation]"
:
"1"
Paperclip
.
run
(
Gem
.
win_platform?
?
"magick identify"
:
"identify"
,
Paperclip
.
options
[
:is_windows
]
?
"magick identify"
:
"identify"
,
"-format '%wx%h,
#{
orientation
}
' :file"
,
{
:file
=>
"
#{
path
}
[0]"
},
{
...
...
This diff is collapsed.
Click to expand it.
lib/paperclip/processor.rb
View file @
0d93e0f0
...
...
@@ -38,7 +38,7 @@ module Paperclip
# See Paperclip.run for the available options.
def
convert
(
arguments
=
""
,
local_options
=
{})
Paperclip
.
run
(
Gem
.
win_platform
?
"magick convert"
:
"convert"
,
Paperclip
.
options
[
:is_windows
]
?
"magick convert"
:
"convert"
,
arguments
,
local_options
,
)
...
...
@@ -48,7 +48,7 @@ module Paperclip
# See Paperclip.run for the available options.
def
identify
(
arguments
=
""
,
local_options
=
{})
Paperclip
.
run
(
Gem
.
win_platform?
?
"magick identify"
:
"identify"
,
Paperclip
.
options
[
:is_windows
]
?
"magick identify"
:
"identify"
,
arguments
,
local_options
,
)
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment