Merge branch upstream/master

2021-11-28 01:58:25 +02:00
parent a4d0bf46fa bde5396d11
commit 1b5bd52d8f
18 changed files with 134 additions and 40 deletions
--- a/src/spritecache.cpp
+++ b/src/spritecache.cpp
@@ -229,7 +229,7 @@ static void ResizeSpriteOut(SpriteLoader::Sprite *sprite, ZoomLevel zoom)

 	SpriteLoader::CommonPixel *dst = sprite[zoom].data;
 	const SpriteLoader::CommonPixel *src = sprite[zoom - 1].data;
-#ifndef NDEBUG
+#ifdef WITH_ASSERT
 	const SpriteLoader::CommonPixel *src_end = src + sprite[zoom - 1].height * sprite[zoom - 1].width;
 #endif