Mercurial > hg > nginx

comparison src/http/modules/ngx_http_image_filter_module.c @ 4308:39982fa69482

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed "rotate" to always work when combined with "resize/crop".
author Ruslan Ermilov <ru@nginx.com>
date Wed, 23 Nov 2011 10:22:44 +0000
parents 9f418371831e
children d620f497c50f
comparison
equal deleted inserted replaced
4307:9f418371831e 4308:39982fa69482
1260 return NGX_CONF_OK; 1260 return NGX_CONF_OK;
1261 1261
1262 } else if (cf->args->nelts == 3) { 1262 } else if (cf->args->nelts == 3) {
1263 1263
1264 if (ngx_strcmp(value[i].data, "rotate") == 0) { 1264 if (ngx_strcmp(value[i].data, "rotate") == 0) {
1265 imcf->filter = NGX_HTTP_IMAGE_ROTATE; 1265 if (imcf->filter != NGX_HTTP_IMAGE_RESIZE
1266 && imcf->filter != NGX_HTTP_IMAGE_CROP)
1267 {
1268 imcf->filter = NGX_HTTP_IMAGE_ROTATE;
1269 }
1266 1270
1267 ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t)); 1271 ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t));
1268 1272
1269 ccv.cf = cf; 1273 ccv.cf = cf;
1270 ccv.value = &value[++i]; 1274 ccv.value = &value[++i];