From: Keith Packard <keithp@keithp.com>
Date: Sun, 12 Jul 2015 02:09:28 +0000 (-0700)
Subject: altoslib: Make AltosMap floor/ceil static. Check transform in paint
X-Git-Tag: 1.6.0.4~15
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=a9bc364ecc69d9085146a39198f0671de164eb2e

altoslib: Make AltosMap floor/ceil static. Check transform in paint

This avoids crashing in paint when no transform has been set yet.

Signed-off-by: Keith Packard <keithp@keithp.com>
---

diff --git a/altoslib/AltosMap.java b/altoslib/AltosMap.java
index d68cff7a..2c93adb8 100644
--- a/altoslib/AltosMap.java
+++ b/altoslib/AltosMap.java
@@ -113,12 +113,12 @@ public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
 		map_interface.debug(format, arguments);
 	}
 
-	public AltosPointInt floor(AltosPointDouble point) {
+	static public AltosPointInt floor(AltosPointDouble point) {
 		return new AltosPointInt ((int) Math.floor(point.x / AltosMap.px_size) * AltosMap.px_size,
 					      (int) Math.floor(point.y / AltosMap.px_size) * AltosMap.px_size);
 	}
 
-	public AltosPointInt ceil(AltosPointDouble point) {
+	static public AltosPointInt ceil(AltosPointDouble point) {
 		return new AltosPointInt ((int) Math.ceil(point.x / AltosMap.px_size) * AltosMap.px_size,
 					      (int) Math.ceil(point.y / AltosMap.px_size) * AltosMap.px_size);
 	}
@@ -357,6 +357,9 @@ public class AltosMap implements AltosMapTileListener, AltosMapStoreListener {
 		if (centre != null)
 			make_tiles();
 
+		if (transform == null)
+			return;
+
 		for (AltosMapTile tile : tiles.values())
 			tile.paint(transform);