Mercurial > hg > nginx-vendor-current
comparison src/http/modules/ngx_http_image_filter_module.c @ 620:b4dcae568a2a NGINX_1_0_0
nginx 1.0.0
*) Bugfix: a cache manager might hog CPU after reload.
Thanks to Maxim Dounin.
*) Bugfix: an "image_filter crop" directive worked incorrectly coupled
with an "image_filter rotate 180" directive.
*) Bugfix: a "satisfy any" directive disabled custom 401 error page.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Tue, 12 Apr 2011 00:00:00 +0400 |
parents | b9763778e212 |
children | d4da38525468 |
comparison
equal
deleted
inserted
replaced
619:c4e0de226b0b | 620:b4dcae568a2a |
---|---|
861 gdImageDestroy(src); | 861 gdImageDestroy(src); |
862 return NULL; | 862 return NULL; |
863 } | 863 } |
864 gdImageCopyRotated(dst, src, dy/2, dx/2, 0, 0, dx, dy, ctx->angle); | 864 gdImageCopyRotated(dst, src, dy/2, dx/2, 0, 0, dx, dy, ctx->angle); |
865 gdImageDestroy(src); | 865 gdImageDestroy(src); |
866 | |
867 t = dx; | |
868 dx = dy; | |
869 dy = t; | |
866 break; | 870 break; |
867 | 871 |
868 case 180: | 872 case 180: |
869 dst = ngx_http_image_new(r, dx, dy, palette); | 873 dst = ngx_http_image_new(r, dx, dy, palette); |
870 if (dst == NULL) { | 874 if (dst == NULL) { |
873 } | 877 } |
874 gdImageCopyRotated(dst, src, dx/2, dy/2, 0, 0, dx, dy, ctx->angle); | 878 gdImageCopyRotated(dst, src, dx/2, dy/2, 0, 0, dx, dy, ctx->angle); |
875 gdImageDestroy(src); | 879 gdImageDestroy(src); |
876 break; | 880 break; |
877 } | 881 } |
878 | |
879 t = dx; | |
880 dx = dy; | |
881 dy = t; | |
882 } | 882 } |
883 | 883 |
884 if (conf->filter == NGX_HTTP_IMAGE_CROP) { | 884 if (conf->filter == NGX_HTTP_IMAGE_CROP) { |
885 | 885 |
886 src = dst; | 886 src = dst; |