Remove redundant sanity checks (#77)

CelliesProjects · web-flow · commit 25146f971eae · 2025-05-25T10:49:07.000+02:00
diff --git a/src/OpenStreetMap-esp32.cpp b/src/OpenStreetMap-esp32.cpp
@@ -438,9 +438,6 @@ std::optional<std::unique_ptr<MemoryBuffer>> OpenStreetMap::urlToBuffer(const ch
 
 void OpenStreetMap::PNGDraw(PNGDRAW *pDraw)
 {
-    if (!currentInstance || !currentInstance->currentTileBuffer)
-        return;
-
     uint16_t *destRow = currentInstance->currentTileBuffer + (pDraw->y * OSM_TILESIZE);
     getPNGForCore()->getLineAsRGB565(pDraw, destRow, PNG_RGB565_BIG_ENDIAN, 0xffffffff);
 }
@@ -486,10 +483,8 @@ bool OpenStreetMap::fetchTile(CachedTile &tile, uint32_t x, uint32_t y, uint8_t
 
     currentInstance = this;
     currentTileBuffer = tile.buffer;
+    
     const int decodeResult = png->decode(0, PNG_FAST_PALETTE);
-    currentTileBuffer = nullptr;
-    currentInstance = nullptr;
-
     if (decodeResult != PNG_SUCCESS)
     {
         result = "Decoding " + String(url) + " failed with code: " + String(decodeResult);

Original file line number	Diff line number	Diff line change
`@@ -438,9 +438,6 @@ std::optional<std::unique_ptr<MemoryBuffer>> OpenStreetMap::urlToBuffer(const ch`
`438`	`438`
`439`	`439`	`void OpenStreetMap::PNGDraw(PNGDRAW *pDraw)`
`440`	`440`	`{`
`441`		`- if (!currentInstance \|\| !currentInstance->currentTileBuffer)`
`442`		`- return;`
`443`		`-`
`444`	`441`	`uint16_t destRow = currentInstance->currentTileBuffer + (pDraw->y OSM_TILESIZE);`
`445`	`442`	`getPNGForCore()->getLineAsRGB565(pDraw, destRow, PNG_RGB565_BIG_ENDIAN, 0xffffffff);`
`446`	`443`	`}`
`@@ -486,10 +483,8 @@ bool OpenStreetMap::fetchTile(CachedTile &tile, uint32_t x, uint32_t y, uint8_t`
`486`	`483`
`487`	`484`	`currentInstance = this;`
`488`	`485`	`currentTileBuffer = tile.buffer;`
	`486`	`+`
`489`	`487`	`const int decodeResult = png->decode(0, PNG_FAST_PALETTE);`
`490`		`- currentTileBuffer = nullptr;`
`491`		`- currentInstance = nullptr;`
`492`		`-`
`493`	`488`	`if (decodeResult != PNG_SUCCESS)`
`494`	`489`	`{`
`495`	`490`	`result = "Decoding " + String(url) + " failed with code: " + String(decodeResult);`