Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Clean up OpenEXRCore doxygen comments #1130

Merged
merged 1 commit into from
Aug 25, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
106 changes: 106 additions & 0 deletions docs/OpenEXRCoreAPI.rst
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ a sorted order, or the order within which they appear in the file. One
example might be to retrieve the data window:

.. code-block::
:linenos:

exr_attr_box2i_t datawindow;
exr_result_t rv = exr_get_data_window(ctxt, 0, &datawindow);
Expand Down Expand Up @@ -172,6 +173,12 @@ would result from unpacking that chunk, and it’s raw position on disk.
Reference
---------

Basic Types
^^^^^^^^^^^

.. doxygentypedef:: exr_result_t


Basic Enumerated Types
^^^^^^^^^^^^^^^^^^^^^^

Expand All @@ -189,6 +196,9 @@ Basic Enumerated Types
Global State
^^^^^^^^^^^^

.. doxygentypedef:: exr_memory_allocation_func_t
.. doxygentypedef:: exr_memory_free_func_t

.. doxygenfunction:: exr_get_library_version
.. doxygenfunction:: exr_set_default_maximum_image_size
.. doxygenfunction:: exr_get_default_maximum_image_size
Expand Down Expand Up @@ -236,12 +246,17 @@ Open for Write
Close
^^^^^

.. doxygentypedef:: exr_destroy_stream_func_ptr_t

.. doxygenfunction:: exr_finish


Context
^^^^^^^

.. doxygentypedef:: exr_context_t
.. doxygentypedef:: exr_const_context_t

.. doxygenstruct:: _exr_context_initializer
:members:
.. doxygentypedef:: exr_context_initializer_t
Expand All @@ -266,6 +281,8 @@ Decoding
Encoding
^^^^^^^^

.. doxygenenum:: transcoding_pipeline_buffer_id

.. doxygenstruct:: _exr_encode_pipeline
:members:
.. doxygentypedef:: exr_encode_pipeline_t
Expand All @@ -283,6 +300,8 @@ Encoding
Attribute Values
^^^^^^^^^^^^^^^^



.. doxygenstruct:: exr_attr_chromaticities_t
:members:
:undoc-members:
Expand All @@ -297,13 +316,96 @@ Attribute Values
:members:
:undoc-members:

.. doxygenstruct:: exr_attr_v2i_t
:members:
:undoc-members:

.. doxygenstruct:: exr_attr_v2f_t
:members:
:undoc-members:

.. doxygenstruct:: exr_attr_v2d_t
:members:
:undoc-members:

.. doxygenstruct:: exr_attr_v3i_t
:members:
:undoc-members:

.. doxygenstruct:: exr_attr_v3f_t
:members:
:undoc-members:

.. doxygenstruct:: exr_attr_v3d_t
:members:
:undoc-members:

.. doxygenstruct:: exr_attr_m33f_t
:members:
:undoc-members:

.. doxygenstruct:: exr_attr_m33d_t
:members:
:undoc-members:

.. doxygenstruct:: exr_attr_m44f_t
:members:
:undoc-members:

.. doxygenstruct:: exr_attr_m44d_t
:members:
:undoc-members:

.. doxygenstruct:: exr_attr_box2i_t
:members:
:undoc-members:

.. doxygenstruct:: exr_attr_box2f_t
:members:
:undoc-members:

.. doxygenstruct:: exr_attr_string_t
:members:
:undoc-members:

.. doxygenstruct:: exr_attr_string_vector_t
:members:
:undoc-members:

.. doxygenstruct:: exr_attr_float_vector_t
:members:
:undoc-members:

.. doxygenstruct:: exr_attr_chlist_entry_t
:members:
:undoc-members:

.. doxygenstruct:: exr_attr_chlist_t
:members:
:undoc-members:

.. doxygenstruct:: exr_attr_preview_t
:members:
:undoc-members:

.. doxygenstruct:: exr_attr_tiledesc_t
:members:
:undoc-members:

.. doxygenstruct:: exr_attr_timecode_t
:members:
:undoc-members:

.. doxygenstruct:: exr_attr_opaquedata_t
:members:
:undoc-members:

Reading
^^^^^^^

.. doxygentypedef:: exr_read_func_ptr_t
.. doxygentypedef:: exr_query_size_func_ptr_t

.. doxygenfunction:: exr_get_count
.. doxygenfunction:: exr_get_name
.. doxygenfunction:: exr_get_storage
Expand Down Expand Up @@ -368,6 +470,8 @@ Reading
Writing
^^^^^^^

.. doxygentypedef:: exr_write_func_ptr_t

.. doxygenfunction:: exr_add_part

.. doxygenfunction:: exr_add_channel
Expand Down Expand Up @@ -421,6 +525,8 @@ Error Handling

.. doxygenenum:: exr_error_code_t

.. doxygentypedef:: exr_error_handler_cb_t

.. doxygenfunction:: exr_get_default_error_message
.. doxygenfunction:: exr_get_error_code_as_string

Expand Down
7 changes: 2 additions & 5 deletions docs/index.rst
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
.. Imath documentation master file, created by
sphinx-quickstart on Wed Apr 24 15:19:01 2019.

OpenEXR Technical Documentation
===============================
OpenEXR |version| Technical Documentation
=========================================

.. sidebar:: OpenEXR

Expand Down
4 changes: 4 additions & 0 deletions src/lib/Iex/IexBaseExc.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,8 @@ BaseExc::stackTrace () const noexcept
return _stackTrace;
}

/// @cond Doxygen_Suppress

DEFINE_EXC_EXP_IMPL (IEX_EXPORT, ArgExc, BaseExc)
DEFINE_EXC_EXP_IMPL (IEX_EXPORT, LogicExc, BaseExc)
DEFINE_EXC_EXP_IMPL (IEX_EXPORT, InputExc, BaseExc)
Expand Down Expand Up @@ -363,6 +365,8 @@ DEFINE_EXC_EXP_IMPL (IEX_EXPORT, DivzeroExc, MathExc)
DEFINE_EXC_EXP_IMPL (IEX_EXPORT, InexactExc, MathExc)
DEFINE_EXC_EXP_IMPL (IEX_EXPORT, InvalidFpOpExc, MathExc)

/// @endcond Doxygen_Suppress

IEX_INTERNAL_NAMESPACE_SOURCE_EXIT


Expand Down
2 changes: 0 additions & 2 deletions src/lib/Iex/IexExport.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,5 @@

#endif // OPENEXR_DLL

/// @}

#endif // #ifndef INCLUDED_IEXEXPORT_H

16 changes: 8 additions & 8 deletions src/lib/OpenEXRCore/internal_attr.h
Original file line number Diff line number Diff line change
Expand Up @@ -44,25 +44,25 @@ int internal_exr_is_standard_type (const char* typen);

typedef struct exr_attribute_list
{
int num_attributes; /**< number of attribute entries in the list */
int num_alloced; /**< allocation count. if > 0, attribute list owns pointer */
exr_attribute_t** entries; /**< creation order list of attributes */
int num_attributes; /**< Number of attribute entries in the list */
int num_alloced; /**< Allocation count. if > 0, attribute list owns pointer */
exr_attribute_t** entries; /**< Creation order list of attributes */
exr_attribute_t**
sorted_entries; /**< sorted order list of attributes for fast lookup */
sorted_entries; /**< Sorted order list of attributes for fast lookup */
} exr_attribute_list_t;

/** Initializes a list to an empty attribute list */
/** Initialize a list to an empty attribute list */
exr_result_t exr_attr_list_init (exr_context_t ctxt, exr_attribute_list_t* l);

/** Frees memory for all the owned attributes in the list as well as the list itself */
/** Free memory for all the owned attributes in the list as well as the list itself */
exr_result_t
exr_attr_list_destroy (exr_context_t ctxt, exr_attribute_list_t* l);

/** Computes the number of bytes required to store this attribute list in a file */
/** Compute the number of bytes required to store this attribute list in a file */
exr_result_t exr_attr_list_compute_size (
exr_context_t ctxt, exr_attribute_list_t* l, uint64_t* out);

/** Finds an attribute in the list by name */
/** Find an attribute in the list by name */
exr_result_t exr_attr_list_find_by_name (
exr_const_context_t ctxt,
exr_attribute_list_t* l,
Expand Down
Loading