Constify the flags

Signed-off-by: Kevin Wheatley <kevin.wheatley@framestore.com>
AcademySoftwareFoundation · Dec 20, 2024 · b60bffc · b60bffc
1 parent 09d0cbe
commit b60bffc
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/include/OpenColorIO/OpenColorIO.h b/include/OpenColorIO/OpenColorIO.h
@@ -1536,7 +1536,7 @@ class OCIOEXPORT Config
      * \param ostream The output stream to write to.
      * \param flags Flags top control archive creation
      */
-    void archive(std::ostream & ostream, ArchiveFlags flags) const;
+    void archive(std::ostream & ostream, const ArchiveFlags & flags) const;
 
     //TODO: document
     void GetAllFileReferences(std::set<std::string> & files) const;

diff --git a/src/OpenColorIO/Config.cpp b/src/OpenColorIO/Config.cpp
@@ -5607,7 +5607,7 @@ bool Config::isArchivable(bool minimal) const
     return true;
 }
 
-void Config::archive(std::ostream & ostream, ArchiveFlags flags) const
+void Config::archive(std::ostream & ostream, const ArchiveFlags & flags) const
 {
     // Using utility functions in OCIOZArchive.cpp.
     archiveConfig(ostream, *this, getCurrentContext()->getWorkingDir(), flags);

diff --git a/src/OpenColorIO/OCIOZArchive.cpp b/src/OpenColorIO/OCIOZArchive.cpp
@@ -267,15 +267,15 @@ ArchiveFlags EnvironmentOverride(ArchiveFlags oFlags) // TODO: test override
     return oFlags;
 }
 
-void archiveConfig(std::ostream & ostream, const Config & config, const char * configWorkingDirectory, ArchiveFlags flags)
+void archiveConfig(std::ostream & ostream, const Config & config, const char * configWorkingDirectory, const ArchiveFlags & archiveFlags)
 {
     void * archiver = nullptr;
     void *write_mem_stream = NULL;
     const uint8_t *buffer_ptr = NULL;
     int32_t buffer_size = 0;
     mz_zip_file file_info;
 
-    flags = EnvironmentOverride(flags);
+    ArchiveFlags flags = EnvironmentOverride(archiveFlags);
     const bool minimal = HasFlag(flags, ARCHIVE_FLAGS_MINIMAL);
 
     if (!config.isArchivable(minimal)) // TODO: pass in flags?

diff --git a/src/OpenColorIO/OCIOZArchive.h b/src/OpenColorIO/OCIOZArchive.h
@@ -23,13 +23,13 @@ namespace OCIO_NAMESPACE
  * \param ostream Output stream to write the data into.
  * \param config Config object.
  * \param configWorkingDirectory Working directory of the current config.
- * \param flags Archive flags used to .
+ * \param archiveFlags Archive flags used to configure archive generation.
  */
 void archiveConfig(
     std::ostream & ostream, 
     const Config & config, 
     const char * configWorkingDirectory,
-    ArchiveFlags flags);
+    const ArchiveFlags & archiveFlags);
 
 /**
  * \brief Get the content of a file inside an OCIOZ archive as a buffer.