diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-12-12 04:55:20 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-12-12 05:02:09 +0300 |
| commit | 49490e5cfbeb2b0b823aa2042401891001870a6e (patch) | |
| tree | a1d32562af2dea0c336ebd3d017a387834e936cc /source/blender/imbuf | |
| parent | 16fc62e15f0a749d6d64e784ea048e07d6ea3397 (diff) | |
| parent | e757c4a3bec8b0e8d198531a28327332af00a9ba (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/imbuf')
| -rw-r--r-- | source/blender/imbuf/IMB_metadata.h | 14 | ||||
| -rw-r--r-- | source/blender/imbuf/intern/openexr/openexr_api.cpp | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/imbuf/IMB_metadata.h b/source/blender/imbuf/IMB_metadata.h index 6a29fa01594..0321d5ef0fb 100644 --- a/source/blender/imbuf/IMB_metadata.h +++ b/source/blender/imbuf/IMB_metadata.h @@ -54,11 +54,11 @@ void IMB_metadata_ensure(struct IDProperty **metadata); void IMB_metadata_free(struct IDProperty *metadata); /** Read the field from the image info into the field. - * \param metadata - the IDProperty that contains the metadata - * \param key - the key of the field - * \param value - the data in the field, first one found with key is returned, + * \param metadata: the IDProperty that contains the metadata + * \param key: the key of the field + * \param value: the data in the field, first one found with key is returned, * memory has to be allocated by user. - * \param len - length of value buffer allocated by user. + * \param len: length of value buffer allocated by user. * \return - 1 (true) if metadata is present and value for the key found, 0 (false) otherwise */ bool IMB_metadata_get_field(struct IDProperty *metadata, const char *key, char *value, const size_t len); @@ -66,9 +66,9 @@ bool IMB_metadata_get_field(struct IDProperty *metadata, const char *key, char * /** Set user data in the metadata. * If the field already exists its value is overwritten, otherwise the field * will be added with the given value. - * \param metadata - the IDProperty that contains the metadata - * \param key - the key of the field - * \param value - the data to be written to the field. zero terminated string + * \param metadata: the IDProperty that contains the metadata + * \param key: the key of the field + * \param value: the data to be written to the field. zero terminated string */ void IMB_metadata_set_field(struct IDProperty *metadata, const char *key, const char *value); diff --git a/source/blender/imbuf/intern/openexr/openexr_api.cpp b/source/blender/imbuf/intern/openexr/openexr_api.cpp index bad5e0efd65..99b3bdb9015 100644 --- a/source/blender/imbuf/intern/openexr/openexr_api.cpp +++ b/source/blender/imbuf/intern/openexr/openexr_api.cpp @@ -302,7 +302,7 @@ extern "C" /** * Test presence of OpenEXR file. - * \param mem pointer to loaded OpenEXR bitstream + * \param mem: pointer to loaded OpenEXR bitstream */ int imb_is_a_openexr(const unsigned char *mem) { |