diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2018-01-26 15:40:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-26 15:40:44 +0100 |
| commit | 4c38d1ed01a180b2c086571ab1b6167c173c203b (patch) | |
| tree | c0f5ffb382534fb468193f453499aa69c4aa5cf9 /lib/private/legacy | |
| parent | ca493ab5b1288d53f203d74117a8e636a606e633 (diff) | |
| parent | 9ff51aafc518460e6c45996f09e9fe74e5f8d2e8 (diff) | |
| download | nextcloud-server-4c38d1ed01a180b2c086571ab1b6167c173c203b.tar.gz nextcloud-server-4c38d1ed01a180b2c086571ab1b6167c173c203b.zip | |
Merge pull request #8054 from nextcloud/substr-use-index
Use index based string access for substr with length of 1
Diffstat (limited to 'lib/private/legacy')
| -rw-r--r-- | lib/private/legacy/image.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/private/legacy/image.php b/lib/private/legacy/image.php index 6ad9426a717..eeee3b24073 100644 --- a/lib/private/legacy/image.php +++ b/lib/private/legacy/image.php @@ -784,16 +784,16 @@ class OC_Image implements \OCP\IImage { $color[1] = (($color[1] & 0xf800) >> 8) * 65536 + (($color[1] & 0x07e0) >> 3) * 256 + (($color[1] & 0x001f) << 3); break; case 8: - $color = @unpack('n', $vide . substr($data, $p, 1)); + $color = @unpack('n', $vide . ($data[$p] ?? '')); $color[1] = (isset($palette[$color[1] + 1])) ? $palette[$color[1] + 1] : $palette[1]; break; case 4: - $color = @unpack('n', $vide . substr($data, floor($p), 1)); + $color = @unpack('n', $vide . ($data[floor($p)] ?? '')); $color[1] = ($p * 2) % 2 == 0 ? $color[1] >> 4 : $color[1] & 0x0F; $color[1] = (isset($palette[$color[1] + 1])) ? $palette[$color[1] + 1] : $palette[1]; break; case 1: - $color = @unpack('n', $vide . substr($data, floor($p), 1)); + $color = @unpack('n', $vide . ($data[floor($p)] ?? '')); switch (($p * 8) % 8) { case 0: $color[1] = $color[1] >> 7; |