From baa11cd7104b5bbf7b7435e7c08be34739c9f765 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 15 Jan 2024 13:47:30 +0900
Subject: [PATCH] [image] Ensure tex fields are all initialized

Designated initializers for the win.
---
 libs/image/pcx.c | 19 ++++++++++---------
 libs/image/png.c |  6 ++++--
 libs/image/tga.c | 11 ++++++-----
 3 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/libs/image/pcx.c b/libs/image/pcx.c
index 031d8a1a0..9fffd9b3d 100644
--- a/libs/image/pcx.c
+++ b/libs/image/pcx.c
@@ -94,17 +94,18 @@ LoadPCX (QFile *f, bool convert, const byte *pal, int load)
 	count = load ? (pcx->xmax + 1) * (pcx->ymax + 1) : 0;
 	if (convert) {
 		tex = Hunk_TempAlloc (0, sizeof (tex_t) + count * 3);
-		tex->data = (byte *) (tex + 1);
-		tex->format = tex_rgb;
-		tex->palette = 0;
+		*tex = (tex_t) {
+			.data = (byte *) (tex + 1),
+			.format = tex_rgb,
+			.palette = 0,
+		};
 	} else {
 		tex = Hunk_TempAlloc (0, sizeof (tex_t) + count);
-		tex->data = (byte *) (tex + 1);
-		tex->format = tex_palette;
-		if (pal)
-			tex->palette = pal;
-		else
-			tex->palette = palette;
+		*tex = (tex_t) {
+			.data = (byte *) (tex + 1),
+			.format = tex_palette,
+			.palette = pal ? pal : palette,
+		};
 	}
 	tex->width = pcx->xmax + 1;
 	tex->height = pcx->ymax + 1;
diff --git a/libs/image/png.c b/libs/image/png.c
index 83a443472..3f76558e0 100644
--- a/libs/image/png.c
+++ b/libs/image/png.c
@@ -164,10 +164,12 @@ LoadPNG (QFile *infile, int load)
 		/* Allocate tex_t structure */
 		rowbytes = png_get_rowbytes(png_ptr, info_ptr);
 		tex = Hunk_TempAlloc (0, sizeof (tex_t) + height * rowbytes);
-		tex->data = (byte *) (tex + 1);
+		*tex = (tex_t) {
+			.data = (byte *) (tex + 1),
+		};
 	} else {
 		tex = Hunk_TempAlloc (0, sizeof (tex_t));
-		tex->data = 0;
+		*tex = (tex_t) { };
 	}
 
 	tex->width = width;
diff --git a/libs/image/tga.c b/libs/image/tga.c
index 03368ce6f..4fbdf35ed 100644
--- a/libs/image/tga.c
+++ b/libs/image/tga.c
@@ -663,11 +663,12 @@ LoadTGA (QFile *fin, int load)
 		numPixels = 0;
 	}
 	tex = Hunk_TempAlloc (0, sizeof (tex_t) + numPixels * 4);
-	tex->data = (byte *) (tex + 1);
-	tex->width = targa->width;
-	tex->height = targa->height;
-	tex->palette = 0;
-	tex->loaded = load;
+	*tex = (tex_t) {
+		.width = targa->width,
+		.height = targa->height,
+		.loaded = load,
+		.data = (byte *) (tex + 1),
+	};
 
 	if (load) {
 		// skip TARGA image comment