Merge branch 'GD-2.2'

* GD-2.2:
  fix CID 95839
  update
master
Pierre Joye 2016-06-24 09:45:08 +07:00
commit 89520807f1
1 changed files with 2 additions and 7 deletions

View File

@ -1395,13 +1395,8 @@ gdImageScaleBicubicFixed(gdImagePtr src, const unsigned int width,
src_offset_y[0] = m;
}
if (m < 1) {
src_offset_x[1] = n;
src_offset_y[1] = m;
} else {
src_offset_x[1] = n;
src_offset_y[1] = m;
}
src_offset_x[1] = n;
src_offset_y[1] = m;
if ((m < 1) || (n >= src_w - 1)) {
src_offset_x[2] = n;