Changeset 4601:084137d883ec in nginx

Timestamp:

04/21/12 19:02:21 (6 years ago)

Author:

Maxim Dounin <mdounin@…>

Branch:

default

Convert:

svn:c3fe7df1-7212-e011-8a91-001109144009/trunk@4602

Message:

Image filter: compare aspect ratio more accurately during crop.

Previously used fixed-point calculation caused wrong code path selection
in some cases, resulting in incorrect image size.

See here for report:
​http://mailman.nginx.org/pipermail/nginx-devel/2012-April/002123.html

File:

• src/http/modules/ngx_http_image_filter_module.c (modified) (1 diff)

src/http/modules/ngx_http_image_filter_module.c

@@ -818 +818 @@
         resize = 0;
 
-        if ((ngx_uint_t) (dx * 100 / dy)
-            < ctx->max_width * 100 / ctx->max_height)
-        {
+        if ((double) dx / dy < (double) ctx->max_width / ctx->max_height) {
             if ((ngx_uint_t) dx > ctx->max_width) {
                 dy = dy * ctx->max_width / dx;