Fix Bug: OSError: cannot write mode RGBA as JPEG
Brightcells
共有 2 个文件被更改，包括 9 次插入 和 9 次删除
+ 7
- 7
requirements.txt
@@ -11,7 +11,7 @@ django-curtail-uuid==1.0.0 |
||
| 11 | 11 |
django-detect==1.0.5 |
| 12 | 12 |
django-file-md5==1.0.1 |
| 13 | 13 |
django-ip==1.0.0 |
| 14 |
-django-json-response==1.1.4 |
|
| 14 |
+django-json-response==1.1.5 |
|
| 15 | 15 |
django-logit==1.0.6 |
| 16 | 16 |
django-multidomain==1.1.4 |
| 17 | 17 |
django-paginator2==1.0.3 |
@@ -19,7 +19,7 @@ django-rlog==1.0.7 |
||
| 19 | 19 |
django-shortuuidfield==0.1.3 |
| 20 | 20 |
django-six==1.0.2 |
| 21 | 21 |
django-uniapi==1.0.0 |
| 22 |
-django-we==1.0.1 |
|
| 22 |
+django-we==1.0.3 |
|
| 23 | 23 |
djangorestframework==3.6.3 |
| 24 | 24 |
furl==1.0.0 |
| 25 | 25 |
hiredis==0.2.0 |
@@ -30,15 +30,15 @@ pep8==1.7.0 |
||
| 30 | 30 |
pysnippets==1.0.4 |
| 31 | 31 |
pywe-jssdk==1.0.2 |
| 32 | 32 |
pywe-miniapp==1.0.0 |
| 33 |
-pywe-oauth==1.0.3 |
|
| 34 |
-pywe-pay==1.0.5 |
|
| 33 |
+pywe-oauth==1.0.4 |
|
| 34 |
+pywe-pay==1.0.6 |
|
| 35 | 35 |
pywe-pay-notify==1.0.1 |
| 36 | 36 |
pywe-response==1.0.1 |
| 37 |
-pywe-sign==1.0.5 |
|
| 37 |
+pywe-sign==1.0.6 |
|
| 38 | 38 |
pywe-xml==1.0.0 |
| 39 | 39 |
qiniu==7.1.4 |
| 40 |
-redis-extensions==1.0.50 |
|
| 41 |
-requests==2.18.1 |
|
| 40 |
+redis-extensions==1.1.1 |
|
| 41 |
+requests==2.18.2 |
|
| 42 | 42 |
rlog==0.2 |
| 43 | 43 |
shortuuid==0.5.0 |
| 44 | 44 |
uWSGI==2.0.15 |
+ 2
- 2
utils/watermark_utils.py
@@ -21,8 +21,8 @@ def watermark(im, mark, position, opacity=1, maxsize=(0, 0), possize=(0, 0)): |
||
| 21 | 21 |
""" Add watermark to image """ |
| 22 | 22 |
if opacity < 1: |
| 23 | 23 |
mark = reduce_opacity(mark, opacity) |
| 24 |
- if im.mode != 'RGBA': |
|
| 25 |
- im = im.convert('RGBA')
|
|
| 24 |
+ # if im.mode != 'RGBA': |
|
| 25 |
+ # im = im.convert('RGBA')
|
|
| 26 | 26 |
# Resize mark |
| 27 | 27 |
w, h = int(min(mark.size[0], maxsize[0]) if maxsize[0] else mark.size[0]), int(min(mark.size[1], maxsize[1]) if maxsize[1] else mark.size[1]) |
| 28 | 28 |
mark = mark.resize((w, h)) |