mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Codechange: Replace malloc/free with vector when loading heightmap data.

pull/12907/head
Peter Nelson 2024-08-07 20:54:51 +01:00 committed by Peter Nelson
parent 9a037fe5ae
commit 059462814e
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/heightmap.cpp
View File

@ -75,7 +75,7 @@ static inline uint8_t RGBToGrayscale(uint8_t red, uint8_t green, uint8_t blue)
/** /**
* The PNG Heightmap loader. * The PNG Heightmap loader.
*/ */
static void ReadHeightmapPNGImageData(uint8_t *map, png_structp png_ptr, png_infop info_ptr) static void ReadHeightmapPNGImageData(std::span<uint8_t> map, png_structp png_ptr, png_infop info_ptr)
{ {
uint x, y; uint x, y;
uint8_t gray_palette[256]; uint8_t gray_palette[256];
@ -134,7 +134,7 @@ static void ReadHeightmapPNGImageData(uint8_t *map, png_structp png_ptr, png_inf
* If map == nullptr only the size of the PNG is read, otherwise a map * If map == nullptr only the size of the PNG is read, otherwise a map
* with grayscale pixels is allocated and assigned to *map. * with grayscale pixels is allocated and assigned to *map.
*/ */
static bool ReadHeightmapPNG(const char *filename, uint *x, uint *y, uint8_t **map) static bool ReadHeightmapPNG(const char *filename, uint *x, uint *y, std::vector<uint8_t> *map)
{ {
FILE *fp; FILE *fp;
png_structp png_ptr = nullptr; png_structp png_ptr = nullptr;
@ -188,7 +188,7 @@ static bool ReadHeightmapPNG(const char *filename, uint *x, uint *y, uint8_t **m
} }
if (map != nullptr) { if (map != nullptr) {
*map = MallocT<uint8_t>(static_cast<size_t>(width) * height); map->resize(static_cast<size_t>(width) * height);
ReadHeightmapPNGImageData(*map, png_ptr, info_ptr); ReadHeightmapPNGImageData(*map, png_ptr, info_ptr);
} }
@ -206,7 +206,7 @@ static bool ReadHeightmapPNG(const char *filename, uint *x, uint *y, uint8_t **m
/** /**
* The BMP Heightmap loader. * The BMP Heightmap loader.
*/ */
static void ReadHeightmapBMPImageData(uint8_t *map, const BmpInfo &info, const BmpData &data) static void ReadHeightmapBMPImageData(std::span<uint8_t> map, const BmpInfo &info, const BmpData &data)
{ {
uint8_t gray_palette[256]; uint8_t gray_palette[256];
@ -261,7 +261,7 @@ static void ReadHeightmapBMPImageData(uint8_t *map, const BmpInfo &info, const B
* If map == nullptr only the size of the BMP is read, otherwise a map * If map == nullptr only the size of the BMP is read, otherwise a map
* with grayscale pixels is allocated and assigned to *map. * with grayscale pixels is allocated and assigned to *map.
*/ */
static bool ReadHeightmapBMP(const char *filename, uint *x, uint *y, uint8_t **map) static bool ReadHeightmapBMP(const char *filename, uint *x, uint *y, std::vector<uint8_t> *map)
{ {
FILE *f; FILE *f;
BmpInfo info; BmpInfo info;
@ -295,7 +295,7 @@ static bool ReadHeightmapBMP(const char *filename, uint *x, uint *y, uint8_t **m
return false; return false;
} }
*map = MallocT<uint8_t>(static_cast<size_t>(info.width) * info.height); map->resize(static_cast<size_t>(info.width) * info.height);
ReadHeightmapBMPImageData(*map, info, data); ReadHeightmapBMPImageData(*map, info, data);
} }
@ -313,7 +313,7 @@ static bool ReadHeightmapBMP(const char *filename, uint *x, uint *y, uint8_t **m
* @param img_height the height of the image in pixels/tiles * @param img_height the height of the image in pixels/tiles
* @param map the input map * @param map the input map
*/ */
static void GrayscaleToMapHeights(uint img_width, uint img_height, uint8_t *map) static void GrayscaleToMapHeights(uint img_width, uint img_height, std::span<const uint8_t> map)
{ {
/* Defines the detail of the aspect ratio (to avoid doubles) */ /* Defines the detail of the aspect ratio (to avoid doubles) */
const uint num_div = 16384; const uint num_div = 16384;
@ -474,7 +474,7 @@ void FixSlopes()
* @param[in,out] map If not \c nullptr, destination to store the loaded block of image data. * @param[in,out] map If not \c nullptr, destination to store the loaded block of image data.
* @return Whether loading was successful. * @return Whether loading was successful.
*/ */
static bool ReadHeightMap(DetailedFileType dft, const char *filename, uint *x, uint *y, uint8_t **map) static bool ReadHeightMap(DetailedFileType dft, const char *filename, uint *x, uint *y, std::vector<uint8_t> *map)
{ {
switch (dft) { switch (dft) {
default: default:
@ -513,15 +513,13 @@ bool GetHeightmapDimensions(DetailedFileType dft, const char *filename, uint *x,
bool LoadHeightmap(DetailedFileType dft, const char *filename) bool LoadHeightmap(DetailedFileType dft, const char *filename)
{ {
uint x, y; uint x, y;
uint8_t *map = nullptr; std::vector<uint8_t> map;
if (!ReadHeightMap(dft, filename, &x, &y, &map)) { if (!ReadHeightMap(dft, filename, &x, &y, &map)) {
free(map);
return false; return false;
} }
GrayscaleToMapHeights(x, y, map); GrayscaleToMapHeights(x, y, map);
free(map);
FixSlopes(); FixSlopes();
MarkWholeScreenDirty(); MarkWholeScreenDirty();