Changeset 16992


Ignore:
Timestamp:
Jul 24, 2012, 10:54:52 PM (8 years ago)
Author:
rvelices
Message:

bug 2682: Watermark sizing calculation is made on the requested size not on the final one - fix (merge from trunk)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2.4/include/derivative_params.inc.php

    r16990 r16992  
    289289      $min_size = ImageStdParams::get_watermark()->min_size;
    290290      return $min_size[0]<=$out_size[0]
    291         && $min_size[1]<=$$out_size[1];
     291        || $min_size[1]<=$$out_size[1];
    292292    }
    293293    return false;
Note: See TracChangeset for help on using the changeset viewer.