From 78cd2b01236a3eccaab185de24fda9d996d6ecca Mon Sep 17 00:00:00 2001
From: Mark Callow <2244683+MarkCallow@users.noreply.github.com>
Date: Wed, 5 May 2021 06:01:19 -0700
Subject: [PATCH] Fix validation errors (#417)

* Change Metadata.ValueNotNulTerminated to warning.

* Fix typo in KTXmetalPixelFormat key.
---
 tools/ktx2check/ktx2check.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tools/ktx2check/ktx2check.cpp b/tools/ktx2check/ktx2check.cpp
index 39d88ad269..4869939b55 100644
--- a/tools/ktx2check/ktx2check.cpp
+++ b/tools/ktx2check/ktx2check.cpp
@@ -345,7 +345,7 @@ struct {
         ERROR | 0x0087, "Unrecognized metadata \"%s\" found with KTX or ktx prefix found."
     };
     issue ValueNotNulTerminated {
-        ERROR | 0x0088, "%s value missing required NUL termination."
+        WARNING | 0x0088, "%s value missing encouraged NUL termination."
     };
     issue InvalidValue {
         ERROR | 0x0089, "%s has invalid value."
@@ -748,7 +748,7 @@ vector<ktxValidator::metadataValidator> ktxValidator::metadataValidators {
     { "KTXorientation", &ktxValidator::validateOrientation },
     { "KTXglFormat", &ktxValidator::validateGlFormat },
     { "KTXdxgiFormat__", &ktxValidator::validateDxgiFormat },
-    { "KTXMetalPixelFormat", &ktxValidator::validateMetalPixelFormat },
+    { "KTXmetalPixelFormat", &ktxValidator::validateMetalPixelFormat },
     { "KTXswizzle", &ktxValidator::validateSwizzle },
     { "KTXwriter", &ktxValidator::validateWriter },
     { "KTXwriterScParams", &ktxValidator::validateWriterScParams },
@@ -1638,7 +1638,7 @@ ktxValidator::validateOrientation(validationContext& ctx, char* key,
     }
 
     if (value[valueLen-1] != '\0')
-        addIssue(logger::eError, Metadata.ValueNotNulTerminated, key);
+        addIssue(logger::eWarning, Metadata.ValueNotNulTerminated, key);
 
     if (valueLen != ctx.dimensionCount + 1)
         addIssue(logger::eError, Metadata.InvalidValue, key);
@@ -1687,7 +1687,7 @@ ktxValidator::validateSwizzle(validationContext& ctx, char* key,
                               uint8_t* value, uint32_t valueLen)
 {
     if (value[valueLen-1] != '\0')
-        addIssue(logger::eError, Metadata.ValueNotNulTerminated, key);
+        addIssue(logger::eWarning, Metadata.ValueNotNulTerminated, key);
     if (!regex_match((char*)value, regex("^[rgba01]{4}$")))
         addIssue(logger::eError, Metadata.InvalidValue, key);
 }
@@ -1697,7 +1697,7 @@ ktxValidator::validateWriter(validationContext& ctx, char* key,
                              uint8_t* value, uint32_t valueLen)
 {
     if (value[valueLen-1] != '\0')
-        addIssue(logger::eError, Metadata.ValueNotNulTerminated, key);
+        addIssue(logger::eWarning, Metadata.ValueNotNulTerminated, key);
 }
 
 void
@@ -1705,7 +1705,7 @@ ktxValidator::validateWriterScParams(validationContext& ctx, char* key,
                                      uint8_t* value, uint32_t valueLen)
 {
     if (value[valueLen-1] != '\0')
-        addIssue(logger::eError, Metadata.ValueNotNulTerminated, key);
+        addIssue(logger::eWarning, Metadata.ValueNotNulTerminated, key);
 }
 
 void