...where fb6f2e11 "Resolves: #i121407# Gallery
reorganizations..." first cherry-picked the younger 8012fae6cedcf325130d70adf0a486e8918f452f
before f7d373d1 "Added ColorDepth change test with assertion to
the Bitmap::Scale method" then cherry-picked the older 4be8cc07,
leading to the two checks at the top of Bitmap::Scale to not return early as intended.

Thanks to clang-tidy clang-analyzer-deadcode.DeadStores for flagging this.

Change-Id: Id89cc517a9f7efdff040c70f3b0e640d969cf24d
(cherry picked from commit 0aa9cd69)
Reviewed-on: https://gerrit.libreoffice.org/18310Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>