mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #22288 from nextcloud/techdebt/noid/fix-oc_image-invalid-scalar-arguments 

Cast float/char to int to avoid invalid scalar argument warning
This commit is contained in:
Morris Jobke 2020-08-19 17:55:56 +02:00 committed by GitHub
parent bc2b422508 27e7332a9c
commit 60be722ee8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/psalm-baseline.xml
View File

@ -6036,9 +6036,7 @@
<InvalidReturnType occurrences="1">
<code>bool</code>
</InvalidReturnType>
<InvalidScalarArgument occurrences="19">
<code>$bits</code>
<code>$lastIndex</code>
<InvalidScalarArgument occurrences="17">
<code>$this-&gt;bitDepth</code>
<code>90</code>
<code>$imagePath</code>

4
lib/private/legacy/OC_Image.php
View File

@ -1175,7 +1175,7 @@ if (!function_exists('imagebmp')) {
} elseif ($bit == 32) {
$bit = 24;
}
$bits = pow(2, $bit);
$bits = (int)pow(2, $bit);
imagetruecolortopalette($im, true, $bits);
$width = imagesx($im);
$height = imagesy($im);
@ -1211,7 +1211,7 @@ if (!function_exists('imagebmp')) {
} // RLE8
elseif ($compression == 1 && $bit == 8) {
for ($j = $height - 1; $j >= 0; $j--) {
$lastIndex = "\0";
$lastIndex = 0;
$sameNum = 0;
for ($i = 0; $i <= $width; $i++) {
$index = imagecolorat($im, $i, $j);