Add convert command (#1099)

For converting ktx v1 files.

Fixes formatting error in encode man page (doxygen).

Author: MarkCallow

README.md

@@ -39,6 +39,7 @@ Javascript wrapper for Basis Universal formats. For use with KTX parsers written
 [`interface/java_binding`](https://github.com/KhronosGroup/KTX-Software/tree/main/interface/java_binding)
 - *ktx* - a generic command line tool for managing KTX2 files with subcommands.[`tools/ktx`](https://github.com/KhronosGroup/KTX-Software/tree/main/tools/ktx)
   - *ktx compare* - Compare two KTX2 files
+  - *ktx convert* - Convert other texture file types to KTX2
   - *ktx create* - Create a KTX2 file from various input files
   - *ktx deflate* - Deflate a KTX2 file with zstd or ZLIB
   - *ktx extract* - Export selected images from a KTX2 file

cmake/docs.cmake

@@ -166,6 +166,7 @@ function( CreateDocTools )
         tools.doc
         tools/ktx/ktx_main.cpp
         tools/ktx/command_compare.cpp
+        tools/ktx/command_convert.cpp
         tools/ktx/command_create.cpp
         tools/ktx/command_deflate.cpp
         tools/ktx/command_encode.cpp

external/dfdutils/.gitrepo

@@ -6,7 +6,7 @@
 [subrepo]
 	remote = https://github.com/KhronosGroup/dfdutils.git
 	branch = main
-	commit = 854792a6ced4cb7cce64f26bf297bf7ea294a9b6
-	parent = 928612a718eaaf0a47e8ae6e5b74b13ac16637b1
+	commit = c802c1b6849d05d1f23d1cdc3c0569c8dd3663f6
+	parent = 5a07bc6f8eb95b6ea5b636903b335947d4684cef
 	method = merge
-	cmdver = 0.4.3
+	cmdver = 0.4.9

tests/cts

@@ -7,6 +7,7 @@ add_executable(ktxtools
         command.cpp
         command.h
         command_compare.cpp
+        command_convert.cpp
         command_create.cpp
         command_deflate.cpp
         command_encode.cpp
@@ -30,6 +31,8 @@ add_executable(ktxtools
         validate.cpp
         validate.h
         validation_messages.h
+        # Until the API is public
+        ${PROJECT_SOURCE_DIR}/lib/src/glformat_str.c
 )
 
 create_version_header(tools/ktx ktxtools)

tools/ktx/CMakeLists.txt

@@ -162,8 +162,10 @@ OutputStream::OutputStream(const std::string& filepath, Reporter& report) :
 }
 
 OutputStream::~OutputStream() {
-    if (file != stdout)
+    if (file != stdout) {
         fclose(file);
+        if (removeAtDestruct) std::filesystem::remove(DecodeUTF8Path(filepath).c_str());
+    }
 }
 
 void OutputStream::write(const char* data, std::size_t size, Reporter& report) {

tools/ktx/command.cpp

@@ -262,6 +262,7 @@ struct OptionsSingleIn {
     }
 };
 
+template<bool OUTPUT_FILE_OPTIONAL = false>
 struct OptionsSingleInSingleOut {
     std::string inputFilepath;
     std::string outputFilepath;
@@ -285,7 +286,7 @@ struct OptionsSingleInSingleOut {
         if (args.count("stdin") + args.count("input-file") > 1)
             report.fatal_usage("Conflicting options: Only one can be specified from <input-file> and --stdin.");
 
-        if (args.count("stdout") + args.count("output-file") == 0)
+        if (args.count("stdout") + args.count("output-file") == 0 && !OUTPUT_FILE_OPTIONAL)
             report.fatal_usage("Missing output file. Either <output-file> or --stdout must be specified.");
         if (args.count("stdout") + args.count("output-file") > 1)
             report.fatal_usage("Conflicting options: Only one can be specified from <output-file> and --stdout.");
@@ -297,7 +298,7 @@ struct OptionsSingleInSingleOut {
 
         if (args.count("stdout"))
             outputFilepath = "-";
-        else
+        else if (args.count("output-file"))
             outputFilepath = args["output-file"].as<std::string>();
     }
 };
@@ -383,8 +384,10 @@ class InputStream {
 
 /// Helper to handle stdout and fstream uniformly
 class OutputStream {
+protected:
     std::string filepath;
     FILE* file;
+    bool removeAtDestruct = false;
     // std::ostream* activeStream = nullptr;
     // std::ofstream file; // Unused for stdin/stdout
 
@@ -396,6 +399,9 @@ class OutputStream {
         return filepath;
     }
 
+    bool isStdout() { return (file == stdout); }
+    void flush() { fflush(file); }
+    void removeOnDestruct() { removeAtDestruct = true; }
     void writeKTX2(ktxTexture* texture, Reporter& report);
     void write(const char* data, std::size_t size, Reporter& report);
 };