Clean up enum declarations in OpenEXRCore (AcademySoftwareFoundation#…

…1134) * Clean up enum declarations in OpenEXRCore * Add "exr_" prefix to transcoding_pipeline_buffer_id, and add typedef * Add typedef for exr_default_write_mode (exr_default_write_mode_t) * Add typedef for exr_attr_list_access_mode (exr_attr_list_access_mode_t) Signed-off-by: Cary Phillips <[email protected]> * cleanup Signed-off-by: Cary Phillips <[email protected]> * cleanup #2 Signed-off-by: Cary Phillips <[email protected]> * Restore enum names, in addition to typedefs Signed-off-by: Cary Phillips <[email protected]>
cary-ilm · Sep 2, 2021 · e5542c3 · e5542c3
1 parent 83fcc0d
commit e5542c3
Show file tree

Hide file tree

Showing 10 changed files with 57 additions and 57 deletions.
diff --git a/src/lib/OpenEXRCore/coding.c b/src/lib/OpenEXRCore/coding.c
@@ -136,10 +136,10 @@ internal_coding_update_channel_info (
 
 exr_result_t
 internal_encode_free_buffer (
-    exr_encode_pipeline_t*              encode,
-    enum transcoding_pipeline_buffer_id bufid,
-    void**                              buf,
-    size_t*                             sz)
+    exr_encode_pipeline_t*                  encode,
+    exr_transcoding_pipeline_buffer_id_t    bufid,
+    void**                                  buf,
+    size_t*                                 sz)
 {
     void*  curbuf = *buf;
     size_t cursz  = *sz;
@@ -165,11 +165,11 @@ internal_encode_free_buffer (
 
 exr_result_t
 internal_encode_alloc_buffer (
-    exr_encode_pipeline_t*              encode,
-    enum transcoding_pipeline_buffer_id bufid,
-    void**                              buf,
-    size_t*                             cursz,
-    size_t                              newsz)
+    exr_encode_pipeline_t*               encode,
+    exr_transcoding_pipeline_buffer_id_t bufid,
+    void**                               buf,
+    size_t*                              cursz,
+    size_t                               newsz)
 {
     void* curbuf = *buf;
     if (newsz == 0)
@@ -218,10 +218,10 @@ internal_encode_alloc_buffer (
 
 exr_result_t
 internal_decode_free_buffer (
-    exr_decode_pipeline_t*              decode,
-    enum transcoding_pipeline_buffer_id bufid,
-    void**                              buf,
-    size_t*                             sz)
+    exr_decode_pipeline_t*               decode,
+    exr_transcoding_pipeline_buffer_id_t bufid,
+    void**                               buf,
+    size_t*                              sz)
 {
     void*  curbuf = *buf;
     size_t cursz  = *sz;
@@ -247,11 +247,11 @@ internal_decode_free_buffer (
 
 exr_result_t
 internal_decode_alloc_buffer (
-    exr_decode_pipeline_t*              decode,
-    enum transcoding_pipeline_buffer_id bufid,
-    void**                              buf,
-    size_t*                             cursz,
-    size_t                              newsz)
+    exr_decode_pipeline_t*               decode,
+    exr_transcoding_pipeline_buffer_id_t bufid,
+    void**                               buf,
+    size_t*                              cursz,
+    size_t                               newsz)
 {
     void* curbuf = *buf;
     if (!curbuf || *cursz < newsz)

diff --git a/src/lib/OpenEXRCore/context.c b/src/lib/OpenEXRCore/context.c
@@ -279,7 +279,7 @@ exr_result_t
 exr_start_write (
     exr_context_t*                   ctxt,
     const char*                      filename,
-    enum exr_default_write_mode      default_mode,
+    exr_default_write_mode_t         default_mode,
     const exr_context_initializer_t* initdata)
 {
     int                           rv    = EXR_ERR_UNKNOWN;

diff --git a/src/lib/OpenEXRCore/internal_coding.h b/src/lib/OpenEXRCore/internal_coding.h
@@ -82,30 +82,30 @@ exr_result_t internal_validate_next_chunk (
 /**************************************/
 
 exr_result_t internal_encode_free_buffer (
-    exr_encode_pipeline_t*              encode,
-    enum transcoding_pipeline_buffer_id bufid,
-    void**                              buf,
-    size_t*                             sz);
+    exr_encode_pipeline_t*               encode,
+    exr_transcoding_pipeline_buffer_id_t bufid,
+    void**                               buf,
+    size_t*                              sz);
 
 exr_result_t internal_encode_alloc_buffer (
-    exr_encode_pipeline_t*              encode,
-    enum transcoding_pipeline_buffer_id bufid,
-    void**                              buf,
-    size_t*                             cursz,
-    size_t                              newsz);
+    exr_encode_pipeline_t*               encode,
+    exr_transcoding_pipeline_buffer_id_t bufid,
+    void**                               buf,
+    size_t*                              cursz,
+    size_t                               newsz);
 
 exr_result_t internal_decode_free_buffer (
-    exr_decode_pipeline_t*              decode,
-    enum transcoding_pipeline_buffer_id bufid,
-    void**                              buf,
-    size_t*                             sz);
+    exr_decode_pipeline_t*               decode,
+    exr_transcoding_pipeline_buffer_id_t bufid,
+    void**                               buf,
+    size_t*                              sz);
 
 exr_result_t internal_decode_alloc_buffer (
-    exr_decode_pipeline_t*              decode,
-    enum transcoding_pipeline_buffer_id bufid,
-    void**                              buf,
-    size_t*                             cursz,
-    size_t                              newsz);
+    exr_decode_pipeline_t*               decode,
+    exr_transcoding_pipeline_buffer_id_t bufid,
+    void**                               buf,
+    size_t*                              cursz,
+    size_t                               newsz);
 
 /**************************************/
 

diff --git a/src/lib/OpenEXRCore/openexr_coding.h b/src/lib/OpenEXRCore/openexr_coding.h
@@ -19,7 +19,7 @@ extern "C" {
  * (that is, so the implementor knows whether to allocate on which
  * device based on the buffer disposition).
  */
-enum transcoding_pipeline_buffer_id
+typedef enum exr_transcoding_pipeline_buffer_id
 {
     EXR_TRANSCODE_BUFFER_PACKED,
     EXR_TRANSCODE_BUFFER_UNPACKED,
@@ -28,7 +28,7 @@ enum transcoding_pipeline_buffer_id
     EXR_TRANSCODE_BUFFER_SCRATCH2,
     EXR_TRANSCODE_BUFFER_PACKED_SAMPLES,
     EXR_TRANSCODE_BUFFER_SAMPLES
-};
+} exr_transcoding_pipeline_buffer_id_t;
 
 /** @brief Struct for negotiating buffers when decoding/encoding
  * chunks of data.

diff --git a/src/lib/OpenEXRCore/openexr_context.h b/src/lib/OpenEXRCore/openexr_context.h
@@ -353,13 +353,13 @@ EXR_EXPORT exr_result_t exr_start_read (
     const exr_context_initializer_t* ctxtdata);
 
 /** @brief Enum describing how default files are handled during write. */
-enum exr_default_write_mode
+typedef enum exr_default_write_mode
 {
     EXR_WRITE_FILE_DIRECTLY =
         0, /**< Overwrite filename provided directly, deleted upon error. */
     EXR_INTERMEDIATE_TEMP_FILE =
-        1 /**< Create a temporary file, renaming it upon successful write, leaving original upon error. */
-};
+        1 /**< Create a temporary file, renaming it upon successful write, leaving original upon error */
+} exr_default_write_mode_t;
 
 /** @brief Create and initialize a write-only context. 
  *
@@ -402,7 +402,7 @@ enum exr_default_write_mode
 EXR_EXPORT exr_result_t exr_start_write (
     exr_context_t*                   ctxt,
     const char*                      filename,
-    enum exr_default_write_mode      default_mode,
+    exr_default_write_mode_t         default_mode,
     const exr_context_initializer_t* ctxtdata);
 
 /** @brief Create a new context for updating an exr file in place.

diff --git a/src/lib/OpenEXRCore/openexr_decode.h b/src/lib/OpenEXRCore/openexr_decode.h
@@ -178,13 +178,13 @@ typedef struct _exr_decode_pipeline
      * decoding on a GPU). If `NULL`, will use the allocator from the
      * context.
      */
-    void* (*alloc_fn) (enum transcoding_pipeline_buffer_id, size_t);
+    void* (*alloc_fn) (exr_transcoding_pipeline_buffer_id_t, size_t);
 
     /** Enable a custom allocator for the different buffers (if
      * decoding on a GPU). If `NULL`, will use the allocator from the
      * context.
      */
-    void (*free_fn) (enum transcoding_pipeline_buffer_id, void*);
+    void (*free_fn) (exr_transcoding_pipeline_buffer_id_t, void*);
 
     /** Function chosen to read chunk data from the context.
      *

diff --git a/src/lib/OpenEXRCore/openexr_encode.h b/src/lib/OpenEXRCore/openexr_encode.h
@@ -211,13 +211,13 @@ typedef struct _exr_encode_pipeline
      * encoding on a GPU). If `NULL`, will use the allocator from the
      * context.
      */
-    void* (*alloc_fn) (enum transcoding_pipeline_buffer_id, size_t);
+    void* (*alloc_fn) (exr_transcoding_pipeline_buffer_id_t, size_t);
 
     /** Enable a custom allocator for the different buffers (if
      * encoding on a GPU). If `NULL`, will use the allocator from the
      * context.
      */
-    void (*free_fn) (enum transcoding_pipeline_buffer_id, void*);
+    void (*free_fn) (exr_transcoding_pipeline_buffer_id_t, void*);
 
     /** Function chosen based on the output layout of the channels of the part to
      * decompress data.

diff --git a/src/lib/OpenEXRCore/openexr_part.h b/src/lib/OpenEXRCore/openexr_part.h
@@ -162,17 +162,17 @@ EXR_EXPORT exr_result_t exr_get_chunk_unpacked_size (
 EXR_EXPORT exr_result_t exr_get_attribute_count (
     exr_const_context_t ctxt, int part_index, int32_t* count);
 
-enum exr_attr_list_access_mode
+typedef enum exr_attr_list_access_mode
 {
-    EXR_ATTR_LIST_FILE_ORDER,  /**< Order they appear in the file. */
-    EXR_ATTR_LIST_SORTED_ORDER /**< Alphabetically sorted. */
-};
+    EXR_ATTR_LIST_FILE_ORDER,  /**< Order they appear in the file */
+    EXR_ATTR_LIST_SORTED_ORDER /**< Alphabetically sorted */
+} exr_attr_list_access_mode_t;
 
 /** @brief Query a particular attribute by index. */
 EXR_EXPORT exr_result_t exr_get_attribute_by_index (
     exr_const_context_t            ctxt,
     int                            part_index,
-    enum exr_attr_list_access_mode mode,
+    exr_attr_list_access_mode_t    mode,
     int32_t                        idx,
     const exr_attribute_t**        outattr);
 
@@ -194,7 +194,7 @@ EXR_EXPORT exr_result_t exr_get_attribute_by_name (
 EXR_EXPORT exr_result_t exr_get_attribute_list (
     exr_const_context_t            ctxt,
     int                            part_index,
-    enum exr_attr_list_access_mode mode,
+    exr_attr_list_access_mode_t    mode,
     int32_t*                       count,
     const exr_attribute_t**        outlist);
 

diff --git a/src/lib/OpenEXRCore/part_attr.c b/src/lib/OpenEXRCore/part_attr.c
@@ -35,7 +35,7 @@ exr_result_t
 exr_get_attribute_by_index (
     exr_const_context_t            ctxt,
     int                            part_index,
-    enum exr_attr_list_access_mode mode,
+    exr_attr_list_access_mode_t    mode,
     int32_t                        idx,
     const exr_attribute_t**        outattr)
 {
@@ -94,7 +94,7 @@ exr_result_t
 exr_get_attribute_list (
     exr_const_context_t            ctxt,
     int                            part_index,
-    enum exr_attr_list_access_mode mode,
+    exr_attr_list_access_mode_t    mode,
     int32_t*                       count,
     const exr_attribute_t**        outlist)
 {

diff --git a/src/test/OpenEXRCoreTest/write.cpp b/src/test/OpenEXRCoreTest/write.cpp
@@ -1006,7 +1006,7 @@ testWriteAttrs (const std::string& tempdir)
     EXRCORE_TEST_RVAL_FAIL (
         EXR_ERR_INVALID_ARGUMENT,
         exr_get_attribute_by_index (
-            outf, partidx, (enum exr_attr_list_access_mode) 42, 15, &attrget));
+            outf, partidx, (exr_attr_list_access_mode_t) 42, 15, &attrget));
     EXRCORE_TEST_RVAL_FAIL (
         EXR_ERR_ARGUMENT_OUT_OF_RANGE,
         exr_get_attribute_by_index (
@@ -1063,7 +1063,7 @@ testWriteAttrs (const std::string& tempdir)
         exr_get_attribute_list (
             outf,
             partidx,
-            (enum exr_attr_list_access_mode) 42,
+            (exr_attr_list_access_mode_t) 42,
             &attrcnt,
             &attrget));
     attrcnt = 1;