From 6ea390f5f048cd5dba23ecaaff3604b5c04162bf Mon Sep 17 00:00:00 2001
From: Peter Harris <peter.harris@arm.com>
Date: Fri, 31 Jul 2026 10:06:26 +0100
Subject: [PATCH] Move -dimage option to diagnostic builds

---
 Docs/ChangeLog-5x.md           |  3 +++
 Source/astcenccli_internal.h   |  2 ++
 Source/astcenccli_toplevel.cpp | 14 ++++++++++++--
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/Docs/ChangeLog-5x.md b/Docs/ChangeLog-5x.md
index 25aaa31d..f9297025 100644
--- a/Docs/ChangeLog-5x.md
+++ b/Docs/ChangeLog-5x.md
@@ -22,6 +22,9 @@ The 5.7.0 release is a minor maintenance release.
   * **Change:** Removed `-repeats` benchmarking option, because we prefer to
     repeat by invoking the command line multiple times. This gives performance
     results closer to what a real user sees.
+  * **Change:** Removed `-dimage` diagnostic images generation option from
+    normal builds. Now only available for builds configured with
+    `ASTCENC_DIAGNOSTICS=ON`.
 
 <!-- ---------------------------------------------------------------------- -->
 ## 5.6.0
diff --git a/Source/astcenccli_internal.h b/Source/astcenccli_internal.h
index a0d34cfc..54a9f0b7 100644
--- a/Source/astcenccli_internal.h
+++ b/Source/astcenccli_internal.h
@@ -81,8 +81,10 @@ struct cli_config_options
 	/** @brief @c true if the images should be y-flipped. */
 	bool y_flip;
 
+#if defined(ASTCENC_DIAGNOSTICS)
 	/** @brief @c true if diagnostic images should be stored. */
 	bool diagnostic_images;
+#endif
 
 	/** @brief The low exposure fstop for error computation. */
 	int low_fstop;
diff --git a/Source/astcenccli_toplevel.cpp b/Source/astcenccli_toplevel.cpp
index 583c1057..fc917f5a 100644
--- a/Source/astcenccli_toplevel.cpp
+++ b/Source/astcenccli_toplevel.cpp
@@ -1172,12 +1172,12 @@ static int edit_astcenc_config(
 
 			config.trace_file_path = argv[argidx - 1];
 		}
-#endif
 		else if (!strcmp(argv[argidx], "-dimage"))
 		{
 			argidx += 1;
 			cli_config.diagnostic_images = true;
 		}
+#endif
 		else // check others as well
 		{
 			print_error("ERROR: Argument '%s' not recognized\n", argv[argidx]);
@@ -1365,6 +1365,7 @@ static void image_set_pixel(
 	data[(4 * img.dim_x * y) + (4 * x + 3)] = pixel.lane<3>();
 }
 
+#if defined(ASTCENC_DIAGNOSTICS)
 /**
  * @brief Set the value of a single pixel in an image.
  *
@@ -1387,6 +1388,7 @@ static void image_set_pixel_u8(
 	uint8_t* data = static_cast<uint8_t*>(img.data[0]);
 	pack_and_store_low_bytes(pixel, data + (4 * img.dim_x * y) + (4 * x));
 }
+#endif
 
 /**
  * @brief Create a copy of @c input with forced unit-length normal vectors.
@@ -1517,6 +1519,7 @@ static void image_preprocess_premultiply(
 	}
 }
 
+#if defined(ASTCENC_DIAGNOSTICS)
 /**
  * @brief Populate a single diagnostic image showing aspects of the encoding.
  *
@@ -1873,6 +1876,7 @@ static void print_diagnostic_images(
 	fname = stem + "_diag_cem_hdr.png";
 	store_ncimage(diag_image.get(), fname.c_str(), false);
 }
+#endif
 
 /**
  * @brief The main entry point.
@@ -1981,7 +1985,11 @@ int astcenc_main(
 
 	// Initialize cli_config_options with default values
 	cli_config_options cli_config {
-		0, 1, false, false, false, -10, 10,
+		0, 1, false, false,
+#if defined(ASTCENC_DIAGNOSTICS)
+		false,
+#endif
+		-10, 10,
 		{ ASTCENC_SWZ_R, ASTCENC_SWZ_G, ASTCENC_SWZ_B, ASTCENC_SWZ_A },
 		{ ASTCENC_SWZ_R, ASTCENC_SWZ_G, ASTCENC_SWZ_B, ASTCENC_SWZ_A }
 	};
@@ -2319,11 +2327,13 @@ int astcenc_main(
 		}
 	}
 
+#if defined(ASTCENC_DIAGNOSTICS)
 	// Store diagnostic images
 	if (cli_config.diagnostic_images && !is_null)
 	{
 		print_diagnostic_images(codec_context.get(), image_comp, output_filename);
 	}
+#endif
 
 	if ((operation & ASTCENC_STAGE_COMPARE) || (!cli_config.silentmode))
 	{