Merge tag '1.11.1' into 1.11

2021-04-25 22:58:47 +03:00
parent 6ad10ffb54 0be22efffc
commit 561ce3ee7f
150 changed files with 1525 additions and 616 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