From 1e5f2391704c252fcd01f798a18aa8558376cb1a Mon Sep 17 00:00:00 2001 From: Ruslan Ermilov Date: Wed, 23 Nov 2011 10:22:44 +0000 Subject: Fixed "rotate" to always work when combined with "resize/crop". --- src/http/modules/ngx_http_image_filter_module.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/http/modules') diff --git a/src/http/modules/ngx_http_image_filter_module.c b/src/http/modules/ngx_http_image_filter_module.c index f0c711e29..66ed34541 100644 --- a/src/http/modules/ngx_http_image_filter_module.c +++ b/src/http/modules/ngx_http_image_filter_module.c @@ -1262,7 +1262,11 @@ ngx_http_image_filter(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) } else if (cf->args->nelts == 3) { if (ngx_strcmp(value[i].data, "rotate") == 0) { - imcf->filter = NGX_HTTP_IMAGE_ROTATE; + if (imcf->filter != NGX_HTTP_IMAGE_RESIZE + && imcf->filter != NGX_HTTP_IMAGE_CROP) + { + imcf->filter = NGX_HTTP_IMAGE_ROTATE; + } ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t)); -- cgit