aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvgeniy Khramtsov <ekhramtsov@process-one.net>2017-09-17 17:34:31 +0300
committerEvgeniy Khramtsov <ekhramtsov@process-one.net>2017-09-17 17:34:31 +0300
commitf435d0a1031f232b39306b534ee9bdafaea8c999 (patch)
tree22efaafb617a693a87ceac0a42129f0f8391b68e
parentIntroduce mod_avatar (diff)
Add GIF support
-rw-r--r--rebar.config2
-rw-r--r--src/mod_avatar.erl17
2 files changed, 15 insertions, 4 deletions
diff --git a/rebar.config b/rebar.config
index ab326390e..0e8213cae 100644
--- a/rebar.config
+++ b/rebar.config
@@ -44,7 +44,7 @@
{tag, "1.0.2"}}}},
{if_var_true, riak, {riakc, ".*", {git, "https://github.com/processone/riak-erlang-client.git",
{tag, "2.5.3"}}}},
- {if_var_true, graphics, {eimp, ".*", {git, "https://github.com/processone/eimp.git"}}},
+ {if_var_true, graphics, {eimp, ".*", {git, "https://github.com/processone/eimp.git", "dc5bfe0"}}},
%% Elixir support, needed to run tests
{if_var_true, elixir, {elixir, ".*", {git, "https://github.com/elixir-lang/elixir",
{tag, {if_version_above, "17", "v1.4.4", "v1.1.1"}}}}},
diff --git a/src/mod_avatar.erl b/src/mod_avatar.erl
index f7b520d2e..6576429f8 100644
--- a/src/mod_avatar.erl
+++ b/src/mod_avatar.erl
@@ -399,6 +399,7 @@ decode_mime_type(MimeType) ->
<<"image/jpeg">> -> jpeg;
<<"image/png">> -> png;
<<"image/webp">> -> webp;
+ <<"image/gif">> -> gif;
_ -> unknown
end.
@@ -414,23 +415,33 @@ have_eimp() -> false.
mod_opt_type({convert, png}) ->
fun(jpeg) -> jpeg;
- (webp) -> webp
+ (webp) -> webp;
+ (gif) -> gif
end;
mod_opt_type({convert, webp}) ->
fun(jpeg) -> jpeg;
- (png) -> png
+ (png) -> png;
+ (gif) -> gif
end;
mod_opt_type({convert, jpeg}) ->
fun(png) -> png;
+ (webp) -> webp;
+ (gif) -> gif
+ end;
+mod_opt_type({convert, gif}) ->
+ fun(png) -> png;
+ (jpeg) -> jpeg;
(webp) -> webp
end;
mod_opt_type({convert, default}) ->
fun(png) -> png;
(webp) -> webp;
- (jpeg) -> jpeg
+ (jpeg) -> jpeg;
+ (gif) -> gif
end;
mod_opt_type(_) ->
[{convert, default},
{convert, webp},
{convert, png},
+ {convert, gif},
{convert, jpeg}].