Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
7
Merge Requests
7
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
Jérome Perrin
erp5
Commits
a8a5fd52
Commit
a8a5fd52
authored
Jul 07, 2015
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Image: apply a timeout for conversion
parent
1a984890
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
product/ERP5/Document/Image.py
product/ERP5/Document/Image.py
+1
-1
No files found.
product/ERP5/Document/Image.py
View file @
a8a5fd52
...
@@ -319,7 +319,7 @@ class Image(TextConvertableMixin, File, OFSImage):
...
@@ -319,7 +319,7 @@ class Image(TextConvertableMixin, File, OFSImage):
def
_resize
(
self
,
quality
,
width
,
height
,
format
,
resolution
,
frame
):
def
_resize
(
self
,
quality
,
width
,
height
,
format
,
resolution
,
frame
):
"""Resize and resample photo."""
"""Resize and resample photo."""
parameter_list
=
[
'convert'
,
'-colorspace'
,
'sRGB'
,
'-depth'
,
'8'
,
parameter_list
=
[
'
/usr/bin/timeout'
,
'10'
,
'
convert'
,
'-colorspace'
,
'sRGB'
,
'-depth'
,
'8'
,
'-quality'
,
str
(
quality
),
'-quality'
,
str
(
quality
),
'-geometry'
,
'%sx%s'
%
(
width
,
height
)]
'-geometry'
,
'%sx%s'
%
(
width
,
height
)]
if
format
not
in
VALID_TRANSPARENT_IMAGE_FORMAT_LIST
:
if
format
not
in
VALID_TRANSPARENT_IMAGE_FORMAT_LIST
:
...
...
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