Mercurial > hg > openttd

diff src/heightmap.cpp @ 11215:10653704cdaa draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r15568) -Cleanup: *allocT/AllocaM doesn't return NULL when allocating fails
author smatz <smatz@openttd.org>
date Tue, 24 Feb 2009 20:59:17 +0000
parents 8da1855e9f14
children 5a50ba45cf24
line wrap: on
line diff
--- a/src/heightmap.cpp
+++ b/src/heightmap.cpp
@@ -137,14 +137,6 @@
 
 	if (map != NULL) {
 		*map = MallocT<byte>(info_ptr->width * info_ptr->height);
-
-		if (*map == NULL) {
-			ShowErrorMessage(STR_PNGMAP_ERR_MISC, STR_PNGMAP_ERROR, 0, 0);
-			fclose(fp);
-			png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
-			return false;
-		}
-
 		ReadHeightmapPNGImageData(*map, png_ptr, info_ptr);
 	}
 
@@ -253,15 +245,7 @@
 		}
 
 		*map = MallocT<byte>(info.width * info.height);
-		if (*map == NULL) {
-			ShowErrorMessage(STR_PNGMAP_ERR_MISC, STR_BMPMAP_ERROR, 0, 0);
-			fclose(f);
-			BmpDestroyData(&data);
-			return false;
-		}
-
 		ReadHeightmapBMPImageData(*map, &info, &data);
-
 	}
 
 	BmpDestroyData(&data);