L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-81256-403' of https://github.com/marinaglancy/moodle into MOODLE_403_STABLE

Browse Source
This commit is contained in:
Huong Nguyen
2024-04-12 08:58:28 +07:00
parent 34d5c59153 0b8ce298cb
commit 1872094df6
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/gdlib.php
+2 -2
View File
@@ -359,8 +359,8 @@ function resize_image_from_image($original, $imageinfo, $width, $height, $forcec
}
if ($ratio < 1) {
$targetwidth = floor($originalwidth * $ratio);
$targetheight = floor($originalheight * $ratio);
$targetwidth = round($originalwidth * $ratio);
$targetheight = round($originalheight * $ratio);
} else {
// Do not enlarge the original file if it is smaller than the requested thumbnail size.
$targetwidth = $originalwidth;
lib/tests/gdlib_test.php
+4 -4
View File
@@ -87,7 +87,7 @@ class gdlib_test extends \basic_testcase {
$newpng = resize_image($pngpath, null, 24);
$this->assertTrue(is_string($newpng));
$imageinfo = getimagesizefromstring($newpng);
$this->assertEquals(89, $imageinfo[0]);
$this->assertEquals(90, $imageinfo[0]);
$this->assertEquals(24, $imageinfo[1]);
$this->assertEquals('image/png', $imageinfo['mime']);
@@ -96,7 +96,7 @@ class gdlib_test extends \basic_testcase {
$this->assertTrue(is_string($newpng));
$imageinfo = getimagesizefromstring($newpng);
$this->assertEquals(100, $imageinfo[0]);
$this->assertEquals(26, $imageinfo[1]);
$this->assertEquals(27, $imageinfo[1]);
$this->assertEquals('image/png', $imageinfo['mime']);
// Preferred width and height.
@@ -121,7 +121,7 @@ class gdlib_test extends \basic_testcase {
$newpng = resize_image_from_image($imageresource, $origimageinfo, null, 24);
$this->assertTrue(is_string($newpng));
$imageinfo = getimagesizefromstring($newpng);
$this->assertEquals(89, $imageinfo[0]);
$this->assertEquals(90, $imageinfo[0]);
$this->assertEquals(24, $imageinfo[1]);
$this->assertEquals('image/png', $imageinfo['mime']);
@@ -131,7 +131,7 @@ class gdlib_test extends \basic_testcase {
$this->assertTrue(is_string($newpng));
$imageinfo = getimagesizefromstring($newpng);
$this->assertEquals(100, $imageinfo[0]);
$this->assertEquals(26, $imageinfo[1]);
$this->assertEquals(27, $imageinfo[1]);
$this->assertEquals('image/png', $imageinfo['mime']);
// Preferred width and height.