| oyConnectorImaging_s.h | | oyConnectorImaging_s.h | |
|---|
| | | | |
| skipping to change at line 12 | | skipping to change at line 12 | |
|---|
| | | | |
| [Template file inheritance graph] | | [Template file inheritance graph] | |
| +-> oyConnectorImaging_s.template.h | | +-> oyConnectorImaging_s.template.h | |
| | | | | | |
| +-> oyConnector_s.template.h | | +-> oyConnector_s.template.h | |
| | | | | | |
| +-> Base_s.h | | +-> Base_s.h | |
| | | | | | |
| +-- oyStruct_s.template.h | | +-- oyStruct_s.template.h | |
| | | | |
|
| * Oyranos is an open source Colour Management System | | * Oyranos is an open source Color Management System | |
| * | | * | |
| * @par Copyright: | | * @par Copyright: | |
|
| * 2004-2012 (C) Kai-Uwe Behrmann | | * 2004-2014 (C) Kai-Uwe Behrmann | |
| * | | * | |
| * @author Kai-Uwe Behrmann <ku.b@gmx.de> | | * @author Kai-Uwe Behrmann <ku.b@gmx.de> | |
| * @par License: | | * @par License: | |
| * new BSD - see: http://www.opensource.org/licenses/bsd-license
.php | | * new BSD - see: http://www.opensource.org/licenses/bsd-license
.php | |
|
| * @date 2012/10/16 | | * @date 2014/01/11 | |
| */ | | */ | |
| | | | |
| #ifndef OY_CONNECTOR_IMAGING_S_H | | #ifndef OY_CONNECTOR_IMAGING_S_H | |
| #define OY_CONNECTOR_IMAGING_S_H | | #define OY_CONNECTOR_IMAGING_S_H | |
| | | | |
| #ifdef __cplusplus | | #ifdef __cplusplus | |
| /*namespace oyranos {*/ | | /*namespace oyranos {*/ | |
| extern "C" { | | extern "C" { | |
| #endif /* __cplusplus */ | | #endif /* __cplusplus */ | |
| | | | |
| #include <oyranos_object.h> | | #include <oyranos_object.h> | |
| | | | |
| typedef struct oyConnectorImaging_s oyConnectorImaging_s; | | typedef struct oyConnectorImaging_s oyConnectorImaging_s; | |
| | | | |
| #include "oyStruct_s.h" | | #include "oyStruct_s.h" | |
| | | | |
|
| | | #include "oyConnector_s.h" | |
| | | | |
| #include "oyranos_image.h" | | #include "oyranos_image.h" | |
| | | | |
| /* Include "ConnectorImaging.public.h" { */ | | /* Include "ConnectorImaging.public.h" { */ | |
| | | | |
| /* } Include "ConnectorImaging.public.h" */ | | /* } Include "ConnectorImaging.public.h" */ | |
| | | | |
| /* Include "ConnectorImaging.dox" { */ | | /* Include "ConnectorImaging.dox" { */ | |
| /** @struct oyConnectorImaging_s | | /** @struct oyConnectorImaging_s | |
| * @ingroup objects_conversion | | * @ingroup objects_conversion | |
| * @extends oyConnector_s | | * @extends oyConnector_s | |
| | | | |
| skipping to change at line 66 | | skipping to change at line 68 | |
|---|
| * | | * | |
| * @version Oyranos: 0.1.10 | | * @version Oyranos: 0.1.10 | |
| * @since 2008/07/26 (Oyranos: 0.1.8) | | * @since 2008/07/26 (Oyranos: 0.1.8) | |
| * @date 2010/06/25 | | * @date 2010/06/25 | |
| */ | | */ | |
| | | | |
| /* } Include "ConnectorImaging.dox" */ | | /* } Include "ConnectorImaging.dox" */ | |
| | | | |
| struct oyConnectorImaging_s { | | struct oyConnectorImaging_s { | |
| /* Include "Struct.members.h" { */ | | /* Include "Struct.members.h" { */ | |
|
| oyOBJECT_e type_; /**< @private struct type */ | | const oyOBJECT_e type_; /**< The struct type tells Oyranos how | |
| oyStruct_Copy_f copy; /**< copy function */ | | to interprete hidden fields. @brief Type of object */ | |
| oyStruct_Release_f release; /**< release function */ | | oyStruct_Copy_f copy; /**< @brief Copy function */ | |
| oyObject_s oy_; /**< @private features name and hash * | | oyStruct_Release_f release; /**< @brief Release function */ | |
| / | | oyObject_s oy_; /**< Features name and hash. Do not ch | |
| | | ange during object life time. @brief Oyranos internal object */ | |
| | | | |
| /* } Include "Struct.members.h" */ | | /* } Include "Struct.members.h" */ | |
| }; | | }; | |
| | | | |
| OYAPI oyConnectorImaging_s* OYEXPORT | | OYAPI oyConnectorImaging_s* OYEXPORT | |
| oyConnectorImaging_New( oyObject_s object ); | | oyConnectorImaging_New( oyObject_s object ); | |
| OYAPI oyConnectorImaging_s* OYEXPORT | | OYAPI oyConnectorImaging_s* OYEXPORT | |
| oyConnectorImaging_Copy( oyConnectorImaging_s *connectorimaging, oyObject
_s obj ); | | oyConnectorImaging_Copy( oyConnectorImaging_s *connectorimaging, oyObject
_s obj ); | |
| OYAPI int OYEXPORT | | OYAPI int OYEXPORT | |
| oyConnectorImaging_Release( oyConnectorImaging_s **connectorimaging ); | | oyConnectorImaging_Release( oyConnectorImaging_s **connectorimaging ); | |
| | | | |
| /* Include "ConnectorImaging.public_methods_declarations.h" { */ | | /* Include "ConnectorImaging.public_methods_declarations.h" { */ | |
| OYAPI int OYEXPORT | | OYAPI int OYEXPORT | |
|
| | | oyConnectorImaging_SetDataTypes ( | |
| | | oyConnectorImaging_s * c, | |
| | | oyDATATYPE_e * data_types, | |
| | | int data_types_n | |
| | | ); | |
| | | OYAPI int OYEXPORT | |
| oyConnectorImaging_GetDataTypes ( | | oyConnectorImaging_GetDataTypes ( | |
| oyConnectorImaging_s * c, | | oyConnectorImaging_s * c, | |
| const oyDATATYPE_e ** data_types, | | const oyDATATYPE_e ** data_types, | |
| int * data_types_n
); | | int * data_types_n
); | |
| OYAPI int OYEXPORT | | OYAPI int OYEXPORT | |
| oyConnectorImaging_GetChannelTypes ( | | oyConnectorImaging_GetChannelTypes ( | |
| oyConnectorImaging_s * c, | | oyConnectorImaging_s * c, | |
| const oyCHANNELTYPE_e** channel_type
s, | | const oyCHANNELTYPE_e** channel_type
s, | |
| int * channel_type
s_n ); | | int * channel_type
s_n ); | |
| | | | |
| /** @enum oyCONNECTOR_IMAGING_CAP_e | | /** @enum oyCONNECTOR_IMAGING_CAP_e | |
| * @brief Capabilities of oyConnectorImaging_s | | * @brief Capabilities of oyConnectorImaging_s | |
| * | | * | |
| * @version Oyranos: 0.5.0 | | * @version Oyranos: 0.5.0 | |
| * @since 2012/09/06 (Oyranos: 0.5.0) | | * @since 2012/09/06 (Oyranos: 0.5.0) | |
| * @date 2012/09/06 | | * @date 2012/09/06 | |
| */ | | */ | |
| typedef enum { | | typedef enum { | |
| oyCONNECTOR_IMAGING_CAP_IS_PLUG, | | oyCONNECTOR_IMAGING_CAP_IS_PLUG, | |
|
| oyCONNECTOR_IMAGING_CAP_MAX_COLOUR_OFFSET, | | oyCONNECTOR_IMAGING_CAP_MAX_COLOR_OFFSET, | |
| oyCONNECTOR_IMAGING_CAP_MIN_CHANNELS_COUNT, | | oyCONNECTOR_IMAGING_CAP_MIN_CHANNELS_COUNT, | |
| oyCONNECTOR_IMAGING_CAP_MAX_CHANNELS_COUNT, | | oyCONNECTOR_IMAGING_CAP_MAX_CHANNELS_COUNT, | |
|
| oyCONNECTOR_IMAGING_CAP_MIN_COLOUR_COUNT, | | oyCONNECTOR_IMAGING_CAP_MIN_COLOR_COUNT, | |
| oyCONNECTOR_IMAGING_CAP_MAX_COLOUR_COUNT, | | oyCONNECTOR_IMAGING_CAP_MAX_COLOR_COUNT, | |
| oyCONNECTOR_IMAGING_CAP_CAN_PLANAR, /**< can read separated channe
ls */ | | oyCONNECTOR_IMAGING_CAP_CAN_PLANAR, /**< can read separated channe
ls */ | |
| oyCONNECTOR_IMAGING_CAP_CAN_INTERWOVEN, /**< can read continuous chann
els */ | | oyCONNECTOR_IMAGING_CAP_CAN_INTERWOVEN, /**< can read continuous chann
els */ | |
|
| oyCONNECTOR_IMAGING_CAP_CAN_SWAP, /**< can swap colour channels
(BGR)*/ | | oyCONNECTOR_IMAGING_CAP_CAN_SWAP, /**< can swap color channels (
BGR)*/ | |
| oyCONNECTOR_IMAGING_CAP_CAN_SWAP_BYTES, /**< non host byte order */ | | oyCONNECTOR_IMAGING_CAP_CAN_SWAP_BYTES, /**< non host byte order */ | |
| oyCONNECTOR_IMAGING_CAP_CAN_REVERT, /**< revert 1 -> 0 and 0 -> 1
*/ | | oyCONNECTOR_IMAGING_CAP_CAN_REVERT, /**< revert 1 -> 0 and 0 -> 1
*/ | |
| oyCONNECTOR_IMAGING_CAP_CAN_PREMULTIPLIED_ALPHA, | | oyCONNECTOR_IMAGING_CAP_CAN_PREMULTIPLIED_ALPHA, | |
| oyCONNECTOR_IMAGING_CAP_CAN_NONPREMULTIPLIED_ALPHA, | | oyCONNECTOR_IMAGING_CAP_CAN_NONPREMULTIPLIED_ALPHA, | |
| oyCONNECTOR_IMAGING_CAP_CAN_SUBPIXEL, /**< understand subpixel order
*/ | | oyCONNECTOR_IMAGING_CAP_CAN_SUBPIXEL, /**< understand subpixel order
*/ | |
| oyCONNECTOR_IMAGING_CAP_ID, /**< relative to oyFilterCore_
s, e.g. 1*/ | | oyCONNECTOR_IMAGING_CAP_ID, /**< relative to oyFilterCore_
s, e.g. 1*/ | |
| /**< connector is mandatory or optional, important for modules */ | | /**< connector is mandatory or optional, important for modules */ | |
| oyCONNECTOR_IMAGING_CAP_IS_MANDATORY | | oyCONNECTOR_IMAGING_CAP_IS_MANDATORY | |
| } oyCONNECTOR_IMAGING_CAP_e; | | } oyCONNECTOR_IMAGING_CAP_e; | |
| OYAPI int OYEXPORT | | OYAPI int OYEXPORT | |
| oyConnectorImaging_GetCapability ( | | oyConnectorImaging_GetCapability ( | |
| oyConnectorImaging_s * c, | | oyConnectorImaging_s * c, | |
| oyCONNECTOR_IMAGING_CAP_e type ); | | oyCONNECTOR_IMAGING_CAP_e type ); | |
|
| | | OYAPI int OYEXPORT | |
| | | oyConnectorImaging_SetCapability ( | |
| | | oyConnectorImaging_s * c, | |
| | | oyCONNECTOR_IMAGING_CAP_e type, | |
| | | int value ); | |
| | | | |
| /* } Include "ConnectorImaging.public_methods_declarations.h" */ | | /* } Include "ConnectorImaging.public_methods_declarations.h" */ | |
| | | | |
|
| | | OYAPI int OYEXPORT | |
| | | oyConnectorImaging_SetTexts( oyConnectorImaging_s * ob | |
| | | j, | |
| | | oyCMMGetText_f getText, | |
| | | const char ** text_classes ); | |
| | | OYAPI const char ** OYEXPORT | |
| | | oyConnectorImaging_GetTexts( oyConnectorImaging_s * ob | |
| | | j ); | |
| | | OYAPI const char * OYEXPORT | |
| | | oyConnectorImaging_GetText ( oyConnectorImaging_s * ob | |
| | | j, | |
| | | const char * name_class, | |
| | | oyNAME_e type ); | |
| | | OYAPI int OYEXPORT | |
| | | oyConnectorImaging_IsPlug ( oyConnectorImaging_s * ob | |
| | | j ); | |
| | | OYAPI int OYEXPORT | |
| | | oyConnectorImaging_SetIsPlug(oyConnectorImaging_s * ob | |
| | | j, | |
| | | int is_plug ); | |
| | | OYAPI const char * OYEXPORT | |
| | | oyConnectorImaging_GetReg ( oyConnectorImaging_s * obj | |
| | | ); | |
| | | OYAPI int OYEXPORT | |
| | | oyConnectorImaging_SetReg ( oyConnectorImaging_s * ob | |
| | | j, | |
| | | const char * type_registratio | |
| | | n ); | |
| | | | |
| | | OYAPI int OYEXPORT | |
| | | oyConnectorImaging_SetMatch( oyConnectorImaging_s * ob | |
| | | j, | |
| | | oyCMMFilterSocket_MatchPlug_f func ) | |
| | | ; | |
| | | OYAPI oyCMMFilterSocket_MatchPlug_f OYEXPORT | |
| | | oyConnectorImaging_GetMatch ( | |
| | | oyConnectorImaging_s * obj ); | |
| | | | |
| #ifdef __cplusplus | | #ifdef __cplusplus | |
| } /* extern "C" */ | | } /* extern "C" */ | |
| /*}*/ /* namespace oyranos */ | | /*}*/ /* namespace oyranos */ | |
| #endif /* __cplusplus */ | | #endif /* __cplusplus */ | |
| | | | |
| #endif /* OY_CONNECTOR_IMAGING_S_H */ | | #endif /* OY_CONNECTOR_IMAGING_S_H */ | |
| | | | |
| End of changes. 11 change blocks. |
|---|
| 12 lines changed or deleted | | 64 lines changed or added | |
|---|
|
| oyConnector_s.h | | oyConnector_s.h | |
|---|
| /** @file oyConnector_s.h | | /** @file oyConnector_s.h | |
| | | | |
| [Template file inheritance graph] | | [Template file inheritance graph] | |
| +-> oyConnector_s.template.h | | +-> oyConnector_s.template.h | |
| | | | | | |
| +-> Base_s.h | | +-> Base_s.h | |
| | | | | | |
| +-- oyStruct_s.template.h | | +-- oyStruct_s.template.h | |
| | | | |
|
| * Oyranos is an open source Colour Management System | | * Oyranos is an open source Color Management System | |
| * | | * | |
| * @par Copyright: | | * @par Copyright: | |
|
| * 2004-2012 (C) Kai-Uwe Behrmann | | * 2004-2014 (C) Kai-Uwe Behrmann | |
| * | | * | |
| * @author Kai-Uwe Behrmann <ku.b@gmx.de> | | * @author Kai-Uwe Behrmann <ku.b@gmx.de> | |
| * @par License: | | * @par License: | |
| * new BSD - see: http://www.opensource.org/licenses/bsd-license
.php | | * new BSD - see: http://www.opensource.org/licenses/bsd-license
.php | |
|
| * @date 2012/10/16 | | * @date 2014/01/11 | |
| */ | | */ | |
| | | | |
| #ifndef OY_CONNECTOR_S_H | | #ifndef OY_CONNECTOR_S_H | |
| #define OY_CONNECTOR_S_H | | #define OY_CONNECTOR_S_H | |
| | | | |
| #ifdef __cplusplus | | #ifdef __cplusplus | |
| /*namespace oyranos {*/ | | /*namespace oyranos {*/ | |
| extern "C" { | | extern "C" { | |
| #endif /* __cplusplus */ | | #endif /* __cplusplus */ | |
| | | | |
| #include <oyranos_object.h> | | #include <oyranos_object.h> | |
| | | | |
| typedef struct oyConnector_s oyConnector_s; | | typedef struct oyConnector_s oyConnector_s; | |
| | | | |
| #include "oyStruct_s.h" | | #include "oyStruct_s.h" | |
| | | | |
|
| | | #include "oyConnector_s.h" | |
| | | | |
| /* Include "Connector.public.h" { */ | | /* Include "Connector.public.h" { */ | |
| | | | |
| /* } Include "Connector.public.h" */ | | /* } Include "Connector.public.h" */ | |
| | | | |
| /* Include "Connector.dox" { */ | | /* Include "Connector.dox" { */ | |
| /** @struct oyConnector_s | | /** @struct oyConnector_s | |
| * @ingroup objects_conversion | | * @ingroup objects_conversion | |
| * @extends oyStruct_s | | * @extends oyStruct_s | |
| * @brief A filter connection description structure | | * @brief A filter connection description structure | |
| * | | * | |
| | | | |
| skipping to change at line 62 | | skipping to change at line 64 | |
|---|
| * | | * | |
| * @version Oyranos: 0.3.0 | | * @version Oyranos: 0.3.0 | |
| * @since 2008/07/26 (Oyranos: 0.1.8) | | * @since 2008/07/26 (Oyranos: 0.1.8) | |
| * @date 2011/01/31 | | * @date 2011/01/31 | |
| */ | | */ | |
| | | | |
| /* } Include "Connector.dox" */ | | /* } Include "Connector.dox" */ | |
| | | | |
| struct oyConnector_s { | | struct oyConnector_s { | |
| /* Include "Struct.members.h" { */ | | /* Include "Struct.members.h" { */ | |
|
| oyOBJECT_e type_; /**< @private struct type */ | | const oyOBJECT_e type_; /**< The struct type tells Oyranos how | |
| oyStruct_Copy_f copy; /**< copy function */ | | to interprete hidden fields. @brief Type of object */ | |
| oyStruct_Release_f release; /**< release function */ | | oyStruct_Copy_f copy; /**< @brief Copy function */ | |
| oyObject_s oy_; /**< @private features name and hash * | | oyStruct_Release_f release; /**< @brief Release function */ | |
| / | | oyObject_s oy_; /**< Features name and hash. Do not ch | |
| | | ange during object life time. @brief Oyranos internal object */ | |
| | | | |
| /* } Include "Struct.members.h" */ | | /* } Include "Struct.members.h" */ | |
| }; | | }; | |
| | | | |
| OYAPI oyConnector_s* OYEXPORT | | OYAPI oyConnector_s* OYEXPORT | |
| oyConnector_New( oyObject_s object ); | | oyConnector_New( oyObject_s object ); | |
| OYAPI oyConnector_s* OYEXPORT | | OYAPI oyConnector_s* OYEXPORT | |
| oyConnector_Copy( oyConnector_s *connector, oyObject_s obj ); | | oyConnector_Copy( oyConnector_s *connector, oyObject_s obj ); | |
| OYAPI int OYEXPORT | | OYAPI int OYEXPORT | |
| oyConnector_Release( oyConnector_s **connector ); | | oyConnector_Release( oyConnector_s **connector ); | |
| | | | |
| /* Include "Connector.public_methods_declarations.h" { */ | | /* Include "Connector.public_methods_declarations.h" { */ | |
|
| OYAPI int OYEXPORT | | #include "oyranos_module.h" | |
| oyConnector_SetName ( oyConnector_s * obj, | | | |
| const char * string, | | | |
| oyNAME_e type ); | | | |
| OYAPI const char * OYEXPORT | | | |
| oyConnector_GetName ( oyConnector_s * obj, | | | |
| oyNAME_e type ); | | | |
| OYAPI int OYEXPORT | | | |
| oyConnector_IsPlug ( oyConnector_s * obj ); | | | |
| OYAPI int OYEXPORT | | | |
| oyConnector_SetIsPlug(oyConnector_s * obj, | | | |
| int is_plug ); | | | |
| OYAPI const char * OYEXPORT | | | |
| oyConnector_GetReg ( oyConnector_s * obj ); | | | |
| OYAPI int OYEXPORT | | | |
| oyConnector_SetReg ( oyConnector_s * obj, | | | |
| const char * type_registratio | | | |
| n ); | | | |
| | | | |
| #include "oyFilterPlug_s.h" | | #include "oyFilterPlug_s.h" | |
| #include "oyFilterSocket_s.h" | | #include "oyFilterSocket_s.h" | |
| /** typedef oyCMMFilterSocket_MatchPlug_f | | /** typedef oyCMMFilterSocket_MatchPlug_f | |
| * @brief verify connectors matching each other | | * @brief verify connectors matching each other | |
| * @ingroup module_api | | * @ingroup module_api | |
| * @memberof oyCMMapi5_s | | * @memberof oyCMMapi5_s | |
| * | | * | |
| * A implementation for images is included in the core function | | * A implementation for images is included in the core function | |
| * oyFilterSocket_MatchImagePlug(). | | * oyFilterSocket_MatchImagePlug(). | |
| | | | |
| skipping to change at line 118 | | skipping to change at line 104 | |
|---|
| * @return 1 on success, otherwise 0 | | * @return 1 on success, otherwise 0 | |
| * | | * | |
| * @version Oyranos: 0.1.10 | | * @version Oyranos: 0.1.10 | |
| * @since 2009/04/20 (Oyranos: 0.1.10) | | * @since 2009/04/20 (Oyranos: 0.1.10) | |
| * @date 2009/04/20 | | * @date 2009/04/20 | |
| */ | | */ | |
| typedef int (*oyCMMFilterSocket_MatchPlug_f) ( | | typedef int (*oyCMMFilterSocket_MatchPlug_f) ( | |
| oyFilterSocket_s * socket, | | oyFilterSocket_s * socket, | |
| oyFilterPlug_s * plug ); | | oyFilterPlug_s * plug ); | |
| | | | |
|
| | | /* } Include "Connector.public_methods_declarations.h" */ | |
| | | | |
| | | OYAPI int OYEXPORT | |
| | | oyConnector_SetTexts( oyConnector_s * obj, | |
| | | oyCMMGetText_f getText, | |
| | | const char ** text_classes ); | |
| | | OYAPI const char ** OYEXPORT | |
| | | oyConnector_GetTexts( oyConnector_s * obj ); | |
| | | OYAPI const char * OYEXPORT | |
| | | oyConnector_GetText ( oyConnector_s * obj, | |
| | | const char * name_class, | |
| | | oyNAME_e type ); | |
| | | OYAPI int OYEXPORT | |
| | | oyConnector_IsPlug ( oyConnector_s * obj ); | |
| | | OYAPI int OYEXPORT | |
| | | oyConnector_SetIsPlug(oyConnector_s * obj, | |
| | | int is_plug ); | |
| | | OYAPI const char * OYEXPORT | |
| | | oyConnector_GetReg ( oyConnector_s * obj ); | |
| | | OYAPI int OYEXPORT | |
| | | oyConnector_SetReg ( oyConnector_s * obj, | |
| | | const char * type_registratio | |
| | | n ); | |
| | | | |
| OYAPI int OYEXPORT | | OYAPI int OYEXPORT | |
| oyConnector_SetMatch( oyConnector_s * obj, | | oyConnector_SetMatch( oyConnector_s * obj, | |
| oyCMMFilterSocket_MatchPlug_f func )
; | | oyCMMFilterSocket_MatchPlug_f func )
; | |
| OYAPI oyCMMFilterSocket_MatchPlug_f OYEXPORT | | OYAPI oyCMMFilterSocket_MatchPlug_f OYEXPORT | |
| oyConnector_GetMatch ( | | oyConnector_GetMatch ( | |
| oyConnector_s * obj ); | | oyConnector_s * obj ); | |
| | | | |
|
| /* } Include "Connector.public_methods_declarations.h" */ | | | |
| | | | |
| #ifdef __cplusplus | | #ifdef __cplusplus | |
| } /* extern "C" */ | | } /* extern "C" */ | |
| /*}*/ /* namespace oyranos */ | | /*}*/ /* namespace oyranos */ | |
| #endif /* __cplusplus */ | | #endif /* __cplusplus */ | |
| | | | |
| #endif /* OY_CONNECTOR_S_H */ | | #endif /* OY_CONNECTOR_S_H */ | |
| | | | |
| End of changes. 8 change blocks. |
|---|
| 28 lines changed or deleted | | 36 lines changed or added | |
|---|
|
| oyConversion_s.h | | oyConversion_s.h | |
|---|
| /** @file oyConversion_s.h | | /** @file oyConversion_s.h | |
| | | | |
| [Template file inheritance graph] | | [Template file inheritance graph] | |
| +-> oyConversion_s.template.h | | +-> oyConversion_s.template.h | |
| | | | | | |
| +-> Base_s.h | | +-> Base_s.h | |
| | | | | | |
| +-- oyStruct_s.template.h | | +-- oyStruct_s.template.h | |
| | | | |
|
| * Oyranos is an open source Colour Management System | | * Oyranos is an open source Color Management System | |
| * | | * | |
| * @par Copyright: | | * @par Copyright: | |
|
| * 2004-2012 (C) Kai-Uwe Behrmann | | * 2004-2014 (C) Kai-Uwe Behrmann | |
| * | | * | |
| * @author Kai-Uwe Behrmann <ku.b@gmx.de> | | * @author Kai-Uwe Behrmann <ku.b@gmx.de> | |
| * @par License: | | * @par License: | |
| * new BSD - see: http://www.opensource.org/licenses/bsd-license
.php | | * new BSD - see: http://www.opensource.org/licenses/bsd-license
.php | |
|
| * @date 2012/11/02 | | * @date 2014/02/18 | |
| */ | | */ | |
| | | | |
| #ifndef OY_CONVERSION_S_H | | #ifndef OY_CONVERSION_S_H | |
| #define OY_CONVERSION_S_H | | #define OY_CONVERSION_S_H | |
| | | | |
| #ifdef __cplusplus | | #ifdef __cplusplus | |
| /*namespace oyranos {*/ | | /*namespace oyranos {*/ | |
| extern "C" { | | extern "C" { | |
| #endif /* __cplusplus */ | | #endif /* __cplusplus */ | |
| | | | |
| | | | |
| skipping to change at line 52 | | skipping to change at line 52 | |
|---|
| /* Include "Conversion.public.h" { */ | | /* Include "Conversion.public.h" { */ | |
| | | | |
| /* } Include "Conversion.public.h" */ | | /* } Include "Conversion.public.h" */ | |
| | | | |
| /* Include "Conversion.dox" { */ | | /* Include "Conversion.dox" { */ | |
| /** @struct oyConversion_s | | /** @struct oyConversion_s | |
| * @ingroup objects_conversion | | * @ingroup objects_conversion | |
| * @extends oyStruct_s | | * @extends oyStruct_s | |
| * @brief A filter chain or graph to manipulate a image | | * @brief A filter chain or graph to manipulate a image | |
| * | | * | |
|
| * Order of filters matters. | | * Order of filters matters. | |
| * The processing direction is a bit like raytracing as nodes request thei
r | | * The processing direction is a bit like raytracing as nodes request thei
r | |
| * parent. | | * parent. | |
| * | | * | |
| * The graph is allowed to be a directed graph without cycles. | | * The graph is allowed to be a directed graph without cycles. | |
| \dot | | \dot | |
| digraph G { | | digraph G { | |
| bgcolor="transparent"; | | bgcolor="transparent"; | |
| rankdir=LR | | rankdir=LR | |
| graph [fontname=Helvetica, fontsize=12]; | | graph [fontname=Helvetica, fontsize=12]; | |
| node [shape=record, fontname=Helvetica, fontsize=10, style="filled,rounde
d"]; | | node [shape=record, fontname=Helvetica, fontsize=10, style="filled,rounde
d"]; | |
| | | | |
| skipping to change at line 179 | | skipping to change at line 179 | |
|---|
| * | | * | |
| * @version Oyranos: 0.1.8 | | * @version Oyranos: 0.1.8 | |
| * @since 2008/06/08 (Oyranos: 0.1.8) | | * @since 2008/06/08 (Oyranos: 0.1.8) | |
| * @date 2008/06/08 | | * @date 2008/06/08 | |
| */ | | */ | |
| | | | |
| /* } Include "Conversion.dox" */ | | /* } Include "Conversion.dox" */ | |
| | | | |
| struct oyConversion_s { | | struct oyConversion_s { | |
| /* Include "Struct.members.h" { */ | | /* Include "Struct.members.h" { */ | |
|
| oyOBJECT_e type_; /**< @private struct type */ | | const oyOBJECT_e type_; /**< The struct type tells Oyranos how | |
| oyStruct_Copy_f copy; /**< copy function */ | | to interprete hidden fields. @brief Type of object */ | |
| oyStruct_Release_f release; /**< release function */ | | oyStruct_Copy_f copy; /**< @brief Copy function */ | |
| oyObject_s oy_; /**< @private features name and hash * | | oyStruct_Release_f release; /**< @brief Release function */ | |
| / | | oyObject_s oy_; /**< Features name and hash. Do not ch | |
| | | ange during object life time. @brief Oyranos internal object */ | |
| | | | |
| /* } Include "Struct.members.h" */ | | /* } Include "Struct.members.h" */ | |
| }; | | }; | |
| | | | |
| OYAPI oyConversion_s* OYEXPORT | | OYAPI oyConversion_s* OYEXPORT | |
| oyConversion_New( oyObject_s object ); | | oyConversion_New( oyObject_s object ); | |
| OYAPI oyConversion_s* OYEXPORT | | OYAPI oyConversion_s* OYEXPORT | |
| oyConversion_Copy( oyConversion_s *conversion, oyObject_s obj ); | | oyConversion_Copy( oyConversion_s *conversion, oyObject_s obj ); | |
| OYAPI int OYEXPORT | | OYAPI int OYEXPORT | |
| oyConversion_Release( oyConversion_s **conversion ); | | oyConversion_Release( oyConversion_s **conversion ); | |
| | | | |
| skipping to change at line 211 | | skipping to change at line 211 | |
|---|
| OYAPI oyConversion_s * OYEXPORT | | OYAPI oyConversion_s * OYEXPORT | |
| oyConversion_CreateBasicPixels ( | | oyConversion_CreateBasicPixels ( | |
| oyImage_s * input, | | oyImage_s * input, | |
| oyImage_s * output, | | oyImage_s * output, | |
| oyOptions_s * options, | | oyOptions_s * options, | |
| oyObject_s object ); | | oyObject_s object ); | |
| OYAPI oyConversion_s * OYEXPORT | | OYAPI oyConversion_s * OYEXPORT | |
| oyConversion_CreateBasicPixelsFromBuffers ( | | oyConversion_CreateBasicPixelsFromBuffers ( | |
| oyProfile_s * p_in, | | oyProfile_s * p_in, | |
| oyPointer buf_in, | | oyPointer buf_in, | |
|
| oyDATATYPE_e buf_type_in, | | oyPixel_t buf_type_in, | |
| oyProfile_s * p_out, | | oyProfile_s * p_out, | |
| oyPointer buf_out, | | oyPointer buf_out, | |
|
| oyDATATYPE_e buf_type_out, | | oyPixel_t buf_type_out, | |
| oyOptions_s * options, | | oyOptions_s * options, | |
| int count ); | | int count ); | |
| OYAPI oyConversion_s * OYEXPORT | | OYAPI oyConversion_s * OYEXPORT | |
| oyConversion_CreateFromImage ( | | oyConversion_CreateFromImage ( | |
| oyImage_s * image_in, | | oyImage_s * image_in, | |
| const char * module, | | const char * module, | |
| oyOptions_s * module_options, | | oyOptions_s * module_options, | |
| oyProfile_s * output_profile, | | oyProfile_s * output_profile, | |
| oyDATATYPE_e buf_type_out, | | oyDATATYPE_e buf_type_out, | |
| uint32_t flags, | | uint32_t flags, | |
| | | | |
| End of changes. 7 change blocks. |
|---|
| 11 lines changed or deleted | | 12 lines changed or added | |
|---|
|
| oyFilterCore_s.h | | oyFilterCore_s.h | |
|---|
| /** @file oyFilterCore_s.h | | /** @file oyFilterCore_s.h | |
| | | | |
| [Template file inheritance graph] | | [Template file inheritance graph] | |
| +-> oyFilterCore_s.template.h | | +-> oyFilterCore_s.template.h | |
| | | | | | |
| +-> Base_s.h | | +-> Base_s.h | |
| | | | | | |
| +-- oyStruct_s.template.h | | +-- oyStruct_s.template.h | |
| | | | |
|
| * Oyranos is an open source Colour Management System | | * Oyranos is an open source Color Management System | |
| * | | * | |
| * @par Copyright: | | * @par Copyright: | |
|
| * 2004-2012 (C) Kai-Uwe Behrmann | | * 2004-2014 (C) Kai-Uwe Behrmann | |
| * | | * | |
| * @author Kai-Uwe Behrmann <ku.b@gmx.de> | | * @author Kai-Uwe Behrmann <ku.b@gmx.de> | |
| * @par License: | | * @par License: | |
| * new BSD - see: http://www.opensource.org/licenses/bsd-license
.php | | * new BSD - see: http://www.opensource.org/licenses/bsd-license
.php | |
|
| * @date 2012/10/08 | | * @date 2014/01/11 | |
| */ | | */ | |
| | | | |
| #ifndef OY_FILTER_CORE_S_H | | #ifndef OY_FILTER_CORE_S_H | |
| #define OY_FILTER_CORE_S_H | | #define OY_FILTER_CORE_S_H | |
| | | | |
| #ifdef __cplusplus | | #ifdef __cplusplus | |
| /*namespace oyranos {*/ | | /*namespace oyranos {*/ | |
| extern "C" { | | extern "C" { | |
| #endif /* __cplusplus */ | | #endif /* __cplusplus */ | |
| | | | |
| | | | |
| skipping to change at line 62 | | skipping to change at line 62 | |
|---|
| * Filters are chained into a oyConversion_s in order to get applied to da
ta. | | * Filters are chained into a oyConversion_s in order to get applied to da
ta. | |
| * The relation of filters in a graph is defined through the oyFilterNode_
s | | * The relation of filters in a graph is defined through the oyFilterNode_
s | |
| * struct. | | * struct. | |
| * | | * | |
| * It is possible to chain filters in different ways together. The aimed w
ay | | * It is possible to chain filters in different ways together. The aimed w
ay | |
| * here is to use members and queries to find possible connections. For | | * here is to use members and queries to find possible connections. For | |
| * instance a one in one out filter can not be connected to two sources at | | * instance a one in one out filter can not be connected to two sources at | |
| * once. | | * once. | |
| * | | * | |
| * The registration_ describes different basic types of filters (//xxx). | | * The registration_ describes different basic types of filters (//xxx). | |
|
| * See oyranos::oyCONNECTOR_e. | | | |
| * | | * | |
| * @version Oyranos: 0.1.10 | | * @version Oyranos: 0.1.10 | |
| * @since 2008/06/08 (Oyranos: 0.1.8) | | * @since 2008/06/08 (Oyranos: 0.1.8) | |
| * @date 2009/11/17 | | * @date 2009/11/17 | |
| */ | | */ | |
| | | | |
| /* } Include "FilterCore.dox" */ | | /* } Include "FilterCore.dox" */ | |
| | | | |
| struct oyFilterCore_s { | | struct oyFilterCore_s { | |
| /* Include "Struct.members.h" { */ | | /* Include "Struct.members.h" { */ | |
|
| oyOBJECT_e type_; /**< @private struct type */ | | const oyOBJECT_e type_; /**< The struct type tells Oyranos how | |
| oyStruct_Copy_f copy; /**< copy function */ | | to interprete hidden fields. @brief Type of object */ | |
| oyStruct_Release_f release; /**< release function */ | | oyStruct_Copy_f copy; /**< @brief Copy function */ | |
| oyObject_s oy_; /**< @private features name and hash * | | oyStruct_Release_f release; /**< @brief Release function */ | |
| / | | oyObject_s oy_; /**< Features name and hash. Do not ch | |
| | | ange during object life time. @brief Oyranos internal object */ | |
| | | | |
| /* } Include "Struct.members.h" */ | | /* } Include "Struct.members.h" */ | |
| }; | | }; | |
| | | | |
| OYAPI oyFilterCore_s* OYEXPORT | | OYAPI oyFilterCore_s* OYEXPORT | |
| oyFilterCore_New( oyObject_s object ); | | oyFilterCore_New( oyObject_s object ); | |
| OYAPI oyFilterCore_s* OYEXPORT | | OYAPI oyFilterCore_s* OYEXPORT | |
| oyFilterCore_Copy( oyFilterCore_s *filtercore, oyObject_s obj ); | | oyFilterCore_Copy( oyFilterCore_s *filtercore, oyObject_s obj ); | |
| OYAPI int OYEXPORT | | OYAPI int OYEXPORT | |
| oyFilterCore_Release( oyFilterCore_s **filtercore ); | | oyFilterCore_Release( oyFilterCore_s **filtercore ); | |
| | | | |
| skipping to change at line 106 | | skipping to change at line 105 | |
|---|
| OYAPI const char * OYEXPORT | | OYAPI const char * OYEXPORT | |
| oyFilterCore_GetName ( oyFilterCore_s * filter, | | oyFilterCore_GetName ( oyFilterCore_s * filter, | |
| oyNAME_e name_type ); | | oyNAME_e name_type ); | |
| OYAPI const char * OYEXPORT | | OYAPI const char * OYEXPORT | |
| oyFilterCore_GetText ( oyFilterCore_s * filter, | | oyFilterCore_GetText ( oyFilterCore_s * filter, | |
| oyNAME_e name_type ); | | oyNAME_e name_type ); | |
| OYAPI oyFilterCore_s * OYEXPORT | | OYAPI oyFilterCore_s * OYEXPORT | |
| oyFilterCore_NewWith ( const char * registration, | | oyFilterCore_NewWith ( const char * registration, | |
| oyOptions_s * options, | | oyOptions_s * options, | |
| oyObject_s object ); | | oyObject_s object ); | |
|
| | | #include "oyPointer_s.h" | |
| | | OYAPI oyPointer_s * OYEXPORT | |
| | | oyFilterCore_GetBackendContext( | |
| | | oyFilterCore_s * filter ); | |
| | | OYAPI int OYEXPORT | |
| | | oyFilterCore_SetBackendContext( | |
| | | oyFilterCore_s * filter, | |
| | | oyPointer_s * data ); | |
| | | | |
| /* } Include "FilterCore.public_methods_declarations.h" */ | | /* } Include "FilterCore.public_methods_declarations.h" */ | |
| | | | |
| #ifdef __cplusplus | | #ifdef __cplusplus | |
| } /* extern "C" */ | | } /* extern "C" */ | |
| /*}*/ /* namespace oyranos */ | | /*}*/ /* namespace oyranos */ | |
| #endif /* __cplusplus */ | | #endif /* __cplusplus */ | |
| | | | |
| #endif /* OY_FILTER_CORE_S_H */ | | #endif /* OY_FILTER_CORE_S_H */ | |
| | | | |
| End of changes. 6 change blocks. |
|---|
| 9 lines changed or deleted | | 17 lines changed or added | |
|---|
|
| oyFilterNode_s.h | | oyFilterNode_s.h | |
|---|
| /** @file oyFilterNode_s.h | | /** @file oyFilterNode_s.h | |
| | | | |
| [Template file inheritance graph] | | [Template file inheritance graph] | |
| +-> oyFilterNode_s.template.h | | +-> oyFilterNode_s.template.h | |
| | | | | | |
| +-> Base_s.h | | +-> Base_s.h | |
| | | | | | |
| +-- oyStruct_s.template.h | | +-- oyStruct_s.template.h | |
| | | | |
|
| * Oyranos is an open source Colour Management System | | * Oyranos is an open source Color Management System | |
| * | | * | |
| * @par Copyright: | | * @par Copyright: | |
|
| * 2004-2012 (C) Kai-Uwe Behrmann | | * 2004-2014 (C) Kai-Uwe Behrmann | |
| * | | * | |
| * @author Kai-Uwe Behrmann <ku.b@gmx.de> | | * @author Kai-Uwe Behrmann <ku.b@gmx.de> | |
| * @par License: | | * @par License: | |
| * new BSD - see: http://www.opensource.org/licenses/bsd-license
.php | | * new BSD - see: http://www.opensource.org/licenses/bsd-license
.php | |
|
| * @date 2012/10/08 | | * @date 2014/02/05 | |
| */ | | */ | |
| | | | |
| #ifndef OY_FILTER_NODE_S_H | | #ifndef OY_FILTER_NODE_S_H | |
| #define OY_FILTER_NODE_S_H | | #define OY_FILTER_NODE_S_H | |
| | | | |
| #ifdef __cplusplus | | #ifdef __cplusplus | |
| /*namespace oyranos {*/ | | /*namespace oyranos {*/ | |
| extern "C" { | | extern "C" { | |
| #endif /* __cplusplus */ | | #endif /* __cplusplus */ | |
| | | | |
| | | | |
| skipping to change at line 51 | | skipping to change at line 51 | |
|---|
| | | | |
| /* Include "FilterNode.public.h" { */ | | /* Include "FilterNode.public.h" { */ | |
| | | | |
| /* } Include "FilterNode.public.h" */ | | /* } Include "FilterNode.public.h" */ | |
| | | | |
| /* Include "FilterNode.dox" { */ | | /* Include "FilterNode.dox" { */ | |
| /** @struct oyFilterNode_s | | /** @struct oyFilterNode_s | |
| * @ingroup objects_conversion | | * @ingroup objects_conversion | |
| * @extends oyStruct_s | | * @extends oyStruct_s | |
| * @brief A FilterNode object | | * @brief A FilterNode object | |
|
| * @internal | | | |
| * | | * | |
|
| * Filter nodes chain filters into a oyConversion_s graph. The filter node
s | | * Filter nodes chain filters into a oyConversion_s graph. The filter nodes | |
| * use plugs and sockets for creating connections. Each plug can only conn
ect | | * use plugs and sockets for creating connections. Each plug can only conn
ect | |
| * to one socket. | | * to one socket. | |
| \dot | | \dot | |
| digraph G { | | digraph G { | |
| bgcolor="transparent"; | | bgcolor="transparent"; | |
| node[ shape=plaintext, fontname=Helvetica, fontsize=10 ]; | | node[ shape=plaintext, fontname=Helvetica, fontsize=10 ]; | |
| a [label=< | | a [label=< | |
| <table border="0" cellborder="1" cellspacing="4"> | | <table border="0" cellborder="1" cellspacing="4"> | |
|
| <tr> <td>oyFilterCore_s A</td> | | <tr> <td>oyFilterNode_s A</td> | |
| <td bgcolor="red" width="10" port="s"> socket </td> | | <td bgcolor="red" width="10" port="s"> socket </td> | |
| </tr> | | </tr> | |
| </table>> | | </table>> | |
| ] | | ] | |
| b [label=< | | b [label=< | |
| <table border="0" cellborder="1" cellspacing="4"> | | <table border="0" cellborder="1" cellspacing="4"> | |
| <tr><td bgcolor="lightblue" width="10" port="p"> plug </td> | | <tr><td bgcolor="lightblue" width="10" port="p"> plug </td> | |
|
| <td>oyFilterCore_s B</td> | | <td>oyFilterNode_s B</td> | |
| </tr> | | </tr> | |
| </table>> | | </table>> | |
| ] | | ] | |
| | | | |
| b:p->a:s [arrowtail=crow, arrowhead=box, constraint=false]; | | b:p->a:s [arrowtail=crow, arrowhead=box, constraint=false]; | |
| | | | |
| subgraph cluster_0 { | | subgraph cluster_0 { | |
| color=gray; | | color=gray; | |
| label="FilterNode A"; | | label="FilterNode A"; | |
| a; | | a; | |
| | | | |
| skipping to change at line 92 | | skipping to change at line 91 | |
|---|
| subgraph cluster_1 { | | subgraph cluster_1 { | |
| color=gray; | | color=gray; | |
| label="FilterNode B"; | | label="FilterNode B"; | |
| b; | | b; | |
| } | | } | |
| } | | } | |
| \enddot | | \enddot | |
| * | | * | |
| * This object provides support for separation of options from chaining. | | * This object provides support for separation of options from chaining. | |
| * So it will be possible to implement options changing, which can affect | | * So it will be possible to implement options changing, which can affect | |
|
| * the same filter instance in different graphs. | | * the same filter instance in different graphs. Options and UI data is | |
| | | * defined in the oyCMMapi4_s structure, which is part of the oyFilterCore | |
| | | _s | |
| | | * part of a oyFilterNode_s. | |
| * | | * | |
| * A oyFilterNode_s can have various oyFilterPlug_s ' to obtain data from | | * A oyFilterNode_s can have various oyFilterPlug_s ' to obtain data from | |
|
| * different sources. The required number is described in the oyCMMapi4_s | | * different sources. The required number is described in the oyCMMapi7_s | |
| * structure, which is part of oyFilterCore_s. | | * structure. This structure defines as well the data processing method fo | |
| | | r | |
| | | * running the DAC. | |
| \dot | | \dot | |
| digraph G { | | digraph G { | |
| bgcolor="transparent"; | | bgcolor="transparent"; | |
| rankdir=LR | | rankdir=LR | |
| node [shape=record, fontname=Helvetica, fontsize=10, style="rounded"]; | | node [shape=record, fontname=Helvetica, fontsize=10, style="rounded"]; | |
| edge [fontname=Helvetica, fontsize=10]; | | edge [fontname=Helvetica, fontsize=10]; | |
| | | | |
| b [ label="{<plug> | Filter Node 2 |<socket>}"]; | | b [ label="{<plug> | Filter Node 2 |<socket>}"]; | |
| c [ label="{<plug> | Filter Node 3 |<socket>}"]; | | c [ label="{<plug> | Filter Node 3 |<socket>}"]; | |
| d [ label="{<plug> 2| Filter Node 4 |<socket>}"]; | | d [ label="{<plug> 2| Filter Node 4 |<socket>}"]; | |
| | | | |
| skipping to change at line 144 | | skipping to change at line 146 | |
|---|
| * | | * | |
| * @version Oyranos: 0.1.9 | | * @version Oyranos: 0.1.9 | |
| * @since 2008/07/08 (Oyranos: 0.1.8) | | * @since 2008/07/08 (Oyranos: 0.1.8) | |
| * @date 2008/12/16 | | * @date 2008/12/16 | |
| */ | | */ | |
| | | | |
| /* } Include "FilterNode.dox" */ | | /* } Include "FilterNode.dox" */ | |
| | | | |
| struct oyFilterNode_s { | | struct oyFilterNode_s { | |
| /* Include "Struct.members.h" { */ | | /* Include "Struct.members.h" { */ | |
|
| oyOBJECT_e type_; /**< @private struct type */ | | const oyOBJECT_e type_; /**< The struct type tells Oyranos how | |
| oyStruct_Copy_f copy; /**< copy function */ | | to interprete hidden fields. @brief Type of object */ | |
| oyStruct_Release_f release; /**< release function */ | | oyStruct_Copy_f copy; /**< @brief Copy function */ | |
| oyObject_s oy_; /**< @private features name and hash * | | oyStruct_Release_f release; /**< @brief Release function */ | |
| / | | oyObject_s oy_; /**< Features name and hash. Do not ch | |
| | | ange during object life time. @brief Oyranos internal object */ | |
| | | | |
| /* } Include "Struct.members.h" */ | | /* } Include "Struct.members.h" */ | |
| }; | | }; | |
| | | | |
| OYAPI oyFilterNode_s* OYEXPORT | | OYAPI oyFilterNode_s* OYEXPORT | |
| oyFilterNode_New( oyObject_s object ); | | oyFilterNode_New( oyObject_s object ); | |
| OYAPI oyFilterNode_s* OYEXPORT | | OYAPI oyFilterNode_s* OYEXPORT | |
| oyFilterNode_Copy( oyFilterNode_s *filternode, oyObject_s obj ); | | oyFilterNode_Copy( oyFilterNode_s *filternode, oyObject_s obj ); | |
| OYAPI int OYEXPORT | | OYAPI int OYEXPORT | |
| oyFilterNode_Release( oyFilterNode_s **filternode ); | | oyFilterNode_Release( oyFilterNode_s **filternode ); | |
| | | | |
| /* Include "FilterNode.public_methods_declarations.h" { */ | | /* Include "FilterNode.public_methods_declarations.h" { */ | |
| OYAPI int OYEXPORT | | OYAPI int OYEXPORT | |
|
| oyCMMptr_ConvertData (oyPointer_s * cmm_ptr, | | | |
| oyPointer_s * cmm_ptr_out, | | | |
| oyFilterNode_s * node ); | | | |
| OYAPI int OYEXPORT | | | |
| oyFilterNode_Connect (oyFilterNode_s * input, | | oyFilterNode_Connect (oyFilterNode_s * input, | |
| const char * socket_nick, | | const char * socket_nick, | |
| oyFilterNode_s * output, | | oyFilterNode_s * output, | |
| const char * plug_nick, | | const char * plug_nick, | |
| int flags ); | | int flags ); | |
| OYAPI int OYEXPORT | | OYAPI int OYEXPORT | |
| oyFilterNode_ConnectorMatch ( | | oyFilterNode_ConnectorMatch ( | |
| oyFilterNode_s * node_first, | | oyFilterNode_s * node_first, | |
| int pos_first, | | int pos_first, | |
| oyFilterPlug_s * plug ); | | oyFilterPlug_s * plug ); | |
| | | | |
| skipping to change at line 264 | | skipping to change at line 262 | |
|---|
| OYAPI const char * OYEXPORT | | OYAPI const char * OYEXPORT | |
| oyFilterNode_GetRegistration | | oyFilterNode_GetRegistration | |
| ( oyFilterNode_s * node ); | | ( oyFilterNode_s * node ); | |
| OYAPI const char * OYEXPORT | | OYAPI const char * OYEXPORT | |
| oyFilterNode_GetRelatives | | oyFilterNode_GetRelatives | |
| ( oyFilterNode_s * node ); | | ( oyFilterNode_s * node ); | |
| OYAPI const char * OYEXPORT | | OYAPI const char * OYEXPORT | |
| oyFilterNode_GetModuleName | | oyFilterNode_GetModuleName | |
| ( oyFilterNode_s * node ); | | ( oyFilterNode_s * node ); | |
| OYAPI oyPointer_s * OYEXPORT | | OYAPI oyPointer_s * OYEXPORT | |
|
| oyFilterNode_GetModuleData( | | oyFilterNode_GetContext( | |
| | | oyFilterNode_s * node ); | |
| | | OYAPI int OYEXPORT | |
| | | oyFilterNode_SetContext( | |
| | | oyFilterNode_s * node, | |
| | | oyPointer_s * data ); | |
| | | OYAPI oyBlob_s * OYEXPORT | |
| | | oyFilterNode_ToBlob ( oyFilterNode_s * node, | |
| | | oyObject_s object ); | |
| | | OYAPI oyPointer_s * OYEXPORT | |
| | | oyFilterNode_GetBackendContext( | |
| oyFilterNode_s * node ); | | oyFilterNode_s * node ); | |
| OYAPI int OYEXPORT | | OYAPI int OYEXPORT | |
|
| oyFilterNode_SetModuleData( | | oyFilterNode_SetBackendContext( | |
| oyFilterNode_s * node, | | oyFilterNode_s * node, | |
| oyPointer_s * data ); | | oyPointer_s * data ); | |
| | | | |
| /* } Include "FilterNode.public_methods_declarations.h" */ | | /* } Include "FilterNode.public_methods_declarations.h" */ | |
| | | | |
| #ifdef __cplusplus | | #ifdef __cplusplus | |
| } /* extern "C" */ | | } /* extern "C" */ | |
| /*}*/ /* namespace oyranos */ | | /*}*/ /* namespace oyranos */ | |
| #endif /* __cplusplus */ | | #endif /* __cplusplus */ | |
| | | | |
| | | | |
| End of changes. 13 change blocks. |
|---|
| 21 lines changed or deleted | | 32 lines changed or added | |
|---|
|
| oyImage_s.h | | oyImage_s.h | |
|---|
| /** @file oyImage_s.h | | /** @file oyImage_s.h | |
| | | | |
| [Template file inheritance graph] | | [Template file inheritance graph] | |
| +-> oyImage_s.template.h | | +-> oyImage_s.template.h | |
| | | | | | |
| +-> Base_s.h | | +-> Base_s.h | |
| | | | | | |
| +-- oyStruct_s.template.h | | +-- oyStruct_s.template.h | |
| | | | |
|
| * Oyranos is an open source Colour Management System | | * Oyranos is an open source Color Management System | |
| * | | * | |
| * @par Copyright: | | * @par Copyright: | |
|
| * 2004-2012 (C) Kai-Uwe Behrmann | | * 2004-2014 (C) Kai-Uwe Behrmann | |
| * | | * | |
| * @author Kai-Uwe Behrmann <ku.b@gmx.de> | | * @author Kai-Uwe Behrmann <ku.b@gmx.de> | |
| * @par License: | | * @par License: | |
| * new BSD - see: http://www.opensource.org/licenses/bsd-license
.php | | * new BSD - see: http://www.opensource.org/licenses/bsd-license
.php | |
|
| * @date 2012/10/08 | | * @date 2014/01/11 | |
| */ | | */ | |
| | | | |
| #ifndef OY_IMAGE_S_H | | #ifndef OY_IMAGE_S_H | |
| #define OY_IMAGE_S_H | | #define OY_IMAGE_S_H | |
| | | | |
| #ifdef __cplusplus | | #ifdef __cplusplus | |
| /*namespace oyranos {*/ | | /*namespace oyranos {*/ | |
| extern "C" { | | extern "C" { | |
| #endif /* __cplusplus */ | | #endif /* __cplusplus */ | |
| | | | |
| | | | |
| skipping to change at line 41 | | skipping to change at line 41 | |
|---|
| typedef struct oyImage_s oyImage_s; | | typedef struct oyImage_s oyImage_s; | |
| | | | |
| #include "oyStruct_s.h" | | #include "oyStruct_s.h" | |
| | | | |
| #include "oyranos_image.h" | | #include "oyranos_image.h" | |
| #include "oyProfile_s.h" | | #include "oyProfile_s.h" | |
| #include "oyRectangle_s.h" | | #include "oyRectangle_s.h" | |
| #include "oyArray2d_s.h" | | #include "oyArray2d_s.h" | |
| | | | |
| /* Include "Image.public.h" { */ | | /* Include "Image.public.h" { */ | |
|
| | | /** | |
| /** param[out] is_allocated are the points always newly alloca | | * Typedef oyImage_GetPoint_f | |
| ted*/ | | * @memberof oyImage_s | |
| | | * @brief pixel accessor | |
| | | * | |
| | | * @param[in,out] image the image object | |
| | | * @param[in] point_x the data location in x direction | |
| | | * @param[in] point_y the data location in y direction | |
| | | * @param[in] channel the nth channel will is requested | |
| | | * -1 means to request all channels, | |
| | | note | |
| | | * that can be an expensive call for | |
| | | non | |
| | | * continous pixel layouts | |
| | | * @param[out] is_allocated are the points always newly alloca | |
| | | ted? | |
| | | * | |
| | | * @version Oyranos: 0.1.8 | |
| | | * @since 2008/06/26 (Oyranos: 0.1.8) | |
| | | * @date 2008/06/26 | |
| | | */ | |
| typedef oyPointer (*oyImage_GetPoint_f)( oyImage_s * image, | | typedef oyPointer (*oyImage_GetPoint_f)( oyImage_s * image, | |
| int point_x, | | int point_x, | |
| int point_y, | | int point_y, | |
| int channel, | | int channel, | |
| int * is_allocated ); | | int * is_allocated ); | |
|
| /** param[out] is_allocated are the lines always newly allocat
ed */ | | /** param[out] is_allocated are the lines always newly allocat
ed? */ | |
| typedef oyPointer (*oyImage_GetLine_f) ( oyImage_s * image, | | typedef oyPointer (*oyImage_GetLine_f) ( oyImage_s * image, | |
| int line_y, | | int line_y, | |
| int * height, | | int * height, | |
| int channel, | | int channel, | |
| int * is_allocated ); | | int * is_allocated ); | |
|
| /** param[out] is_allocated are the tiles always newly allocat
ed */ | | /** param[out] is_allocated are the tiles always newly allocat
ed? */ | |
| typedef oyPointer*(*oyImage_GetTile_f) ( oyImage_s * image, | | typedef oyPointer*(*oyImage_GetTile_f) ( oyImage_s * image, | |
| int tile_x, | | int tile_x, | |
| int tile_y, | | int tile_y, | |
| int channel, | | int channel, | |
| int * is_allocated ); | | int * is_allocated ); | |
|
| | | /** | |
| | | * Typedef oyImage_SetPoint_f | |
| | | * @memberof oyImage_s | |
| | | * @brief pixel setter | |
| | | * | |
| | | * @param[in,out] image the image object | |
| | | * @param[in] point_x the data location in x direction | |
| | | * @param[in] point_y the data location in y direction | |
| | | * @param[in] channel the nth channel will is requested | |
| | | * -1 means to request all channels, | |
| | | note | |
| | | * that can be an expensive call for | |
| | | non | |
| | | * continous pixel layouts | |
| | | * @param[out] data the data to be copied into the ima | |
| | | ge | |
| | | * | |
| | | * @version Oyranos: 0.1.8 | |
| | | * @since 2008/06/26 (Oyranos: 0.1.8) | |
| | | * @date 2008/06/26 | |
| | | */ | |
| typedef int (*oyImage_SetPoint_f)( oyImage_s * image, | | typedef int (*oyImage_SetPoint_f)( oyImage_s * image, | |
| int point_x, | | int point_x, | |
| int point_y, | | int point_y, | |
| int channel, | | int channel, | |
| oyPointer data ); | | oyPointer data ); | |
| typedef int (*oyImage_SetLine_f) ( oyImage_s * image, | | typedef int (*oyImage_SetLine_f) ( oyImage_s * image, | |
| int point_x, | | int point_x, | |
| int point_y, | | int point_y, | |
| int pixel_n, | | int pixel_n, | |
| int channel, | | int channel, | |
| | | | |
| skipping to change at line 174 | | skipping to change at line 208 | |
|---|
| * | | * | |
| * @version Oyranos: 0.1.8 | | * @version Oyranos: 0.1.8 | |
| * @since 2007/11/00 (Oyranos: 0.1.8) | | * @since 2007/11/00 (Oyranos: 0.1.8) | |
| * @date 2008/08/23 | | * @date 2008/08/23 | |
| */ | | */ | |
| | | | |
| /* } Include "Image.dox" */ | | /* } Include "Image.dox" */ | |
| | | | |
| struct oyImage_s { | | struct oyImage_s { | |
| /* Include "Struct.members.h" { */ | | /* Include "Struct.members.h" { */ | |
|
| oyOBJECT_e type_; /**< @private struct type */ | | const oyOBJECT_e type_; /**< The struct type tells Oyranos how | |
| oyStruct_Copy_f copy; /**< copy function */ | | to interprete hidden fields. @brief Type of object */ | |
| oyStruct_Release_f release; /**< release function */ | | oyStruct_Copy_f copy; /**< @brief Copy function */ | |
| oyObject_s oy_; /**< @private features name and hash * | | oyStruct_Release_f release; /**< @brief Release function */ | |
| / | | oyObject_s oy_; /**< Features name and hash. Do not ch | |
| | | ange during object life time. @brief Oyranos internal object */ | |
| | | | |
| /* } Include "Struct.members.h" */ | | /* } Include "Struct.members.h" */ | |
| }; | | }; | |
| | | | |
| OYAPI oyImage_s* OYEXPORT | | OYAPI oyImage_s* OYEXPORT | |
| oyImage_New( oyObject_s object ); | | oyImage_New( oyObject_s object ); | |
| OYAPI oyImage_s* OYEXPORT | | OYAPI oyImage_s* OYEXPORT | |
| oyImage_Copy( oyImage_s *image, oyObject_s obj ); | | oyImage_Copy( oyImage_s *image, oyObject_s obj ); | |
| OYAPI int OYEXPORT | | OYAPI int OYEXPORT | |
| oyImage_Release( oyImage_s **image ); | | oyImage_Release( oyImage_s **image ); | |
| | | | |
| skipping to change at line 204 | | skipping to change at line 238 | |
|---|
| oyCHANNELTYPE_e oyImage_GetChannelType ( | | oyCHANNELTYPE_e oyImage_GetChannelType ( | |
| oyImage_s * image, | | oyImage_s * image, | |
| int pos ); | | int pos ); | |
| int oyImage_GetSubPositioning ( | | int oyImage_GetSubPositioning ( | |
| oyImage_s * image ); | | oyImage_s * image ); | |
| oyOptions_s * oyImage_GetTags ( oyImage_s * image ); | | oyOptions_s * oyImage_GetTags ( oyImage_s * image ); | |
| oyProfile_s * oyImage_GetProfile ( oyImage_s * image ); | | oyProfile_s * oyImage_GetProfile ( oyImage_s * image ); | |
| oyStruct_s * oyImage_GetPixelData ( oyImage_s * image ); | | oyStruct_s * oyImage_GetPixelData ( oyImage_s * image ); | |
| oyImage_GetPoint_f oyImage_GetPointF ( oyImage_s * image ); | | oyImage_GetPoint_f oyImage_GetPointF ( oyImage_s * image ); | |
| oyImage_GetLine_f oyImage_GetLineF ( oyImage_s * image ); | | oyImage_GetLine_f oyImage_GetLineF ( oyImage_s * image ); | |
|
| | | oyImage_SetPoint_f oyImage_GetSetPointF ( | |
| | | oyImage_s * image ); | |
| | | oyImage_SetLine_f oyImage_GetSetLineF( oyImage_s * image ); | |
| oyStruct_s * oyImage_GetUserData ( oyImage_s * image ); | | oyStruct_s * oyImage_GetUserData ( oyImage_s * image ); | |
| oyImage_s * oyImage_Create ( int width, | | oyImage_s * oyImage_Create ( int width, | |
| int height, | | int height, | |
| oyPointer channels, | | oyPointer channels, | |
| oyPixel_t pixel_layout, | | oyPixel_t pixel_layout, | |
| oyProfile_s * profile, | | oyProfile_s * profile, | |
| oyObject_s object); | | oyObject_s object); | |
| oyImage_s * oyImage_CreateForDisplay ( int width, | | oyImage_s * oyImage_CreateForDisplay ( int width, | |
| int height, | | int height, | |
| oyPointer channels, | | oyPointer channels, | |
| | | | |
| End of changes. 9 change blocks. |
|---|
| 13 lines changed or deleted | | 56 lines changed or added | |
|---|
|
| oyOption_s.h | | oyOption_s.h | |
|---|
| /** @file oyOption_s.h | | /** @file oyOption_s.h | |
| | | | |
| [Template file inheritance graph] | | [Template file inheritance graph] | |
| +-> oyOption_s.template.h | | +-> oyOption_s.template.h | |
| | | | | | |
| +-> Base_s.h | | +-> Base_s.h | |
| | | | | | |
| +-- oyStruct_s.template.h | | +-- oyStruct_s.template.h | |
| | | | |
|
| * Oyranos is an open source Colour Management System | | * Oyranos is an open source Color Management System | |
| * | | * | |
| * @par Copyright: | | * @par Copyright: | |
|
| * 2004-2012 (C) Kai-Uwe Behrmann | | * 2004-2014 (C) Kai-Uwe Behrmann | |
| * | | * | |
| * @author Kai-Uwe Behrmann <ku.b@gmx.de> | | * @author Kai-Uwe Behrmann <ku.b@gmx.de> | |
| * @par License: | | * @par License: | |
| * new BSD - see: http://www.opensource.org/licenses/bsd-license
.php | | * new BSD - see: http://www.opensource.org/licenses/bsd-license
.php | |
|
| * @date 2012/10/05 | | * @date 2014/01/11 | |
| */ | | */ | |
| | | | |
| #ifndef OY_OPTION_S_H | | #ifndef OY_OPTION_S_H | |
| #define OY_OPTION_S_H | | #define OY_OPTION_S_H | |
| | | | |
| #ifdef __cplusplus | | #ifdef __cplusplus | |
| /*namespace oyranos {*/ | | /*namespace oyranos {*/ | |
| extern "C" { | | extern "C" { | |
| #endif /* __cplusplus */ | | #endif /* __cplusplus */ | |
| | | | |
| | | | |
| skipping to change at line 121 | | skipping to change at line 121 | |
|---|
| | | | |
| /* } Include "Option.public.h" */ | | /* } Include "Option.public.h" */ | |
| | | | |
| /* Include "Option.dox" { */ | | /* Include "Option.dox" { */ | |
| /** @struct oyOption_s | | /** @struct oyOption_s | |
| * @ingroup objects_value | | * @ingroup objects_value | |
| * @extends oyStruct_s | | * @extends oyStruct_s | |
| * @brief Option object | | * @brief Option object | |
| * | | * | |
| @todo include the oyOptions_t_ type for gui elements | | @todo include the oyOptions_t_ type for gui elements | |
|
| should be used in a list oyColourTransformOptions_s to form a options s
et | | should be used in a list oyColorTransformOptions_s to form a options se
t | |
| oyOptions_t_ covers as well the UI part which should be separated as of
the | | oyOptions_t_ covers as well the UI part which should be separated as of
the | |
| SimpleToolkitAbstraction project: | | SimpleToolkitAbstraction project: | |
| http://www.oyranos.org/wiki/index.php?title=XML_Plug-in_options | | http://www.oyranos.org/wiki/index.php?title=XML_Plug-in_options | |
| As of this architecture change The UI part must be decided to obtain a | | As of this architecture change The UI part must be decided to obtain a | |
| place. Probably in oyOptions_s? | | place. Probably in oyOptions_s? | |
| Thus the oyOption_s::name member should be removed. | | Thus the oyOption_s::name member should be removed. | |
| | | | |
| * The id field maps to a oyWidget_s object. | | * The id field maps to a oyWidget_s object. | |
| * Options and widgets are to be queried by the according function / CMM | | * Options and widgets are to be queried by the according function / CMM | |
| * combination. | | * combination. | |
| * | | * | |
| * @version Oyranos: 0.1.8 | | * @version Oyranos: 0.1.8 | |
| * @since 2007/00/00 (Oyranos: 0.1.x) | | * @since 2007/00/00 (Oyranos: 0.1.x) | |
| * @date 2008/04/14 | | * @date 2008/04/14 | |
| */ | | */ | |
| | | | |
| /* } Include "Option.dox" */ | | /* } Include "Option.dox" */ | |
| | | | |
| struct oyOption_s { | | struct oyOption_s { | |
| /* Include "Struct.members.h" { */ | | /* Include "Struct.members.h" { */ | |
|
| oyOBJECT_e type_; /**< @private struct type */ | | const oyOBJECT_e type_; /**< The struct type tells Oyranos how | |
| oyStruct_Copy_f copy; /**< copy function */ | | to interprete hidden fields. @brief Type of object */ | |
| oyStruct_Release_f release; /**< release function */ | | oyStruct_Copy_f copy; /**< @brief Copy function */ | |
| oyObject_s oy_; /**< @private features name and hash * | | oyStruct_Release_f release; /**< @brief Release function */ | |
| / | | oyObject_s oy_; /**< Features name and hash. Do not ch | |
| | | ange during object life time. @brief Oyranos internal object */ | |
| | | | |
| /* } Include "Struct.members.h" */ | | /* } Include "Struct.members.h" */ | |
| }; | | }; | |
| | | | |
| OYAPI oyOption_s* OYEXPORT | | OYAPI oyOption_s* OYEXPORT | |
| oyOption_New( oyObject_s object ); | | oyOption_New( oyObject_s object ); | |
| OYAPI oyOption_s* OYEXPORT | | OYAPI oyOption_s* OYEXPORT | |
| oyOption_Copy( oyOption_s *option, oyObject_s obj ); | | oyOption_Copy( oyOption_s *option, oyObject_s obj ); | |
| OYAPI int OYEXPORT | | OYAPI int OYEXPORT | |
| oyOption_Release( oyOption_s **option ); | | oyOption_Release( oyOption_s **option ); | |
| | | | |
| skipping to change at line 213 | | skipping to change at line 213 | |
|---|
| size_t * size, | | size_t * size, | |
| oyAlloc_f allocateFunc ); | | oyAlloc_f allocateFunc ); | |
| OYAPI int OYEXPORT | | OYAPI int OYEXPORT | |
| oyOption_SetRegistration ( | | oyOption_SetRegistration ( | |
| oyOption_s * option, | | oyOption_s * option, | |
| const char * registration ); | | const char * registration ); | |
| OYAPI const char * OYEXPORT | | OYAPI const char * OYEXPORT | |
| oyOption_GetRegistration ( | | oyOption_GetRegistration ( | |
| oyOption_s * option ); | | oyOption_s * option ); | |
| OYAPI int OYEXPORT | | OYAPI int OYEXPORT | |
|
| oyOption_StructMoveIn(oyOption_s * option, | | oyOption_MoveInStruct(oyOption_s * option, | |
| oyStruct_s ** s ); | | oyStruct_s ** s ); | |
| OYAPI oyStruct_s * OYEXPORT | | OYAPI oyStruct_s * OYEXPORT | |
| oyOption_GetStruct ( oyOption_s * option, | | oyOption_GetStruct ( oyOption_s * option, | |
| oyOBJECT_e type ); | | oyOBJECT_e type ); | |
| OYAPI int OYEXPORT | | OYAPI int OYEXPORT | |
| oyOption_SetValueFromDB ( | | oyOption_SetValueFromDB ( | |
| oyOption_s * option ); | | oyOption_s * option ); | |
| OYAPI void OYEXPORT | | OYAPI void OYEXPORT | |
| oyOption_SetSource ( oyOption_s * option, | | oyOption_SetSource ( oyOption_s * option, | |
| oyOPTIONSOURCE_e source ); | | oyOPTIONSOURCE_e source ); | |
| | | | |
| End of changes. 6 change blocks. |
|---|
| 10 lines changed or deleted | | 11 lines changed or added | |
|---|
|
| oyProfile_s.h | | oyProfile_s.h | |
|---|
| /** @file oyProfile_s.h | | /** @file oyProfile_s.h | |
| | | | |
| [Template file inheritance graph] | | [Template file inheritance graph] | |
| +-> oyProfile_s.template.h | | +-> oyProfile_s.template.h | |
| | | | | | |
| +-> Base_s.h | | +-> Base_s.h | |
| | | | | | |
| +-- oyStruct_s.template.h | | +-- oyStruct_s.template.h | |
| | | | |
|
| * Oyranos is an open source Colour Management System | | * Oyranos is an open source Color Management System | |
| * | | * | |
| * @par Copyright: | | * @par Copyright: | |
|
| * 2004-2012 (C) Kai-Uwe Behrmann | | * 2004-2014 (C) Kai-Uwe Behrmann | |
| * | | * | |
| * @author Kai-Uwe Behrmann <ku.b@gmx.de> | | * @author Kai-Uwe Behrmann <ku.b@gmx.de> | |
| * @par License: | | * @par License: | |
| * new BSD - see: http://www.opensource.org/licenses/bsd-license
.php | | * new BSD - see: http://www.opensource.org/licenses/bsd-license
.php | |
|
| * @date 2012/11/15 | | * @date 2014/03/06 | |
| */ | | */ | |
| | | | |
| #ifndef OY_PROFILE_S_H | | #ifndef OY_PROFILE_S_H | |
| #define OY_PROFILE_S_H | | #define OY_PROFILE_S_H | |
| | | | |
| #ifdef __cplusplus | | #ifdef __cplusplus | |
| /*namespace oyranos {*/ | | /*namespace oyranos {*/ | |
| extern "C" { | | extern "C" { | |
| #endif /* __cplusplus */ | | #endif /* __cplusplus */ | |
| | | | |
| | | | |
| skipping to change at line 54 | | skipping to change at line 54 | |
|---|
| parametric type as shorthand for IO flags \n | | parametric type as shorthand for IO flags \n | |
| | | | |
| should fit into a 32bit type, usual unsigned int or uint32_t \n | | should fit into a 32bit type, usual unsigned int or uint32_t \n | |
| | | | |
| ------ W R \n | | ------ W R \n | |
| | | | |
| R no cache read \n | | R no cache read \n | |
| W no cache write \n | | W no cache write \n | |
| | | | |
| */ | | */ | |
|
| #define OY_NO_CACHE_READ 0x01 /** read not from cache */ | | #define OY_NO_CACHE_READ 0x01 /**< read not from cache */ | |
| #define OY_NO_CACHE_WRITE 0x02 /** write not from cache */ | | #define OY_NO_CACHE_WRITE 0x02 /**< write not from cache * | |
| | | / | |
| /* decode */ | | /* decode */ | |
| #define oyToNoCacheRead_m(r) ((r)&1) | | #define oyToNoCacheRead_m(r) ((r)&1) | |
| #define oyToNoCacheWrite_m(w) (((w) >> 1)&1) | | #define oyToNoCacheWrite_m(w) (((w) >> 1)&1) | |
| | | | |
|
| #define OY_COMPUTE 0x01 | | #define OY_FROM_PROFILE 0x04 /**< use from profile */ | |
| #define OY_FROM_PROFILE 0x04 | | #define OY_COMPUTE 0x08 /**< compute newly */ | |
| | | | |
| /* } Include "Profile.public.h" */ | | /* } Include "Profile.public.h" */ | |
| | | | |
| /* Include "Profile.dox" { */ | | /* Include "Profile.dox" { */ | |
| /** @struct oyProfile_s | | /** @struct oyProfile_s | |
| * @ingroup objects_profile | | * @ingroup objects_profile | |
| * @extends oyStruct_s | | * @extends oyStruct_s | |
| * @brief A profile and its attributes | | * @brief A profile and its attributes | |
| * | | * | |
| * | | * | |
| * @version Oyranos: x.x.x | | * @version Oyranos: x.x.x | |
| * @since YYYY/MM/DD (Oyranos: x.x.x) | | * @since YYYY/MM/DD (Oyranos: x.x.x) | |
| * @date YYYY/MM/DD | | * @date YYYY/MM/DD | |
| */ | | */ | |
| | | | |
| /* } Include "Profile.dox" */ | | /* } Include "Profile.dox" */ | |
| | | | |
| struct oyProfile_s { | | struct oyProfile_s { | |
| /* Include "Struct.members.h" { */ | | /* Include "Struct.members.h" { */ | |
|
| oyOBJECT_e type_; /**< @private struct type */ | | const oyOBJECT_e type_; /**< The struct type tells Oyranos how | |
| oyStruct_Copy_f copy; /**< copy function */ | | to interprete hidden fields. @brief Type of object */ | |
| oyStruct_Release_f release; /**< release function */ | | oyStruct_Copy_f copy; /**< @brief Copy function */ | |
| oyObject_s oy_; /**< @private features name and hash * | | oyStruct_Release_f release; /**< @brief Release function */ | |
| / | | oyObject_s oy_; /**< Features name and hash. Do not ch | |
| | | ange during object life time. @brief Oyranos internal object */ | |
| | | | |
| /* } Include "Struct.members.h" */ | | /* } Include "Struct.members.h" */ | |
| }; | | }; | |
| | | | |
| OYAPI oyProfile_s* OYEXPORT | | OYAPI oyProfile_s* OYEXPORT | |
| oyProfile_New( oyObject_s object ); | | oyProfile_New( oyObject_s object ); | |
| OYAPI oyProfile_s* OYEXPORT | | OYAPI oyProfile_s* OYEXPORT | |
| oyProfile_Copy( oyProfile_s *profile, oyObject_s obj ); | | oyProfile_Copy( oyProfile_s *profile, oyObject_s obj ); | |
| OYAPI int OYEXPORT | | OYAPI int OYEXPORT | |
| oyProfile_Release( oyProfile_s **profile ); | | oyProfile_Release( oyProfile_s **profile ); | |
| | | | |
| skipping to change at line 124 | | skipping to change at line 124 | |
|---|
| OYAPI oyProfile_s * OYEXPORT | | OYAPI oyProfile_s * OYEXPORT | |
| oyProfile_FromMD5( uint32_t * md5, | | oyProfile_FromMD5( uint32_t * md5, | |
| oyObject_s object ); | | oyObject_s object ); | |
| OYAPI oyProfile_s * OYEXPORT | | OYAPI oyProfile_s * OYEXPORT | |
| oyProfile_FromTaxiDB ( | | oyProfile_FromTaxiDB ( | |
| oyOptions_s * options, | | oyOptions_s * options, | |
| oyObject_s object ); | | oyObject_s object ); | |
| OYAPI int OYEXPORT oyProfile_Install ( oyProfile_s * profile, | | OYAPI int OYEXPORT oyProfile_Install ( oyProfile_s * profile, | |
| oyOptions_s * options ); | | oyOptions_s * options ); | |
| OYAPI int OYEXPORT | | OYAPI int OYEXPORT | |
|
| oyProfile_GetChannelsCount ( oyProfile_s * colour ); | | oyProfile_GetChannelsCount ( oyProfile_s * color ); | |
| OYAPI icSignature OYEXPORT | | OYAPI icSignature OYEXPORT | |
| oyProfile_GetSignature ( oyProfile_s * profile, | | oyProfile_GetSignature ( oyProfile_s * profile, | |
| oySIGNATURE_TYPE_e type ); | | oySIGNATURE_TYPE_e type ); | |
| OYAPI int OYEXPORT | | OYAPI int OYEXPORT | |
| oyProfile_SetSignature ( oyProfile_s * profile, | | oyProfile_SetSignature ( oyProfile_s * profile, | |
| icSignature sig, | | icSignature sig, | |
| oySIGNATURE_TYPE_e type ); | | oySIGNATURE_TYPE_e type ); | |
| OYAPI void OYEXPORT | | OYAPI void OYEXPORT | |
|
| oyProfile_SetChannelNames( oyProfile_s * colour, | | oyProfile_SetChannelNames( oyProfile_s * color, | |
| oyObject_s * names_chan ); | | oyObject_s * names_chan ); | |
| OYAPI const oyObject_s * OYEXPORT | | OYAPI const oyObject_s * OYEXPORT | |
|
| oyProfile_GetChannelNames( oyProfile_s * colour); | | oyProfile_GetChannelNames( oyProfile_s * color); | |
| OYAPI const char * OYEXPORT | | OYAPI const char * OYEXPORT | |
| oyProfile_GetChannelName ( oyProfile_s * profile, | | oyProfile_GetChannelName ( oyProfile_s * profile, | |
| int channel_pos, | | int channel_pos, | |
| oyNAME_e type ); | | oyNAME_e type ); | |
| OYAPI const char * OYEXPORT | | OYAPI const char * OYEXPORT | |
| oyProfile_GetID ( oyProfile_s * profile ); | | oyProfile_GetID ( oyProfile_s * profile ); | |
| OYAPI int OYEXPORT | | OYAPI int OYEXPORT | |
| oyProfile_Equal ( oyProfile_s * profileA, | | oyProfile_Equal ( oyProfile_s * profileA, | |
| oyProfile_s * profileB ); | | oyProfile_s * profileB ); | |
| OYAPI const char * OYEXPORT | | OYAPI const char * OYEXPORT | |
| | | | |
| End of changes. 9 change blocks. |
|---|
| 15 lines changed or deleted | | 17 lines changed or added | |
|---|
|
| oyStruct_s.h | | oyStruct_s.h | |
|---|
| /** @file oyStruct_s.h | | /** @file oyStruct_s.h | |
| | | | |
| [Template file inheritance graph] | | [Template file inheritance graph] | |
| +-- oyStruct_s.template.h | | +-- oyStruct_s.template.h | |
| | | | |
|
| * Oyranos is an open source Colour Management System | | * Oyranos is an open source Color Management System | |
| * | | * | |
| * @par Copyright: | | * @par Copyright: | |
|
| * 2004-2012 (C) Kai-Uwe Behrmann | | * 2004-2014 (C) Kai-Uwe Behrmann | |
| * | | * | |
| * @author Kai-Uwe Behrmann <ku.b@gmx.de> | | * @author Kai-Uwe Behrmann <ku.b@gmx.de> | |
| * @par License: | | * @par License: | |
| * new BSD - see: http://www.opensource.org/licenses/bsd-license
.php | | * new BSD - see: http://www.opensource.org/licenses/bsd-license
.php | |
|
| * @date 2012/10/08 | | * @date 2014/02/04 | |
| */ | | */ | |
| | | | |
| #ifndef OY_STRUCT_S_H | | #ifndef OY_STRUCT_S_H | |
| #define OY_STRUCT_S_H | | #define OY_STRUCT_S_H | |
| | | | |
| #ifdef __cplusplus | | #ifdef __cplusplus | |
| /*namespace oyranos {*/ | | /*namespace oyranos {*/ | |
| extern "C" { | | extern "C" { | |
| #endif /* __cplusplus */ | | #endif /* __cplusplus */ | |
| | | | |
| #include <oyranos_object.h> | | #include <oyranos_object.h> | |
| | | | |
| typedef struct oyStruct_s oyStruct_s; | | typedef struct oyStruct_s oyStruct_s; | |
| | | | |
| /* Include "Struct.public.h" { */ | | /* Include "Struct.public.h" { */ | |
| #include <oyranos_core.h> | | #include <oyranos_core.h> | |
| | | | |
| const char * oyStruct_TypeToText ( const oyStruct_s * st ); | | const char * oyStruct_TypeToText ( const oyStruct_s * st ); | |
| | | | |
|
| | | /** @brief reference a object or with second argument present do a copy */ | |
| typedef oyStruct_s * (*oyStruct_Copy_f ) ( oyStruct_s *, oyPointer ); | | typedef oyStruct_s * (*oyStruct_Copy_f ) ( oyStruct_s *, oyPointer ); | |
|
| | | /** @brief release object */ | |
| typedef int (*oyStruct_Release_f ) ( oyStruct_s ** ); | | typedef int (*oyStruct_Release_f ) ( oyStruct_s ** ); | |
|
| | | /** @brief create a lock object */ | |
| typedef oyPointer (*oyStruct_LockCreate_f)(oyStruct_s * obj ); | | typedef oyPointer (*oyStruct_LockCreate_f)(oyStruct_s * obj ); | |
| | | | |
| /* Locking function declarations { */ | | /* Locking function declarations { */ | |
| extern oyStruct_LockCreate_f oyStruct_LockCreateFunc_; | | extern oyStruct_LockCreate_f oyStruct_LockCreateFunc_; | |
| extern oyLockRelease_f oyLockReleaseFunc_; | | extern oyLockRelease_f oyLockReleaseFunc_; | |
| extern oyLock_f oyLockFunc_; | | extern oyLock_f oyLockFunc_; | |
| extern oyUnLock_f oyUnLockFunc_; | | extern oyUnLock_f oyUnLockFunc_; | |
| /* } Locking function declarations */ | | /* } Locking function declarations */ | |
| | | | |
| void oyThreadLockingSet ( oyStruct_LockCreate_f createLockFun
c, | | void oyThreadLockingSet ( oyStruct_LockCreate_f createLockFun
c, | |
| oyLockRelease_f releaseLockFunc, | | oyLockRelease_f releaseLockFunc, | |
| oyLock_f lockFunc, | | oyLock_f lockFunc, | |
| oyUnLock_f unlockFunc ); | | oyUnLock_f unlockFunc ); | |
|
| | | int oyThreadLockingReady ( void ); | |
| /* } Message function declarations */ | | | |
| | | | |
| /* } Include "Struct.public.h" */ | | /* } Include "Struct.public.h" */ | |
| | | | |
| /* Include "Struct.dox" { */ | | /* Include "Struct.dox" { */ | |
| /** @struct oyStruct_s | | /** @struct oyStruct_s | |
| * @ingroup objects_generic | | * @ingroup objects_generic | |
| * @brief Oyranos base structure | | * @brief Oyranos base structure | |
| * | | * | |
|
| * All Oyranos structures should be castable to this basic one. | | * All inherited Oyranos structures should be castable to this basic one. | |
| * | | * | |
| * @note New templates will not be created automaticly [notemplates] | | * @note New templates will not be created automaticly [notemplates] | |
| * | | * | |
| * @version Oyranos: x.x.x | | * @version Oyranos: x.x.x | |
| * @since Oyranos: version 0.1.8 | | * @since Oyranos: version 0.1.8 | |
| * @date 1 january 2008 (API 0.1.8) | | * @date 1 january 2008 (API 0.1.8) | |
| */ | | */ | |
| | | | |
| /* } Include "Struct.dox" */ | | /* } Include "Struct.dox" */ | |
| | | | |
| struct oyStruct_s { | | struct oyStruct_s { | |
| /* Include "Struct.members.h" { */ | | /* Include "Struct.members.h" { */ | |
|
| oyOBJECT_e type_; /**< @private struct type */ | | const oyOBJECT_e type_; /**< The struct type tells Oyranos how | |
| oyStruct_Copy_f copy; /**< copy function */ | | to interprete hidden fields. @brief Type of object */ | |
| oyStruct_Release_f release; /**< release function */ | | oyStruct_Copy_f copy; /**< @brief Copy function */ | |
| oyObject_s oy_; /**< @private features name and hash * | | oyStruct_Release_f release; /**< @brief Release function */ | |
| / | | oyObject_s oy_; /**< Features name and hash. Do not ch | |
| | | ange during object life time. @brief Oyranos internal object */ | |
| | | | |
| /* } Include "Struct.members.h" */ | | /* } Include "Struct.members.h" */ | |
| }; | | }; | |
| | | | |
| /* Include "Struct.public_methods_declarations.h" { */ | | /* Include "Struct.public_methods_declarations.h" { */ | |
| OYAPI const char * OYEXPORT | | OYAPI const char * OYEXPORT | |
| oyStruct_GetText ( oyStruct_s * obj, | | oyStruct_GetText ( oyStruct_s * obj, | |
| oyNAME_e name_type, | | oyNAME_e name_type, | |
| uint32_t flags ); | | uint32_t flags ); | |
| | | | |
| | | | |
| End of changes. 9 change blocks. |
|---|
| 11 lines changed or deleted | | 14 lines changed or added | |
|---|
|
| oyranos.h | | oyranos.h | |
|---|
| /** @file oyranos.h | | /** @file oyranos.h | |
| * | | * | |
|
| * Oyranos is an open source Colour Management System | | * Oyranos is an open source Color Management System | |
| * | | * | |
| * @par Copyright: | | * @par Copyright: | |
| * 2004-2010 (C) Kai-Uwe Behrmann | | * 2004-2010 (C) Kai-Uwe Behrmann | |
| * | | * | |
| * @brief public Oyranos API's | | * @brief public Oyranos API's | |
| * @author Kai-Uwe Behrmann <ku.b@gmx.de> | | * @author Kai-Uwe Behrmann <ku.b@gmx.de> | |
| * @par License: | | * @par License: | |
| * new BSD <http://www.opensource.org/licenses/bsd-license.php> | | * new BSD <http://www.opensource.org/licenses/bsd-license.php> | |
| * @since 2004/11/25 | | * @since 2004/11/25 | |
| */ | | */ | |
| | | | |
| skipping to change at line 60 | | skipping to change at line 60 | |
|---|
| * | | * | |
| * possibly include the default profiles here | | * possibly include the default profiles here | |
| */ | | */ | |
| typedef enum { | | typedef enum { | |
| oyBEHAVIOUR_START = 30, | | oyBEHAVIOUR_START = 30, | |
| oyBEHAVIOUR_ACTION_UNTAGGED_ASSIGN, /**< What to do if image is untagged
? */ | | oyBEHAVIOUR_ACTION_UNTAGGED_ASSIGN, /**< What to do if image is untagged
? */ | |
| oyBEHAVIOUR_ACTION_OPEN_MISMATCH_RGB,/**< What to do if profiles mismatch
? */ | | oyBEHAVIOUR_ACTION_OPEN_MISMATCH_RGB,/**< What to do if profiles mismatch
? */ | |
| oyBEHAVIOUR_ACTION_OPEN_MISMATCH_CMYK,/**< What to do if profiles mismatc
h ?*/ | | oyBEHAVIOUR_ACTION_OPEN_MISMATCH_CMYK,/**< What to do if profiles mismatc
h ?*/ | |
| oyBEHAVIOUR_MIXED_MOD_DOCUMENTS_PRINT,/**< Convert befor save for Print?
*/ | | oyBEHAVIOUR_MIXED_MOD_DOCUMENTS_PRINT,/**< Convert befor save for Print?
*/ | |
| oyBEHAVIOUR_MIXED_MOD_DOCUMENTS_SCREEN,/**< Convert befor save for Screen
? */ | | oyBEHAVIOUR_MIXED_MOD_DOCUMENTS_SCREEN,/**< Convert befor save for Screen
? */ | |
|
| oyBEHAVIOUR_RENDERING_INTENT, /**< Standard colour transformations
*/ | | oyBEHAVIOUR_RENDERING_INTENT, /**< Standard color transformations
*/ | |
| oyBEHAVIOUR_RENDERING_BPC, /**< use BlackPointCompensation */ | | oyBEHAVIOUR_RENDERING_BPC, /**< use BlackPointCompensation */ | |
|
| oyBEHAVIOUR_RENDERING_INTENT_PROOF, /**< Proofing colour transformations
*/ | | oyBEHAVIOUR_RENDERING_INTENT_PROOF, /**< Proofing color transformations
*/ | |
| oyBEHAVIOUR_PROOF_SOFT, /**< Proofing by default for screen
*/ | | oyBEHAVIOUR_PROOF_SOFT, /**< Proofing by default for screen
*/ | |
| oyBEHAVIOUR_PROOF_HARD, /**< Proofing by default for printin
g */ | | oyBEHAVIOUR_PROOF_HARD, /**< Proofing by default for printin
g */ | |
|
| oyBEHAVIOUR_RENDERING_GAMUT_WARNING, /**< mark out of gamut colours */ | | oyBEHAVIOUR_RENDERING_GAMUT_WARNING, /**< mark out of gamut colors */ | |
| oyBEHAVIOUR_END /**< just for easen Gui design */ | | oyBEHAVIOUR_END /**< just for easen Gui design */ | |
| } oyBEHAVIOUR_e; | | } oyBEHAVIOUR_e; | |
| | | | |
| enum { | | enum { | |
| oyNO, /**< dont do it */ | | oyNO, /**< dont do it */ | |
| oyYES, /**< automaticaly perform action */ | | oyYES, /**< automaticaly perform action */ | |
| oyASK /**< popup dialog */ | | oyASK /**< popup dialog */ | |
| }; /**< for oyBEHAVIOUR_ACTION */ | | }; /**< for oyBEHAVIOUR_ACTION */ | |
| | | | |
| #define oyALL oyASK | | #define oyALL oyASK | |
| | | | |
| skipping to change at line 147 | | skipping to change at line 147 | |
|---|
| /** @deprecated | | /** @deprecated | |
| provide oyDEFAULT_PROFILE for compatibility | | provide oyDEFAULT_PROFILE for compatibility | |
| */ | | */ | |
| #if !defined(OY_IGNORE_DEPRECATED) || (OY_IGNORE_DEPRECATED < OYRANOS_VERSI
ON) | | #if !defined(OY_IGNORE_DEPRECATED) || (OY_IGNORE_DEPRECATED < OYRANOS_VERSI
ON) | |
| /*#warning oyDEFAULT_PROFILE is deprecated*/ | | /*#warning oyDEFAULT_PROFILE is deprecated*/ | |
| # define oyDEFAULT_PROFILE oyPROFILE_e | | # define oyDEFAULT_PROFILE oyPROFILE_e | |
| #endif | | #endif | |
| | | | |
| int oySetDefaultProfile (oyPROFILE_e type, | | int oySetDefaultProfile (oyPROFILE_e type, | |
| const char* file_name); | | const char* file_name); | |
|
| int oySetDefaultProfileBlock (oyPROFILE_e type, | | | |
| const char* file_name, | | | |
| void* mem, | | | |
| size_t size); | | | |
| char* oyGetDefaultProfileName (oyPROFILE_e type, | | char* oyGetDefaultProfileName (oyPROFILE_e type, | |
| oyAlloc_f alloc_func); | | oyAlloc_f alloc_func); | |
| | | | |
| /* --- profile lists --- */ | | /* --- profile lists --- */ | |
| | | | |
|
| char ** oyProfileListGet ( const char * coloursig, | | char ** oyProfileListGet ( const char * colorsig, | |
| uint32_t * size, | | uint32_t * size, | |
| oyAlloc_f allocateFunc ); | | oyAlloc_f allocateFunc ); | |
| | | | |
| /* --- profile checking --- */ | | /* --- profile checking --- */ | |
| | | | |
| int oyCheckProfile (const char* name, | | int oyCheckProfile (const char* name, | |
| const char* unused); | | const char* unused); | |
| int oyCheckProfileMem (const void* mem, size_t size, | | int oyCheckProfileMem (const void* mem, size_t size, | |
| const char* unused); | | const char* unused); | |
| | | | |
| | | | |
| skipping to change at line 202 | | skipping to change at line 198 | |
|---|
| | | | |
| oyWIDGET_POLICY = 20, /**< policy selection */ | | oyWIDGET_POLICY = 20, /**< policy selection */ | |
| oyWIDGET_PATHS, /**< path selection */ | | oyWIDGET_PATHS, /**< path selection */ | |
| | | | |
| oyWIDGET_BEHAVIOUR_START = 30, | | oyWIDGET_BEHAVIOUR_START = 30, | |
| oyWIDGET_ACTION_UNTAGGED_ASSIGN, /**< What to do if image is untagged
? */ | | oyWIDGET_ACTION_UNTAGGED_ASSIGN, /**< What to do if image is untagged
? */ | |
| oyWIDGET_ACTION_OPEN_MISMATCH_RGB, /**< What to do if profiles mismatch
? */ | | oyWIDGET_ACTION_OPEN_MISMATCH_RGB, /**< What to do if profiles mismatch
? */ | |
| oyWIDGET_ACTION_OPEN_MISMATCH_CMYK, /**< What to do if profiles mismatch
?*/ | | oyWIDGET_ACTION_OPEN_MISMATCH_CMYK, /**< What to do if profiles mismatch
?*/ | |
| oyWIDGET_MIXED_MOD_DOCUMENTS_PRINT, /**< Convert befor save for Print? */ | | oyWIDGET_MIXED_MOD_DOCUMENTS_PRINT, /**< Convert befor save for Print? */ | |
| oyWIDGET_MIXED_MOD_DOCUMENTS_SCREEN,/**< Convert befor save for Screen? *
/ | | oyWIDGET_MIXED_MOD_DOCUMENTS_SCREEN,/**< Convert befor save for Screen? *
/ | |
|
| oyWIDGET_RENDERING_INTENT, /**< Standard colour transformations
*/ | | oyWIDGET_RENDERING_INTENT, /**< Standard color transformations *
/ | |
| oyWIDGET_RENDERING_BPC, /**< use BlackPointCompensation */ | | oyWIDGET_RENDERING_BPC, /**< use BlackPointCompensation */ | |
|
| oyWIDGET_RENDERING_INTENT_PROOF, /**< Proofing colour transformations
*/ | | oyWIDGET_RENDERING_INTENT_PROOF, /**< Proofing color transformations *
/ | |
| oyWIDGET_PROOF_SOFT, /**< Proofing by default for screen *
/ | | oyWIDGET_PROOF_SOFT, /**< Proofing by default for screen *
/ | |
| oyWIDGET_PROOF_HARD, /**< Proofing by default for printing
*/ | | oyWIDGET_PROOF_HARD, /**< Proofing by default for printing
*/ | |
|
| oyWIDGET_RENDERING_GAMUT_WARNING, /**< mark out of gamut colours */ | | oyWIDGET_RENDERING_GAMUT_WARNING, /**< mark out of gamut colors */ | |
| oyWIDGET_BEHAVIOUR_END, /**< just for easen Gui design */ | | oyWIDGET_BEHAVIOUR_END, /**< just for easen Gui design */ | |
| | | | |
| oyWIDGET_DEFAULT_PROFILE_START = 100, | | oyWIDGET_DEFAULT_PROFILE_START = 100, | |
| oyWIDGET_EDITING_XYZ, /**< XYZ Editing (Workspace) Profile */ | | oyWIDGET_EDITING_XYZ, /**< XYZ Editing (Workspace) Profile */ | |
| oyWIDGET_EDITING_LAB, /**< Lab Editing (Workspace) Profile */ | | oyWIDGET_EDITING_LAB, /**< Lab Editing (Workspace) Profile */ | |
| oyWIDGET_EDITING_RGB, /**< Rgb Editing (Workspace) Profile */ | | oyWIDGET_EDITING_RGB, /**< Rgb Editing (Workspace) Profile */ | |
| oyWIDGET_EDITING_CMYK, /**< Cmyk Editing (Workspace) Profile */ | | oyWIDGET_EDITING_CMYK, /**< Cmyk Editing (Workspace) Profile */ | |
| oyWIDGET_EDITING_GRAY, /**< Gray Editing (Workspace) Profile */ | | oyWIDGET_EDITING_GRAY, /**< Gray Editing (Workspace) Profile */ | |
| | | | |
| oyWIDGET_ASSUMED_XYZ=110, /**< standard XYZ assumed source profile */ | | oyWIDGET_ASSUMED_XYZ=110, /**< standard XYZ assumed source profile */ | |
| | | | |
| skipping to change at line 231 | | skipping to change at line 227 | |
|---|
| oyWIDGET_ASSUMED_CMYK, /**< standard Cmyk assumed source profile */ | | oyWIDGET_ASSUMED_CMYK, /**< standard Cmyk assumed source profile */ | |
| oyWIDGET_ASSUMED_GRAY, /**< standard Gray assumed source profile */ | | oyWIDGET_ASSUMED_GRAY, /**< standard Gray assumed source profile */ | |
| | | | |
| oyWIDGET_PROFILE_PROOF = 120,/**< standard proofing profile */ | | oyWIDGET_PROFILE_PROOF = 120,/**< standard proofing profile */ | |
| oyWIDGET_DEFAULT_PROFILE_END,/**< just for easen Gui design */ | | oyWIDGET_DEFAULT_PROFILE_END,/**< just for easen Gui design */ | |
| | | | |
| oyWIDGET_CMM_START = 300, /**< CMM options */ | | oyWIDGET_CMM_START = 300, /**< CMM options */ | |
| oyWIDGET_CMM_SELECT, /**< CMM selection */ | | oyWIDGET_CMM_SELECT, /**< CMM selection */ | |
| oyWIDGET_CMM_INTENT, /**< CMM rendering intent */ | | oyWIDGET_CMM_INTENT, /**< CMM rendering intent */ | |
| oyWIDGET_CMM_BPC, /**< black point compensation switch */ | | oyWIDGET_CMM_BPC, /**< black point compensation switch */ | |
|
| oyWIDGET_CMM_INTENT_PROOF /**< Proofing colour transformations */ | | oyWIDGET_CMM_INTENT_PROOF /**< Proofing color transformations */ | |
| } oyWIDGET_e; | | } oyWIDGET_e; | |
| | | | |
| /** @brief type of widget */ | | /** @brief type of widget */ | |
| typedef enum { | | typedef enum { | |
| oyWIDGETTYPE_START, | | oyWIDGETTYPE_START, | |
| oyWIDGETTYPE_GROUP_TREE,/**!< group creating a new visibility (tab, lea
ve) */ | | oyWIDGETTYPE_GROUP_TREE,/**!< group creating a new visibility (tab, lea
ve) */ | |
| oyWIDGETTYPE_BEHAVIOUR, | | oyWIDGETTYPE_BEHAVIOUR, | |
| oyWIDGETTYPE_DEFAULT_PROFILE, | | oyWIDGETTYPE_DEFAULT_PROFILE, | |
| oyWIDGETTYPE_PROFILE, /**!< select a profile through a list widget */ | | oyWIDGETTYPE_PROFILE, /**!< select a profile through a list widget */ | |
| oyWIDGETTYPE_INT, /**!< TODO @todo value range */ | | oyWIDGETTYPE_INT, /**!< TODO @todo value range */ | |
| oyWIDGETTYPE_FLOAT, /**!< IEEE floating point number */ | | oyWIDGETTYPE_FLOAT, /**!< IEEE floating point number */ | |
| oyWIDGETTYPE_CHOICE, /**!< option from a array of choices */ | | oyWIDGETTYPE_CHOICE, /**!< option from a array of choices */ | |
| oyWIDGETTYPE_LIST, /**!< list widget, like for paths */ | | oyWIDGETTYPE_LIST, /**!< list widget, like for paths */ | |
| oyWIDGETTYPE_VOID, /**!< data block, should not be selectable */ | | oyWIDGETTYPE_VOID, /**!< data block, should not be selectable */ | |
| oyWIDGETTYPE_END | | oyWIDGETTYPE_END | |
| } oyWIDGET_TYPE_e; | | } oyWIDGET_TYPE_e; | |
| | | | |
| /** @brief layout flags for widgets */ | | /** @brief layout flags for widgets */ | |
| #define OY_LAYOUT_NO_CHOICES 0x01 /**!< show informational */ | | #define OY_LAYOUT_NO_CHOICES 0x01 /**!< show informational */ | |
| #define OY_LAYOUT_MIDDLE 0x02 /**!< Arrange in the middle. */ | | #define OY_LAYOUT_MIDDLE 0x02 /**!< Arrange in the middle. */ | |
|
| #define OY_LAYOUT_PATH_SELECTOR 0x04 /**!< add a path selector tp each ent
ry */ | | #define OY_LAYOUT_PATH_SELECTOR 0x04 /**!< add a path selector to each ent
ry */ | |
| | | | |
| oyWIDGET_e * oyWidgetListGet (oyGROUP_e group, | | oyWIDGET_e * oyWidgetListGet (oyGROUP_e group, | |
| int * count, | | int * count, | |
| oyAlloc_f allocate_func ); | | oyAlloc_f allocate_func ); | |
| | | | |
| oyWIDGET_TYPE_e oyWidgetTitleGet (oyWIDGET_e option, | | oyWIDGET_TYPE_e oyWidgetTitleGet (oyWIDGET_e option, | |
| const oyGROUP_e** categories, | | const oyGROUP_e** categories, | |
| const char ** name, | | const char ** name, | |
| const char ** tooltip, | | const char ** tooltip, | |
| int * flags ); | | int * flags ); | |
| | | | |
| End of changes. 11 change blocks. |
|---|
| 14 lines changed or deleted | | 10 lines changed or added | |
|---|
|
| oyranos_alpha.h | | oyranos_alpha.h | |
|---|
| /** @file oyranos_alpha.h | | /** @file oyranos_alpha.h | |
| * | | * | |
|
| * Oyranos is an open source Colour Management System | | * Oyranos is an open source Color Management System | |
| * | | * | |
| * @par Copyright: | | * @par Copyright: | |
| * 2004-2012 (C) Kai-Uwe Behrmann | | * 2004-2012 (C) Kai-Uwe Behrmann | |
| * | | * | |
| * @brief object APIs | | * @brief object APIs | |
| * @author Kai-Uwe Behrmann <ku.b@gmx.de> | | * @author Kai-Uwe Behrmann <ku.b@gmx.de> | |
| * @par License: | | * @par License: | |
| * new BSD - see: http://www.opensource.org/licenses/bsd-license
.php | | * new BSD - see: http://www.opensource.org/licenses/bsd-license
.php | |
| * @since 2004/11/25 | | * @since 2004/11/25 | |
| */ | | */ | |
| | | | |
| skipping to change at line 84 | | skipping to change at line 84 | |
|---|
| oyBOOLEAN_e type ); | | oyBOOLEAN_e type ); | |
| | | | |
| #define OY_HASH_SIZE 16 | | #define OY_HASH_SIZE 16 | |
| | | | |
| #define OY_OBSERVE_AS_WELL 0x01 | | #define OY_OBSERVE_AS_WELL 0x01 | |
| | | | |
| oyHash_s * oyCMMCacheListGetEntry_ ( const char * hash_text ); | | oyHash_s * oyCMMCacheListGetEntry_ ( const char * hash_text ); | |
| oyStructList_s** oyCMMCacheList_ ( void ); | | oyStructList_s** oyCMMCacheList_ ( void ); | |
| char * oyCMMCacheListPrint_ ( void ); | | char * oyCMMCacheListPrint_ ( void ); | |
| | | | |
|
| /* --- colour conversion --- */ | | /* --- color conversion --- */ | |
| | | | |
| int oyRegistrationEraseFromDB(const char * registration ); | | int oyRegistrationEraseFromDB(const char * registration ); | |
| | | | |
| OYAPI int OYEXPORT | | OYAPI int OYEXPORT | |
| oyConfig_Set ( oyConfig_s * config, | | oyConfig_Set ( oyConfig_s * config, | |
| const char * registration_dom
ain, | | const char * registration_dom
ain, | |
| oyOptions_s * options, | | oyOptions_s * options, | |
| oyBlob_s * data ); | | oyBlob_s * data ); | |
| | | | |
| /** @typedef oyIO_t | | /** @typedef oyIO_t | |
| | | | |
| skipping to change at line 117 | | skipping to change at line 117 | |
|---|
| /* decode */ | | /* decode */ | |
| #define oyToNoCacheRead_m(r) ((r)&1) | | #define oyToNoCacheRead_m(r) ((r)&1) | |
| #define oyToNoCacheWrite_m(w) (((w) >> 1)&1) | | #define oyToNoCacheWrite_m(w) (((w) >> 1)&1) | |
| #if 0 | | #if 0 | |
| OYAPI oyPointer OYEXPORT | | OYAPI oyPointer OYEXPORT | |
| oyProfile_Align ( oyProfile_s * profile, | | oyProfile_Align ( oyProfile_s * profile, | |
| size_t * size, | | size_t * size, | |
| oyAlloc_f allocateFunc ); | | oyAlloc_f allocateFunc ); | |
| #endif | | #endif | |
| | | | |
|
| #define OY_COMPUTE 0x01 | | | |
| #define OY_FROM_PROFILE 0x04 | | | |
| | | | |
| /** @enum oyDATALAYOUT_e | | /** @enum oyDATALAYOUT_e | |
| * @brief ideas for basic data arrangements | | * @brief ideas for basic data arrangements | |
| * | | * | |
| * @version Oyranos: 0.1.8 | | * @version Oyranos: 0.1.8 | |
| * @since 2008/00/00 (Oyranos: 0.1.8) | | * @since 2008/00/00 (Oyranos: 0.1.8) | |
| * @date 2008/00/00 | | * @date 2008/00/00 | |
| */ | | */ | |
| typedef enum oyDATALAYOUT_e { | | typedef enum oyDATALAYOUT_e { | |
| oyDATALAYOUT_NONE, | | oyDATALAYOUT_NONE, | |
| oyDATALAYOUT_CURVE, /**< equally spaced curve, oyDATALAYO
UT_e[0], size[1], min[2], max[3], elements[4]... */ | | oyDATALAYOUT_CURVE, /**< equally spaced curve, oyDATALAYO
UT_e[0], size[1], min[2], max[3], elements[4]... */ | |
| | | | |
| skipping to change at line 141 | | skipping to change at line 138 | |
|---|
| oyDATALAYOUT_TABLE, /**< CLUT, oyDATALAYOUT_e[0], table d
imensions in[1], array out[2], size of first dimension[3], size of second [
4], ... size of last[n], elements[n+1]... */ | | oyDATALAYOUT_TABLE, /**< CLUT, oyDATALAYOUT_e[0], table d
imensions in[1], array out[2], size of first dimension[3], size of second [
4], ... size of last[n], elements[n+1]... */ | |
| oyDATALAYOUT_ARRAY, /**< value array, oyDATALAYOUT_e[0],
size[1], elements[2]... */ | | oyDATALAYOUT_ARRAY, /**< value array, oyDATALAYOUT_e[0],
size[1], elements[2]... */ | |
| /*oyDATALAYOUT_PICEWISE_CURVE,*/ /**< paired curve, layout as in oy
DATA_LAYOUT_CURVE but with elements grouped to two */ | | /*oyDATALAYOUT_PICEWISE_CURVE,*/ /**< paired curve, layout as in oy
DATA_LAYOUT_CURVE but with elements grouped to two */ | |
| /*oyDATALAYOUT_HULL,*/ /**< oyDATALAYOUT_e[0], triangle coun
t[1], indixes[2], XYZ triples[3..5]..., followed by interwoven index + norm
ale + midpoint triples[n]... */ | | /*oyDATALAYOUT_HULL,*/ /**< oyDATALAYOUT_e[0], triangle coun
t[1], indixes[2], XYZ triples[3..5]..., followed by interwoven index + norm
ale + midpoint triples[n]... */ | |
| /*oyDATALAYOUT_,*/ /**< */ | | /*oyDATALAYOUT_,*/ /**< */ | |
| oyDATALAYOUT_MAX /**< */ | | oyDATALAYOUT_MAX /**< */ | |
| } oyDATALAYOUT_e; | | } oyDATALAYOUT_e; | |
| | | | |
| int oySizeofDatatype ( oyDATATYPE_e t ); | | int oySizeofDatatype ( oyDATATYPE_e t ); | |
| | | | |
|
| typedef struct oyNamedColour_s oyNamedColour_s; | | | |
| typedef struct oyNamedColours_s oyNamedColours_s; | | | |
| typedef struct oyUiHandler_s oyUiHandler_s; | | typedef struct oyUiHandler_s oyUiHandler_s; | |
| | | | |
| #define OY_FILTER_SET_TEST 0x01 /** only test */ | | #define OY_FILTER_SET_TEST 0x01 /** only test */ | |
| #define OY_FILTER_GET_DEFAULT 0x01 /** defaults */ | | #define OY_FILTER_GET_DEFAULT 0x01 /** defaults */ | |
| /* decode */ | | /* decode */ | |
| #define oyToFilterSetTest_m(r) ((r)&1) | | #define oyToFilterSetTest_m(r) ((r)&1) | |
| #define oyToFilterGetDefaults_m(r) ((r)&1) | | #define oyToFilterGetDefaults_m(r) ((r)&1) | |
| oyOptions_s* oyFilterCore_OptionsSet ( oyFilterCore_s * filter, | | oyOptions_s* oyFilterCore_OptionsSet ( oyFilterCore_s * filter, | |
| oyOptions_s * options, | | oyOptions_s * options, | |
| int flags ); | | int flags ); | |
| const char * oyFilterCore_WidgetsSet ( oyFilterCore_s * filter, | | const char * oyFilterCore_WidgetsSet ( oyFilterCore_s * filter, | |
| const char * widgets, | | const char * widgets, | |
| int flags ); | | int flags ); | |
| const char * oyFilterCore_WidgetsGet ( oyFilterCore_s * filter, | | const char * oyFilterCore_WidgetsGet ( oyFilterCore_s * filter, | |
| int flags ); | | int flags ); | |
| | | | |
|
| /** @struct oyNamedColour_s | | | |
| * @brief colour patch with meta informations | | | |
| * @ingroup objects_single_colour | | | |
| * @extends oyStruct_s | | | |
| * | | | |
| * Data management on library side. | | | |
| * User can control memory management at creation time. | | | |
| * | | | |
| * It has the complexity of a object, and should not be accessed directly. | | | |
| * | | | |
| * @version Oyranos: 0.1.8 | | | |
| * @since 2007/10/00 (Oyranos: 0.1.8) | | | |
| * @date 2007/10/00 | | | |
| * | | | |
| * TODO: needs to be Xatom compatible | | | |
| */ | | | |
| struct oyNamedColour_s { | | | |
| oyOBJECT_e type_; /**< @private struct type oyOBJECT_N | | | |
| AMED_COLOUR_S */ | | | |
| oyStruct_Copy_f copy; /**< copy function */ | | | |
| oyStruct_Release_f release; /**< release function */ | | | |
| oyObject_s oy_; /**< @private base object */ | | | |
| double * channels_; /**< @private eigther parsed or calc | | | |
| ulated otherwise */ | | | |
| double XYZ_[3]; /**< @private CIE*XYZ representation | | | |
| */ | | | |
| char * blob_; /**< @private advanced : CGATS / ICC | | | |
| ? */ | | | |
| size_t blob_len_; /**< @private advanced : CGATS / ICC | | | |
| ? */ | | | |
| oyProfile_s * profile_; /**< @private ICC */ | | | |
| }; | | | |
| | | | |
| oyNamedColour_s* oyNamedColour_Create( const double * chan, | | | |
| const char * blob, | | | |
| int blob_len, | | | |
| oyProfile_s * profile_ref, | | | |
| oyObject_s object ); | | | |
| oyNamedColour_s* oyNamedColour_CreateWithName ( | | | |
| const char * nick, | | | |
| const char * name, | | | |
| const char * description, | | | |
| const double * chan, | | | |
| const double * XYZ, | | | |
| const char * blob, | | | |
| int blob_len, | | | |
| oyProfile_s * profile_ref, | | | |
| oyObject_s object ); | | | |
| oyNamedColour_s* oyNamedColour_Copy ( oyNamedColour_s * colour, | | | |
| oyObject_s object ); | | | |
| int oyNamedColour_Release ( oyNamedColour_s ** colour ); | | | |
| | | | |
| oyProfile_s * oyNamedColour_GetSpaceRef ( oyNamedColour_s * colour ); | | | |
| void oyNamedColour_SetChannels ( oyNamedColour_s * colour, | | | |
| const double * channels, | | | |
| uint32_t flags ); | | | |
| int oyNamedColour_SetColourStd ( oyNamedColour_s * colour, | | | |
| oyPROFILE_e colour_space, | | | |
| oyPointer channels, | | | |
| oyDATATYPE_e channels_type, | | | |
| uint32_t flags, | | | |
| oyOptions_s * options ); | | | |
| const double * oyNamedColour_GetChannelsConst ( oyNamedColour_s * colour | | | |
| , | | | |
| uint32_t * flags ); | | | |
| const double * oyNamedColour_GetXYZConst ( oyNamedColour_s * colour | | | |
| ); | | | |
| int oyNamedColour_GetColourStd ( oyNamedColour_s * colour | | | |
| , | | | |
| oyPROFILE_e colour_space, | | | |
| oyPointer buf, | | | |
| oyDATATYPE_e buf_type, | | | |
| uint32_t * flags, | | | |
| oyOptions_s * options ); | | | |
| int oyNamedColour_GetColour ( oyNamedColour_s * colour, | | | |
| oyProfile_s * profile, | | | |
| oyPointer buf, | | | |
| oyDATATYPE_e buf_type, | | | |
| uint32_t flags, | | | |
| oyOptions_s * options ); | | | |
| const char * oyNamedColour_GetName( oyNamedColour_s * s, | | | |
| oyNAME_e type, | | | |
| uint32_t flags ); | | | |
| | | | |
| /** @brief list of colour patches | | | |
| * @ingroup objects_single_colour | | | |
| * @extends oyStruct_s | | | |
| * | | | |
| * Data management on library side. | | | |
| * User can control memory management at creation time. | | | |
| * | | | |
| * It has the complexity of a object, and should not be accessed directly. | | | |
| * | | | |
| * @since Oyranos: version 0.1.8 | | | |
| * @date october 2007 (API 0.1.8) | | | |
| * | | | |
| * TODO: make the object non visible | | | |
| */ | | | |
| struct oyNamedColours_s { | | | |
| oyOBJECT_e type_; /*!< @private struct type oyOBJECT_N | | | |
| AMED_COLOURS_S */ | | | |
| oyStruct_Copy_f copy; /**< copy function */ | | | |
| oyStruct_Release_f release; /**< release function */ | | | |
| oyObject_s oy_; /*!< @private base object */ | | | |
| oyStructList_s * list_; /**< @private colour list */ | | | |
| }; | | | |
| | | | |
| oyNamedColours_s* oyNamedColours_New ( oyObject_s object ); | | | |
| oyNamedColours_s* oyNamedColours_Copy( oyNamedColours_s * colours, | | | |
| oyObject_s object ); | | | |
| int oyNamedColours_Release ( oyNamedColours_s** colours ); | | | |
| | | | |
| int oyNamedColours_Count(oyNamedColours_s * swatch ); | | | |
| oyNamedColour_s* oyNamedColours_Get ( oyNamedColours_s * swatch, | | | |
| int position); | | | |
| oyNamedColours_s* oyNamedColours_MoveIn ( oyNamedColours_s * list, | | | |
| oyNamedColour_s ** obj, | | | |
| int pos ); | | | |
| int oyNamedColours_ReleaseAt ( oyNamedColours_s * swatch, | | | |
| int position ); | | | |
| | | | |
| void oyCopyColour ( const double * from, | | | |
| double * to, | | | |
| int n, | | | |
| oyProfile_s * profile_ref, | | | |
| int channels_n ); | | | |
| | | | |
| /* --- CMM API --- */ | | /* --- CMM API --- */ | |
| | | | |
| /** obtain 4 char CMM identifiers and count of CMM's */ | | /** obtain 4 char CMM identifiers and count of CMM's */ | |
| char ** oyModulsGetNames ( int * count, | | char ** oyModulsGetNames ( int * count, | |
| oyAlloc_f allocateFunc ); | | oyAlloc_f allocateFunc ); | |
| /** Query for available options for a cmm | | /** Query for available options for a cmm | |
| | | | |
| @param[in] cmm the 4 char CMM ID or zero for the cu
rrent CMM | | @param[in] cmm the 4 char CMM ID or zero for the cu
rrent CMM | |
| @param[in] object the optional base | | @param[in] object the optional base | |
| @return available options | | @return available options | |
| */ | | */ | |
| const char * oyModulGetOptions ( const char * cmm, | | const char * oyModulGetOptions ( const char * cmm, | |
| oyObject_s object); | | oyObject_s object); | |
| const char * oyModuleGetActual ( const char * type ); | | const char * oyModuleGetActual ( const char * type ); | |
| | | | |
|
| /* --- Image Colour Profile API --- */ | | /* --- Image Color Profile API --- */ | |
| /* needs extra libraries liboyranos_png liboyranos_tiff ... */ | | /* needs extra libraries liboyranos_png liboyranos_tiff ... */ | |
| #ifdef OY_HAVE_PNG_ | | #ifdef OY_HAVE_PNG_ | |
| #include <png.h> | | #include <png.h> | |
| #define OY_PNG_s png_infop | | #define OY_PNG_s png_infop | |
| oyProfile_s * oyImagePNGgetICC ( OY_PNG_s info, | | oyProfile_s * oyImagePNGgetICC ( OY_PNG_s info, | |
| int flags ); | | int flags ); | |
| #endif | | #endif | |
| #ifdef OY_HAVE_TIFF_ | | #ifdef OY_HAVE_TIFF_ | |
| #include <tiffio.h> | | #include <tiffio.h> | |
| #define OY_TIFF_s TIFF* | | #define OY_TIFF_s TIFF* | |
| | | | |
| skipping to change at line 325 | | skipping to change at line 202 | |
|---|
| #define OY_EXRpp_s Imf::Header* | | #define OY_EXRpp_s Imf::Header* | |
| oyProfile_s * oyImageEXRgetICC ( OY_EXRpp_s header, | | oyProfile_s * oyImageEXRgetICC ( OY_EXRpp_s header, | |
| int flags ); | | int flags ); | |
| #endif | | #endif | |
| #endif | | #endif | |
| /* | | /* | |
| with flags something like: | | with flags something like: | |
| oyIMAGE_EMBED_ICC_MINIMAL ... | | oyIMAGE_EMBED_ICC_MINIMAL ... | |
| oyIMAGE_EMBED_ICC_FULL (while for OpenEXR this would not make sense) */ | | oyIMAGE_EMBED_ICC_FULL (while for OpenEXR this would not make sense) */ | |
| | | | |
|
| char * oyDumpColourToCGATS ( const double * channels, | | char * oyDumpColorToCGATS ( const double * channels, | |
| size_t n, | | size_t n, | |
| oyProfile_s * prof, | | oyProfile_s * prof, | |
| oyAlloc_f allocateFunc, | | oyAlloc_f allocateFunc, | |
| const char * DESCRIPTOR ); | | const char * DESCRIPTOR ); | |
| | | | |
| /** | | /** | |
| * @brief handle parser output and build the UI | | * @brief handle parser output and build the UI | |
| * | | * | |
| * @param[in] cur libxml2 node | | * @param[in] cur libxml2 node | |
| * @param[in] collected_elements from libxml2 | | * @param[in] collected_elements from libxml2 | |
| | | | |
| End of changes. 7 change blocks. |
|---|
| 136 lines changed or deleted | | 4 lines changed or added | |
|---|
|
| oyranos_image.h | | oyranos_image.h | |
|---|
| | | | |
| /** @file oyranos_image.h | | /** @file oyranos_image.h | |
| | | | |
| [Template file inheritance graph] | | [Template file inheritance graph] | |
| +-- oyranos_image.template.h | | +-- oyranos_image.template.h | |
| | | | |
|
| * Oyranos is an open source Colour Management System | | * Oyranos is an open source Color Management System | |
| * | | * | |
| * @par Copyright: | | * @par Copyright: | |
|
| * 2004-2012 (C) Kai-Uwe Behrmann | | * 2004-2014 (C) Kai-Uwe Behrmann | |
| * | | * | |
| * @author Kai-Uwe Behrmann <ku.b@gmx.de> | | * @author Kai-Uwe Behrmann <ku.b@gmx.de> | |
| * @par License: | | * @par License: | |
| * new BSD - see: http://www.opensource.org/licenses/bsd-license
.php | | * new BSD - see: http://www.opensource.org/licenses/bsd-license
.php | |
|
| * @date 2012/11/02 | | * @date 2014/01/10 | |
| */ | | */ | |
| | | | |
| #ifndef OYRANOS_IMAGE_H | | #ifndef OYRANOS_IMAGE_H | |
| #define OYRANOS_IMAGE_H | | #define OYRANOS_IMAGE_H | |
| | | | |
| #include <oyranos_icc.h> | | #include <oyranos_icc.h> | |
| #include <oyranos_types.h> | | #include <oyranos_types.h> | |
| | | | |
| #ifdef __cplusplus | | #ifdef __cplusplus | |
| /*namespace oyranos {*/ | | /*namespace oyranos {*/ | |
| extern "C" { | | extern "C" { | |
| #endif /* __cplusplus */ | | #endif /* __cplusplus */ | |
| | | | |
|
| /** \addtogroup objects_image | | /** \addtogroup objects_image Image Containers | |
| | | * @brief Pixel buffer abstraction | |
| * | | * | |
| * @{ | | * @{ | |
| */ | | */ | |
| | | | |
| /** @enum oyDATATYPE_e | | /** @enum oyDATATYPE_e | |
| * @brief Basic data types for anonymous pointers | | * @brief Basic data types for anonymous pointers | |
| * | | * | |
| * @version Oyranos: 0.1.8 | | * @version Oyranos: 0.1.8 | |
| * @since 2007/00/00 (Oyranos: 0.1.8) | | * @since 2007/00/00 (Oyranos: 0.1.8) | |
| * @date 2007/00/00 | | * @date 2007/00/00 | |
| | | | |
| skipping to change at line 54 | | skipping to change at line 55 | |
|---|
| oyUINT32, /*!< 32-bit integer */ | | oyUINT32, /*!< 32-bit integer */ | |
| oyHALF, /*!< 16-bit floating point number */ | | oyHALF, /*!< 16-bit floating point number */ | |
| oyFLOAT, /*!< IEEE floating point number */ | | oyFLOAT, /*!< IEEE floating point number */ | |
| oyDOUBLE /*!< IEEE double precission floating point number */ | | oyDOUBLE /*!< IEEE double precission floating point number */ | |
| } oyDATATYPE_e; | | } oyDATATYPE_e; | |
| | | | |
| size_t oyDataTypeGetSize ( oyDATATYPE_e data_type ); | | size_t oyDataTypeGetSize ( oyDATATYPE_e data_type ); | |
| const char * oyDataTypeToText ( oyDATATYPE_e data_type ); | | const char * oyDataTypeToText ( oyDATATYPE_e data_type ); | |
| | | | |
| /** @enum oyCHANNELTYPE_e | | /** @enum oyCHANNELTYPE_e | |
|
| * @brief Channels types of Colours | | * @brief Channels types of Colors | |
| * | | * | |
|
| * This type is useful to present colour manipulation UI elements in a | | * This type is useful to present color manipulation UI elements in a | |
| * sensible way. | | * sensible way. | |
| * | | * | |
| * @version Oyranos: 0.1.10 | | * @version Oyranos: 0.1.10 | |
| * @since 2008/00/00 (Oyranos: 0.1.8) | | * @since 2008/00/00 (Oyranos: 0.1.8) | |
| * @date 2009/08/03 | | * @date 2009/08/03 | |
| */ | | */ | |
| typedef enum oyCHANNELTYPE_e { | | typedef enum oyCHANNELTYPE_e { | |
| oyCHANNELTYPE_UNDEFINED, /*!< as well for the list end */ | | oyCHANNELTYPE_UNDEFINED, /*!< as well for the list end */ | |
| oyCHANNELTYPE_OTHER, /*!< other */ | | oyCHANNELTYPE_OTHER, /*!< other */ | |
| oyCHANNELTYPE_LIGHTNESS, /*!< pure lightness */ | | oyCHANNELTYPE_LIGHTNESS, /*!< pure lightness */ | |
|
| oyCHANNELTYPE_COLOUR, /*!< pure colour */ | | oyCHANNELTYPE_COLOR, /*!< pure color */ | |
| oyCHANNELTYPE_COLOUR_LIGHTNESS, /*!< lightness and colour */ | | oyCHANNELTYPE_COLOR_LIGHTNESS, /*!< lightness and color */ | |
| oyCHANNELTYPE_COLOUR_LIGHTNESS_PREMULTIPLIED, /*!< premultiplied lightnes | | oyCHANNELTYPE_COLOR_LIGHTNESS_PREMULTIPLIED, /*!< premultiplied lightness | |
| s and colour */ | | and color */ | |
| oyCHANNELTYPE_DEPTH, /*!< depth field */ | | oyCHANNELTYPE_DEPTH, /*!< depth field */ | |
| oyCHANNELTYPE_ALPHA1, /*!< alpha */ | | oyCHANNELTYPE_ALPHA1, /*!< alpha */ | |
| oyCHANNELTYPE_ALPHA2, /*!< alpha2 */ | | oyCHANNELTYPE_ALPHA2, /*!< alpha2 */ | |
| oyCHANNELTYPE_ALPHA3, /*!< alpha3 */ | | oyCHANNELTYPE_ALPHA3, /*!< alpha3 */ | |
| oyCHANNELTYPE_U, /*!< u */ | | oyCHANNELTYPE_U, /*!< u */ | |
| oyCHANNELTYPE_V /*!< v */ | | oyCHANNELTYPE_V /*!< v */ | |
| } oyCHANNELTYPE_e; | | } oyCHANNELTYPE_e; | |
| | | | |
|
| oyCHANNELTYPE_e oyICCColourSpaceToChannelLayout ( | | oyCHANNELTYPE_e oyICCColorSpaceToChannelLayout ( | |
| icColorSpaceSignature sig, | | icColorSpaceSignature sig, | |
| int pos ); | | int pos ); | |
| | | | |
| /** @enum oyPIXEL_ACCESS_TYPE_e | | /** @enum oyPIXEL_ACCESS_TYPE_e | |
| * @brief Pixel access types | | * @brief Pixel access types | |
| * | | * | |
| * @version Oyranos: 0.1.8 | | * @version Oyranos: 0.1.8 | |
| * @since 2008/00/00 (Oyranos: 0.1.8) | | * @since 2008/00/00 (Oyranos: 0.1.8) | |
| * @date 2008/00/00 | | * @date 2008/00/00 | |
| */ | | */ | |
| | | | |
| skipping to change at line 103 | | skipping to change at line 104 | |
|---|
| } oyPIXEL_ACCESS_TYPE_e; | | } oyPIXEL_ACCESS_TYPE_e; | |
| | | | |
| /** @typedef oyPixel_t | | /** @typedef oyPixel_t | |
| parametric type as shorthand for the channel layout in bitmaps \n | | parametric type as shorthand for the channel layout in bitmaps \n | |
| | | | |
| should fit into a 32bit type, usual unsigned int or uint32_t \n | | should fit into a 32bit type, usual unsigned int or uint32_t \n | |
| | | | |
| X F P S TTTT OOOOOOOO CCCCCCCC \n | | X F P S TTTT OOOOOOOO CCCCCCCC \n | |
| | | | |
| C channels count per pixel (3 for RGB); max 255 \n | | C channels count per pixel (3 for RGB); max 255 \n | |
|
| O colour channel offset (0 for RGB, 1 for ARGB) \n | | O color channel offset (0 for RGB, 1 for ARGB) \n | |
| P Planar bit: 0 - interwoven, 1 - one channel after the other \n | | P Planar bit: 0 - interwoven, 1 - one channel after the other \n | |
|
| S Swap colour channels bit (BGR) \n | | S Swap color channels bit (BGR) \n | |
| T Type oyDATATYPE_e \n | | T Type oyDATATYPE_e \n | |
| X non host byte order bit \n | | X non host byte order bit \n | |
| F Revert bit: 0 - MinIsBlack(Chocolate) 1 - MinIsWhite(Vanilla); \n | | F Revert bit: 0 - MinIsBlack(Chocolate) 1 - MinIsWhite(Vanilla); \n | |
| exchange min and max : (1-x) | | exchange min and max : (1-x) | |
| | | | |
| */ | | */ | |
| typedef uint32_t oyPixel_t; | | typedef uint32_t oyPixel_t; | |
| | | | |
| char * oyPixelPrint ( oyPixel_t pixel_layout, | | char * oyPixelPrint ( oyPixel_t pixel_layout, | |
| oyAlloc_f allocateFunc ); | | oyAlloc_f allocateFunc ); | |
| | | | |
| skipping to change at line 127 | | skipping to change at line 128 | |
|---|
| /** @enum oyLAYOUT_e | | /** @enum oyLAYOUT_e | |
| * @brief Pixel mask descriptions. | | * @brief Pixel mask descriptions. | |
| */ | | */ | |
| typedef enum { | | typedef enum { | |
| oyLAYOUT = 0, /*!< remembering the layout @see oyPixel_t */ | | oyLAYOUT = 0, /*!< remembering the layout @see oyPixel_t */ | |
| oyPOFF_X, /*!< pixel count x offset */ | | oyPOFF_X, /*!< pixel count x offset */ | |
| oyPOFF_Y, /*!< pixel count y offset */ | | oyPOFF_Y, /*!< pixel count y offset */ | |
| oyCOFF, /*!< channel offset */ | | oyCOFF, /*!< channel offset */ | |
| oyDATA_SIZE, /*!< sample size in byte */ | | oyDATA_SIZE, /*!< sample size in byte */ | |
| oyCHANS, /*!< number of channels */ | | oyCHANS, /*!< number of channels */ | |
|
| oyCHAN0 /*!< first colour channel position */ | | oyCHAN0 /*!< first color channel position */ | |
| } oyLAYOUT_e; | | } oyLAYOUT_e; | |
| | | | |
| /** Set channels count in @ref oyPixel_t */ | | /** Set channels count in @ref oyPixel_t */ | |
| #define oyChannels_m(c) (c) | | #define oyChannels_m(c) (c) | |
|
| /** Set offset count to first colour channel in @ref oyPixel_t */ | | /** Set offset count to first color channel in @ref oyPixel_t */ | |
| #define oyColourOffset_m(o) ((o) << 8) | | #define oyColorOffset_m(o) ((o) << 8) | |
| /** Set @ref oyDATATYPE_e in @ref oyPixel_t */ | | /** Set @ref oyDATATYPE_e in @ref oyPixel_t */ | |
| #define oyDataType_m(t) ((t) << 16) | | #define oyDataType_m(t) ((t) << 16) | |
|
| /** Set swapping of colour channels in @ref oyPixel_t , e.g. BGR */ | | /** Set swapping of color channels in @ref oyPixel_t , e.g. BGR */ | |
| #define oySwapColourChannels_m(s) ((s) << 20) | | #define oySwapColorChannels_m(s) ((s) << 20) | |
| /** Set planar instead of interwoven colour channels in @ref oyPixel_t */ | | /** Set planar instead of interwoven color channels in @ref oyPixel_t */ | |
| #define oyPlanar_m(p) ((p) << 21) | | #define oyPlanar_m(p) ((p) << 21) | |
| /** Set min is white in @ref oyPixel_t */ | | /** Set min is white in @ref oyPixel_t */ | |
| #define oyFlavor_m(p) ((f) << 22) | | #define oyFlavor_m(p) ((f) << 22) | |
| /** Set byte swapping for integers larger than 8 byte in @ref oyPixel_t */ | | /** Set byte swapping for integers larger than 8 byte in @ref oyPixel_t */ | |
| #define oyByteSwap_m(x) ((x) << 23) | | #define oyByteSwap_m(x) ((x) << 23) | |
| | | | |
| /* define some common types */ | | /* define some common types */ | |
| /** 8-bit RGB/YUV/XYZ/... */ | | /** 8-bit RGB/YUV/XYZ/... */ | |
| #define OY_TYPE_123_8 (oyChannels_m(3)|oyDataType_m(oyUINT8)) | | #define OY_TYPE_123_8 (oyChannels_m(3)|oyDataType_m(oyUINT8)) | |
| /** 16-bit RGB/... */ | | /** 16-bit RGB/... */ | |
| | | | |
| skipping to change at line 175 | | skipping to change at line 176 | |
|---|
| /** 64-bit double RGB/... alpha */ | | /** 64-bit double RGB/... alpha */ | |
| #define OY_TYPE_123A_DBL (oyChannels_m(4)|oyDataType_m(oyDOUBLE)) | | #define OY_TYPE_123A_DBL (oyChannels_m(4)|oyDataType_m(oyDOUBLE)) | |
| | | | |
| /** 16-bit float RGB/... alpha + Z */ | | /** 16-bit float RGB/... alpha + Z */ | |
| #define OY_TYPE_123AZ_HALF (oyChannels_m(5)|oyDataType_m(oyHALF)) | | #define OY_TYPE_123AZ_HALF (oyChannels_m(5)|oyDataType_m(oyHALF)) | |
| /** 32-bit float RGB/... alpha + Z */ | | /** 32-bit float RGB/... alpha + Z */ | |
| #define OY_TYPE_123AZ_FLOAT (oyChannels_m(5)|oyDataType_m(oyFLOAT)) | | #define OY_TYPE_123AZ_FLOAT (oyChannels_m(5)|oyDataType_m(oyFLOAT)) | |
| /** 64-bit double RGB/... alpha + Z */ | | /** 64-bit double RGB/... alpha + Z */ | |
| #define OY_TYPE_123AZ_DBL (oyChannels_m(5)|oyDataType_m(oyDOUBLE)) | | #define OY_TYPE_123AZ_DBL (oyChannels_m(5)|oyDataType_m(oyDOUBLE)) | |
| | | | |
|
| #define OY_TYPE_A123_8 (oyChannels_m(4)|oyColourOffset_m(1)|oyDataType | | #define OY_TYPE_A123_8 (oyChannels_m(4)|oyColorOffset_m(1)|oyDataType_ | |
| _m(oyUINT8)) | | m(oyUINT8)) | |
| #define OY_TYPE_A123_16 (oyChannels_m(4)|oyColourOffset_m(1)|oyDataType | | #define OY_TYPE_A123_16 (oyChannels_m(4)|oyColorOffset_m(1)|oyDataType_ | |
| _m(oyUINT16)) | | m(oyUINT16)) | |
| | | | |
|
| #define OY_TYPE_A321_8 (oyChannels_m(4)|oyColourOffset_m(1)|oyDataType | | #define OY_TYPE_A321_8 (oyChannels_m(4)|oyColorOffset_m(1)|oyDataType_ | |
| _m(oyUINT8)|oySwapColourChannels_m(oyYES)) | | m(oyUINT8)|oySwapColorChannels_m(oyYES)) | |
| #define OY_TYPE_A321_16 (oyChannels_m(4)|oyColourOffset_m(1)|oyDataType | | #define OY_TYPE_A321_16 (oyChannels_m(4)|oyColorOffset_m(1)|oyDataType_ | |
| _m(oyUINT16)|oySwapColourChannels_m(oyYES)) | | m(oyUINT16)|oySwapColorChannels_m(oyYES)) | |
| | | | |
| /* some intermixed types will work as well */ | | /* some intermixed types will work as well */ | |
| #define OY_TYPE_123A_HALF_Z_FLOAT (oyChannels_m(4+1*2)|oyDataType_m(oyHALF)
) | | #define OY_TYPE_123A_HALF_Z_FLOAT (oyChannels_m(4+1*2)|oyDataType_m(oyHALF)
) | |
| | | | |
| /** 8-bit Cmyk */ | | /** 8-bit Cmyk */ | |
| #define OY_TYPE_1234_8 (oyChannels_m(4)|oyDataType_m(oyUINT8)) | | #define OY_TYPE_1234_8 (oyChannels_m(4)|oyDataType_m(oyUINT8)) | |
| /** 8-bit Cmyk alpha */ | | /** 8-bit Cmyk alpha */ | |
| #define OY_TYPE_1234A_8 (oyChannels_m(5)|oyDataType_m(oyUINT8)) | | #define OY_TYPE_1234A_8 (oyChannels_m(5)|oyDataType_m(oyUINT8)) | |
| #define OY_TYPE_1234_16 (oyChannels_m(4)|oyDataType_m(oyUINT16)) | | #define OY_TYPE_1234_16 (oyChannels_m(4)|oyDataType_m(oyUINT16)) | |
| #define OY_TYPE_1234A_16 (oyChannels_m(5)|oyDataType_m(oyUINT16)) | | #define OY_TYPE_1234A_16 (oyChannels_m(5)|oyDataType_m(oyUINT16)) | |
| | | | |
| skipping to change at line 219 | | skipping to change at line 220 | |
|---|
| #define OY_TYPE_1_HALF_REV (oyChannels_m(1)|oyDataType_m(oyHALF)|oyFlavor_
m(oyYes)) | | #define OY_TYPE_1_HALF_REV (oyChannels_m(1)|oyDataType_m(oyHALF)|oyFlavor_
m(oyYes)) | |
| #define OY_TYPE_1_FLOAT_REV (oyChannels_m(1)|oyDataType_m(oyFLOAT))|oyFlavo
r_m(oyYes) | | #define OY_TYPE_1_FLOAT_REV (oyChannels_m(1)|oyDataType_m(oyFLOAT))|oyFlavo
r_m(oyYes) | |
| #define OY_TYPE_1A_8_REV (oyChannels_m(2)|oyDataType_m(oyUINT8)|oyFlavor
_m(oyYes)) | | #define OY_TYPE_1A_8_REV (oyChannels_m(2)|oyDataType_m(oyUINT8)|oyFlavor
_m(oyYes)) | |
| #define OY_TYPE_1A_16_REV (oyChannels_m(2)|oyDataType_m(oyUINT16)|oyFlavo
r_m(oyYes)) | | #define OY_TYPE_1A_16_REV (oyChannels_m(2)|oyDataType_m(oyUINT16)|oyFlavo
r_m(oyYes)) | |
| #define OY_TYPE_1A_HALF_REV (oyChannels_m(2)|oyDataType_m(oyHALF)|oyFlavor_
m(oyYes)) | | #define OY_TYPE_1A_HALF_REV (oyChannels_m(2)|oyDataType_m(oyHALF)|oyFlavor_
m(oyYes)) | |
| #define OY_TYPE_1A_FLOAT_REV (oyChannels_m(2)|oyDataType_m(oyFLOAT)|oyFlavo
r_m(oyYes)) | | #define OY_TYPE_1A_FLOAT_REV (oyChannels_m(2)|oyDataType_m(oyFLOAT)|oyFlavo
r_m(oyYes)) | |
| | | | |
| /* decode */ | | /* decode */ | |
| /** Get channels count in @ref oyPixel_t */ | | /** Get channels count in @ref oyPixel_t */ | |
| #define oyToChannels_m(c) ((c)&255) | | #define oyToChannels_m(c) ((c)&255) | |
|
| /** Get offset count to first colour channel in @ref oyPixel_t */ | | /** Get offset count to first color channel in @ref oyPixel_t */ | |
| #define oyToColourOffset_m(o) (((o) >> 8)&255) | | #define oyToColorOffset_m(o) (((o) >> 8)&255) | |
| /** Get @ref oyDATATYPE_e in @ref oyPixel_t */ | | /** Get @ref oyDATATYPE_e in @ref oyPixel_t */ | |
| #define oyToDataType_m(t) ((oyDATATYPE_e)(((t) >> 16)&15)) | | #define oyToDataType_m(t) ((oyDATATYPE_e)(((t) >> 16)&15)) | |
|
| /** Get swapping of colour channels in @ref oyPixel_t , e.g. BGR */ | | /** Get swapping of color channels in @ref oyPixel_t , e.g. BGR */ | |
| #define oyToSwapColourChannels_m(s) (((s) >> 20)&1) | | #define oyToSwapColorChannels_m(s) (((s) >> 20)&1) | |
| /** Get planar instead of interwoven colour channels in @ref oyPixel_t */ | | /** Get planar instead of interwoven color channels in @ref oyPixel_t */ | |
| #define oyToPlanar_m(p) (((p) >> 21)&1) | | #define oyToPlanar_m(p) (((p) >> 21)&1) | |
| /** Get min is white in @ref oyPixel_t */ | | /** Get min is white in @ref oyPixel_t */ | |
| #define oyToFlavor_m(f) (((f) >> 22)&1) | | #define oyToFlavor_m(f) (((f) >> 22)&1) | |
| /** Get byte swapping for integers larger than 8 byte in @ref oyPixel_t */ | | /** Get byte swapping for integers larger than 8 byte in @ref oyPixel_t */ | |
| #define oyToByteswap_m(x) (((x) >> 23)&1) | | #define oyToByteswap_m(x) (((x) >> 23)&1) | |
| | | | |
| /** } *//* objects_image */ | | /** } *//* objects_image */ | |
| | | | |
| #ifdef __cplusplus | | #ifdef __cplusplus | |
| } /* extern "C" */ | | } /* extern "C" */ | |
| | | | |
| End of changes. 17 change blocks. |
|---|
| 32 lines changed or deleted | | 33 lines changed or added | |
|---|
|
| oyranos_object.h | | oyranos_object.h | |
|---|
| | | | |
| /** @file oyranos_object.h | | /** @file oyranos_object.h | |
| | | | |
| [Template file inheritance graph] | | [Template file inheritance graph] | |
| +-- oyranos_object.template.h | | +-- oyranos_object.template.h | |
| | | | |
|
| * Oyranos is an open source Colour Management System | | * Oyranos is an open source Color Management System | |
| * | | * | |
| * @par Copyright: | | * @par Copyright: | |
|
| * 2004-2012 (C) Kai-Uwe Behrmann | | * 2004-2014 (C) Kai-Uwe Behrmann | |
| * | | * | |
| * @author Kai-Uwe Behrmann <ku.b@gmx.de> | | * @author Kai-Uwe Behrmann <ku.b@gmx.de> | |
| * @par License: | | * @par License: | |
| * new BSD - see: http://www.opensource.org/licenses/bsd-license
.php | | * new BSD - see: http://www.opensource.org/licenses/bsd-license
.php | |
|
| * @date 2012/11/15 | | * @date 2014/03/06 | |
| */ | | */ | |
| | | | |
| #ifndef OYRANOS_OBJECT_H | | #ifndef OYRANOS_OBJECT_H | |
| #define OYRANOS_OBJECT_H | | #define OYRANOS_OBJECT_H | |
| | | | |
| #ifdef __cplusplus | | #ifdef __cplusplus | |
| /*namespace oyranos {*/ | | /*namespace oyranos {*/ | |
| extern "C" { | | extern "C" { | |
| #endif /* __cplusplus */ | | #endif /* __cplusplus */ | |
| | | | |
| #include <oyranos_core.h> | | #include <oyranos_core.h> | |
| | | | |
| /* Function Pointers Definitions Start */ | | /* Function Pointers Definitions Start */ | |
| typedef oyPointer (*oyPointer_copy_f ) ( oyPointer, size_t ); | | typedef oyPointer (*oyPointer_copy_f ) ( oyPointer, size_t ); | |
|
| | | /** | |
| | | * @brief oyPointer_s release function type | |
| | | * | |
| | | * @version Oyranos: 0.3.0 | |
| | | * @date 2011/02/15 | |
| | | * @since 2011/02/15 (Oyranos: 0.3.0) | |
| | | */ | |
| typedef int (*oyPointer_release_f )( oyPointer * ); | | typedef int (*oyPointer_release_f )( oyPointer * ); | |
|
| | | /** | |
| | | * @brief Lock release function type | |
| | | * | |
| | | * @version Oyranos: 0.3.0 | |
| | | * @date 2011/02/15 | |
| | | * @since 2011/02/15 (Oyranos: 0.3.0) | |
| | | */ | |
| typedef void (*oyLockRelease_f )( oyPointer lock, | | typedef void (*oyLockRelease_f )( oyPointer lock, | |
| const char * marker, | | const char * marker, | |
| int line ); | | int line ); | |
|
| | | /** | |
| | | * @brief Lock function type | |
| | | * | |
| | | * @version Oyranos: 0.3.0 | |
| | | * @date 2011/02/15 | |
| | | * @since 2011/02/15 (Oyranos: 0.3.0) | |
| | | */ | |
| typedef void (*oyLock_f ) ( oyPointer lock, | | typedef void (*oyLock_f ) ( oyPointer lock, | |
| const char * marker, | | const char * marker, | |
| int line ); | | int line ); | |
|
| | | /** | |
| | | * @brief Unlock function type | |
| | | * | |
| | | * @version Oyranos: 0.3.0 | |
| | | * @date 2011/02/15 | |
| | | * @since 2011/02/15 (Oyranos: 0.3.0) | |
| | | */ | |
| typedef void (*oyUnLock_f ) ( oyPointer look, | | typedef void (*oyUnLock_f ) ( oyPointer look, | |
| const char * marker, | | const char * marker, | |
| int line ); | | int line ); | |
| /* Function Pointers Definitions Stop */ | | /* Function Pointers Definitions Stop */ | |
| | | | |
| /* Declare oyObject_s Globally */ | | /* Declare oyObject_s Globally */ | |
| typedef struct oyObject_s_* oyObject_s; | | typedef struct oyObject_s_* oyObject_s; | |
| | | | |
| /** | | /** | |
| * @brief Oyranos structure type | | * @brief Oyranos structure type | |
| | | | |
| skipping to change at line 58 | | skipping to change at line 86 | |
|---|
| * | | * | |
| * @version Oyranos: 0.1.8 | | * @version Oyranos: 0.1.8 | |
| * @since 2007/11/22 (Oyranos: 0.1.x) | | * @since 2007/11/22 (Oyranos: 0.1.x) | |
| * @date 2008/07/31 | | * @date 2008/07/31 | |
| */ | | */ | |
| #if 0 | | #if 0 | |
| typedef enum { | | typedef enum { | |
| oyOBJECT_NONE, | | oyOBJECT_NONE, | |
| | | | |
| oyOBJECT_HASH_S, /**< oyHash_s */ | | oyOBJECT_HASH_S, /**< oyHash_s */ | |
|
| | | oyOBJECT_LIS_S, /**< oyLis_s */ | |
| | | oyOBJECT_LIST_S, /**< oyList_s */ | |
| oyOBJECT_NAME_S, /**< oyName_s */ | | oyOBJECT_NAME_S, /**< oyName_s */ | |
| oyOBJECT_OBJECT_S, /**< oyObject_s */ | | oyOBJECT_OBJECT_S, /**< oyObject_s */ | |
| oyOBJECT_OBSERVER_S, /**< oyObserver_s */ | | oyOBJECT_OBSERVER_S, /**< oyObserver_s */ | |
| oyOBJECT_POINTER_S, /**< oyPointer_s */ | | oyOBJECT_POINTER_S, /**< oyPointer_s */ | |
| oyOBJECT_STRUCT_LIST_S, /**< oyStructList_s */ | | oyOBJECT_STRUCT_LIST_S, /**< oyStructList_s */ | |
| | | | |
| oyOBJECT_BLOB_S, /**< oyBlob_s */ | | oyOBJECT_BLOB_S, /**< oyBlob_s */ | |
| oyOBJECT_CONFIG_S, /**< oyConfig_s */ | | oyOBJECT_CONFIG_S, /**< oyConfig_s */ | |
| oyOBJECT_CONFIGS_S, /**< oyConfigs_s */ | | oyOBJECT_CONFIGS_S, /**< oyConfigs_s */ | |
| oyOBJECT_OPTION_S, /**< oyOption_s */ | | oyOBJECT_OPTION_S, /**< oyOption_s */ | |
| | | | |
| skipping to change at line 95 | | skipping to change at line 125 | |
|---|
| oyOBJECT_CMM_UI_S, /**< oyCMMui_s */ | | oyOBJECT_CMM_UI_S, /**< oyCMMui_s */ | |
| oyOBJECT_CMM_API_MAX, /**< not defined */ | | oyOBJECT_CMM_API_MAX, /**< not defined */ | |
| | | | |
| oyOBJECT_CMM_APIS_S, /**< oyCMMapis_s */ | | oyOBJECT_CMM_APIS_S, /**< oyCMMapis_s */ | |
| | | | |
| oyOBJECT_CMM_INFO_S, /**< oyCMMinfo_s */ | | oyOBJECT_CMM_INFO_S, /**< oyCMMinfo_s */ | |
| | | | |
| oyOBJECT_PROFILE_S, /**< oyProfile_s */ | | oyOBJECT_PROFILE_S, /**< oyProfile_s */ | |
| oyOBJECT_PROFILES_S, /**< oyProfiles_s */ | | oyOBJECT_PROFILES_S, /**< oyProfiles_s */ | |
| oyOBJECT_PROFILE_TAG_S, /**< oyProfileTag_s */ | | oyOBJECT_PROFILE_TAG_S, /**< oyProfileTag_s */ | |
|
| oyOBJECT_NAMED_COLOURS_S, | | oyOBJECT_NAMED_COLORS_S, | |
| oyOBJECT_MAX | | oyOBJECT_MAX | |
| } oyOBJECT_e; | | } oyOBJECT_e; | |
| #else | | #else | |
| typedef enum { | | typedef enum { | |
| oyOBJECT_NONE, | | oyOBJECT_NONE, | |
| oyOBJECT_OBJECT_S, /**< oyObject_s */ | | oyOBJECT_OBJECT_S, /**< oyObject_s */ | |
| oyOBJECT_MONITOR_S, /**< oyMonitor_s */ | | oyOBJECT_MONITOR_S, /**< oyMonitor_s */ | |
|
| oyOBJECT_NAMED_COLOUR_S, /*!< oyNamedColour_s */ | | oyOBJECT_NAMED_COLOR_S, /*!< oyNamedColor_s */ | |
| oyOBJECT_NAMED_COLOURS_S, /*!< oyNamedColours_s */ | | oyOBJECT_NAMED_COLORS_S, /*!< oyNamedColors_s */ | |
| oyOBJECT_PROFILE_S, /*!< oyProfile_s */ | | oyOBJECT_PROFILE_S, /*!< oyProfile_s */ | |
| oyOBJECT_PROFILE_TAG_S, /*!< oyProfileTag_s */ | | oyOBJECT_PROFILE_TAG_S, /*!< oyProfileTag_s */ | |
| oyOBJECT_PROFILES_S, /*!< oyProfiles_s */ | | oyOBJECT_PROFILES_S, /*!< oyProfiles_s */ | |
| oyOBJECT_OPTION_S, /*!< oyOption_s */ | | oyOBJECT_OPTION_S, /*!< oyOption_s */ | |
| oyOBJECT_OPTIONS_S, /*!< oyOptions_s */ | | oyOBJECT_OPTIONS_S, /*!< oyOptions_s */ | |
| oyOBJECT_RECTANGLE_S, /**< oyRectangle_s */ | | oyOBJECT_RECTANGLE_S, /**< oyRectangle_s */ | |
| oyOBJECT_IMAGE_S, /*!< oyImage_s */ | | oyOBJECT_IMAGE_S, /*!< oyImage_s */ | |
| oyOBJECT_ARRAY2D_S, /**< oyArray2d_s */ | | oyOBJECT_ARRAY2D_S, /**< oyArray2d_s */ | |
|
| oyOBJECT_COLOUR_CONVERSION_S, /*!< oyColourConversion_s deprecated
*/ | | | |
| oyOBJECT_CONNECTOR_S = 20, /**< oyConnector_s */ | | oyOBJECT_CONNECTOR_S = 20, /**< oyConnector_s */ | |
| oyOBJECT_CONNECTOR_IMAGING_S, /**< oyConnectorImaging_s */ | | oyOBJECT_CONNECTOR_IMAGING_S, /**< oyConnectorImaging_s */ | |
| oyOBJECT_CONNECTOR_MAX_S, /**< not defined */ | | oyOBJECT_CONNECTOR_MAX_S, /**< not defined */ | |
| oyOBJECT_FILTER_PLUG_S = 30, /**< oyFilterPlug_s */ | | oyOBJECT_FILTER_PLUG_S = 30, /**< oyFilterPlug_s */ | |
| oyOBJECT_FILTER_PLUGS_S, /**< oyFilterPlugs_s */ | | oyOBJECT_FILTER_PLUGS_S, /**< oyFilterPlugs_s */ | |
| oyOBJECT_FILTER_SOCKET_S, /**< oyFilterSocket_s */ | | oyOBJECT_FILTER_SOCKET_S, /**< oyFilterSocket_s */ | |
| oyOBJECT_FILTER_CORE_S, /**< oyFilterCore_s */ | | oyOBJECT_FILTER_CORE_S, /**< oyFilterCore_s */ | |
| oyOBJECT_FILTER_CORES_S, /**< oyFilterCores_s */ | | oyOBJECT_FILTER_CORES_S, /**< oyFilterCores_s */ | |
| oyOBJECT_FILTER_NODE_S, /**< oyFilterNode_s */ | | oyOBJECT_FILTER_NODE_S, /**< oyFilterNode_s */ | |
| oyOBJECT_FILTER_NODES_S, /**< oyFilterNodes_s */ | | oyOBJECT_FILTER_NODES_S, /**< oyFilterNodes_s */ | |
| oyOBJECT_FILTER_GRAPH_S, /**< oyFilterGraph_s */ | | oyOBJECT_FILTER_GRAPH_S, /**< oyFilterGraph_s */ | |
| oyOBJECT_PIXEL_ACCESS_S, /**< oyPixelAccess_s */ | | oyOBJECT_PIXEL_ACCESS_S, /**< oyPixelAccess_s */ | |
| oyOBJECT_CONVERSION_S, /**< oyConversion_s */ | | oyOBJECT_CONVERSION_S, /**< oyConversion_s */ | |
| oyOBJECT_CMM_HANDLE_S = 50, /**< oyCMMhandle_s */ | | oyOBJECT_CMM_HANDLE_S = 50, /**< oyCMMhandle_s */ | |
| oyOBJECT_POINTER_S, /*!< oyPointer_s */ | | oyOBJECT_POINTER_S, /*!< oyPointer_s */ | |
| oyOBJECT_CMM_INFO_S, /*!< oyCMMinfo_s */ | | oyOBJECT_CMM_INFO_S, /*!< oyCMMinfo_s */ | |
| oyOBJECT_CMM_API_S, /**< oyCMMapi_s */ | | oyOBJECT_CMM_API_S, /**< oyCMMapi_s */ | |
| oyOBJECT_CMM_APIS_S, /**< oyCMMapis_s */ | | oyOBJECT_CMM_APIS_S, /**< oyCMMapis_s */ | |
|
| | | oyOBJECT_CMM_API_FILTER_S, /**< oyCMMapiFilter_s */ | |
| oyOBJECT_CMM_API1_S, /**< oyCMMapi1_s */ | | oyOBJECT_CMM_API1_S, /**< oyCMMapi1_s */ | |
| oyOBJECT_CMM_API2_S, /**< oyCMMapi2_s */ | | oyOBJECT_CMM_API2_S, /**< oyCMMapi2_s */ | |
| oyOBJECT_CMM_API3_S, /**< oyCMMapi3_s */ | | oyOBJECT_CMM_API3_S, /**< oyCMMapi3_s */ | |
| oyOBJECT_CMM_API4_S, /**< oyCMMapi4_s */ | | oyOBJECT_CMM_API4_S, /**< oyCMMapi4_s */ | |
| oyOBJECT_CMM_API5_S, /**< oyCMMapi5_s */ | | oyOBJECT_CMM_API5_S, /**< oyCMMapi5_s */ | |
| oyOBJECT_CMM_API6_S, /**< oyCMMapi6_s */ | | oyOBJECT_CMM_API6_S, /**< oyCMMapi6_s */ | |
| oyOBJECT_CMM_API7_S, /**< oyCMMapi7_s */ | | oyOBJECT_CMM_API7_S, /**< oyCMMapi7_s */ | |
| oyOBJECT_CMM_DATA_TYPES_S, /**< oyCMMDataTypes_s */ | | oyOBJECT_CMM_DATA_TYPES_S, /**< oyCMMDataTypes_s */ | |
| oyOBJECT_CMM_API8_S, /**< oyCMMapi8_s */ | | oyOBJECT_CMM_API8_S, /**< oyCMMapi8_s */ | |
|
| oyOBJECT_CMM_API_FILTER_S, /**< oyCMMapiFilter_s */ | | | |
| oyOBJECT_CMM_API_FILTERS_S, /**< oyCMMapiFilters_s */ | | | |
| oyOBJECT_CMM_API9_S, /**< oyCMMapi9_s */ | | oyOBJECT_CMM_API9_S, /**< oyCMMapi9_s */ | |
| oyOBJECT_CMM_API10_S, /**< oyCMMapi10_s */ | | oyOBJECT_CMM_API10_S, /**< oyCMMapi10_s */ | |
| oyOBJECT_CMM_UI_S, /**< oyCMMui_s */ | | oyOBJECT_CMM_UI_S, /**< oyCMMui_s */ | |
| oyOBJECT_CMM_OBJECT_TYPE_S, /**< oyCMMobjectType_s */ | | oyOBJECT_CMM_OBJECT_TYPE_S, /**< oyCMMobjectType_s */ | |
|
| | | oyOBJECT_CMM_API_FILTERS_S, /**< oyCMMapiFilters_s */ | |
| oyOBJECT_CMM_API_MAX, /**< not defined */ | | oyOBJECT_CMM_API_MAX, /**< not defined */ | |
| oyOBJECT_ICON_S = 80, /*!< oyIcon_s */ | | oyOBJECT_ICON_S = 80, /*!< oyIcon_s */ | |
| oyOBJECT_MODULE_S, /*!< oyModule_s */ | | oyOBJECT_MODULE_S, /*!< oyModule_s */ | |
| oyOBJECT_EXTERNFUNC_S, /*!< oyExternFunc_s */ | | oyOBJECT_EXTERNFUNC_S, /*!< oyExternFunc_s */ | |
| oyOBJECT_NAME_S, /*!< oyName_s */ | | oyOBJECT_NAME_S, /*!< oyName_s */ | |
| oyOBJECT_COMP_S_, /*!< oyComp_s_ */ | | oyOBJECT_COMP_S_, /*!< oyComp_s_ */ | |
| oyOBJECT_FILE_LIST_S_, /*!< oyFileList_s_ */ | | oyOBJECT_FILE_LIST_S_, /*!< oyFileList_s_ */ | |
| oyOBJECT_HASH_S, /**< oyHash_s */ | | oyOBJECT_HASH_S, /**< oyHash_s */ | |
| oyOBJECT_STRUCT_LIST_S, /**< oyStructList_s */ | | oyOBJECT_STRUCT_LIST_S, /**< oyStructList_s */ | |
| oyOBJECT_BLOB_S, /**< oyBlob_s */ | | oyOBJECT_BLOB_S, /**< oyBlob_s */ | |
| oyOBJECT_CONFIG_S, /**< oyConfig_s */ | | oyOBJECT_CONFIG_S, /**< oyConfig_s */ | |
| oyOBJECT_CONFIGS_S, /**< oyConfigs_s */ | | oyOBJECT_CONFIGS_S, /**< oyConfigs_s */ | |
| oyOBJECT_UI_HANDLER_S, /**< oyUiHandler_s */ | | oyOBJECT_UI_HANDLER_S, /**< oyUiHandler_s */ | |
| oyOBJECT_FORMS_ARGS_S, /**< oyFormsArgs_s */ | | oyOBJECT_FORMS_ARGS_S, /**< oyFormsArgs_s */ | |
| oyOBJECT_CALLBACK_S, /**< oyCallback_s */ | | oyOBJECT_CALLBACK_S, /**< oyCallback_s */ | |
| oyOBJECT_OBSERVER_S, /**< oyObserver_s */ | | oyOBJECT_OBSERVER_S, /**< oyObserver_s */ | |
| oyOBJECT_CONF_DOMAIN_S, /**< oyConfDomain_s */ | | oyOBJECT_CONF_DOMAIN_S, /**< oyConfDomain_s */ | |
| oyOBJECT_INFO_STATIC_S, /**< oyObjectInfoStatic_s */ | | oyOBJECT_INFO_STATIC_S, /**< oyObjectInfoStatic_s */ | |
|
| | | oyOBJECT_LIST_S, /**< oyList_s */ | |
| | | oyOBJECT_LIS_S, /**< oyLis_s dummy */ | |
| oyOBJECT_MAX | | oyOBJECT_MAX | |
| } oyOBJECT_e; | | } oyOBJECT_e; | |
| #endif | | #endif | |
| const char * oyStructTypeToText ( oyOBJECT_e type ); | | const char * oyStructTypeToText ( oyOBJECT_e type ); | |
| | | | |
| /** @enum oyNAME_e | | /** @enum oyNAME_e | |
| * @brief describe the base types of a oyObject_s name | | * @brief describe the base types of a oyObject_s name | |
| * @ingroup objects_generic | | * @ingroup objects_generic | |
| * | | * | |
| * @version Oyranos: 0.1.8 | | * @version Oyranos: 0.1.8 | |
| | | | |
| skipping to change at line 228 | | skipping to change at line 259 | |
|---|
| * enum values. | | * enum values. | |
| * | | * | |
| * See as well @ref registration | | * See as well @ref registration | |
| * | | * | |
| * @version Oyranos: 0.1.9 | | * @version Oyranos: 0.1.9 | |
| * @since 2008/10/08 (Oyranos: 0.1.8) | | * @since 2008/10/08 (Oyranos: 0.1.8) | |
| * @date 2008/11/27 | | * @date 2008/11/27 | |
| */ | | */ | |
| typedef enum { | | typedef enum { | |
| /** basic settings, as typical for toolkits and office/web applications, | | /** basic settings, as typical for toolkits and office/web applications, | |
|
| * e.g. disable proofing or disable mark out of gamut colours */ | | * e.g. disable proofing or disable mark out of gamut colors */ | |
| oyOPTIONATTRIBUTE_BASIC = 0, | | oyOPTIONATTRIBUTE_BASIC = 0, | |
| /** user modified, e.g. after oyOption_SetFromText() */ | | /** user modified, e.g. after oyOption_SetFromText() */ | |
| oyOPTIONATTRIBUTE_EDIT = 32, | | oyOPTIONATTRIBUTE_EDIT = 32, | |
| /** automatically modified, e.g. by a CMM */ | | /** automatically modified, e.g. by a CMM */ | |
| oyOPTIONATTRIBUTE_AUTOMATIC = 64, | | oyOPTIONATTRIBUTE_AUTOMATIC = 64, | |
| /** advanced settings, as typical for editing, e.g. include proofing | | /** advanced settings, as typical for editing, e.g. include proofing | |
| * (options appended with ".advanced") */ | | * (options appended with ".advanced") */ | |
| oyOPTIONATTRIBUTE_ADVANCED = 128, | | oyOPTIONATTRIBUTE_ADVANCED = 128, | |
| /** front end options, handled by the framework or policy module, | | /** front end options, handled by the framework or policy module, | |
| * e.g. ".front" */ | | * e.g. ".front" */ | |
| | | | |
| skipping to change at line 260 | | skipping to change at line 291 | |
|---|
| */ | | */ | |
| typedef enum { | | typedef enum { | |
| oyBOOLEAN_INTERSECTION, /**< and, the part covered by A and
B */ | | oyBOOLEAN_INTERSECTION, /**< and, the part covered by A and
B */ | |
| oyBOOLEAN_SUBSTRACTION, /**< minus, the part covered by A bu
t not by B */ | | oyBOOLEAN_SUBSTRACTION, /**< minus, the part covered by A bu
t not by B */ | |
| oyBOOLEAN_DIFFERENZ, /**< xor, exclusive parts of A and B
*/ | | oyBOOLEAN_DIFFERENZ, /**< xor, exclusive parts of A and B
*/ | |
| oyBOOLEAN_UNION /**< or, the parts covered by A or B
or both */ | | oyBOOLEAN_UNION /**< or, the parts covered by A or B
or both */ | |
| } oyBOOLEAN_e; | | } oyBOOLEAN_e; | |
| | | | |
| /** see:http://lists.freedesktop.org/archives/openicc/2008q4/001724.html | | /** see:http://lists.freedesktop.org/archives/openicc/2008q4/001724.html | |
| * @ingroup objects_conversion | | * @ingroup objects_conversion | |
|
| | | * | |
| | | * @see @ref registration | |
| */ | | */ | |
| typedef enum { | | typedef enum { | |
| oyFILTER_REG_NONE = 0, | | oyFILTER_REG_NONE = 0, | |
| oyFILTER_REG_TOP = 0x01, /**< e.g. "shared" for filters */ | | oyFILTER_REG_TOP = 0x01, /**< e.g. "shared" for filters */ | |
| oyFILTER_REG_DOMAIN = 0x02, /**< e.g. "oyranos.org" */ | | oyFILTER_REG_DOMAIN = 0x02, /**< e.g. "oyranos.org" */ | |
| oyFILTER_REG_TYPE = 0x04, /**< e.g. "imaging" filter group */ | | oyFILTER_REG_TYPE = 0x04, /**< e.g. "imaging" filter group */ | |
| oyFILTER_REG_APPLICATION = 0x08, /**< e.g. "scale" filter name */ | | oyFILTER_REG_APPLICATION = 0x08, /**< e.g. "scale" filter name */ | |
| oyFILTER_REG_OPTION = 0x10, /**< e.g. "x" filter option */ | | oyFILTER_REG_OPTION = 0x10, /**< e.g. "x" filter option */ | |
| oyFILTER_REG_MAX = 0x20 | | oyFILTER_REG_MAX = 0x20 | |
| } oyFILTER_REG_e; | | } oyFILTER_REG_e; | |
| | | | |
| skipping to change at line 322 | | skipping to change at line 355 | |
|---|
| typedef enum { | | typedef enum { | |
| oyERROR_USER = 10, /**< wrong or missing argument */ | | oyERROR_USER = 10, /**< wrong or missing argument */ | |
| oyERROR_DATA_READ, /**< input error */ | | oyERROR_DATA_READ, /**< input error */ | |
| oyERROR_DATA_WRITE, /**< output error */ | | oyERROR_DATA_WRITE, /**< output error */ | |
| oyERROR_DATA_AMBIGUITY /**< uniqueness of data is conflicte
d */ | | oyERROR_DATA_AMBIGUITY /**< uniqueness of data is conflicte
d */ | |
| } oyERROR_e; | | } oyERROR_e; | |
| | | | |
| int oyTextboolean_ ( const char * text_a, | | int oyTextboolean_ ( const char * text_a, | |
| const char * text_b, | | const char * text_b, | |
| oyBOOLEAN_e type ); | | oyBOOLEAN_e type ); | |
|
| char * oyFilterRegistrationToText ( const char * registration, | | | |
| oyFILTER_REG_e type, | | | |
| oyAlloc_f allocateFunc ); | | | |
| int oyFilterRegistrationMatch ( const char * registration, | | | |
| const char * pattern, | | | |
| oyOBJECT_e api_number ); | | | |
| int oyFilterRegistrationMatchKey ( const char * registration1, | | | |
| const char * registration2, | | | |
| oyOBJECT_e api_number ); | | | |
| | | | |
| #define OY_OUTPUT 0x01 | | #define OY_OUTPUT 0x01 | |
| #define OY_INPUT 0x02 | | #define OY_INPUT 0x02 | |
| /* decode */ | | /* decode */ | |
| #define oyToOutput_m(v) ((v)&0x01) | | #define oyToOutput_m(v) ((v)&0x01) | |
| #define oyToInput_m(v) ((v)&0x02) | | #define oyToInput_m(v) ((v)&0x02) | |
| | | | |
| #ifdef __cplusplus | | #ifdef __cplusplus | |
| } /* extern "C" */ | | } /* extern "C" */ | |
| /*}*/ /* namespace oyranos */ | | /*}*/ /* namespace oyranos */ | |
| | | | |
| End of changes. 18 change blocks. |
|---|
| 19 lines changed or deleted | | 43 lines changed or added | |
|---|
|
| oyranos_profile.h | | oyranos_profile.h | |
|---|
| /** @file oyranos_profile.h | | /** @file oyranos_profile.h | |
| | | | |
| [Template file inheritance graph] | | [Template file inheritance graph] | |
| +-- oyranos_profile.template.h | | +-- oyranos_profile.template.h | |
| | | | |
|
| * Oyranos is an open source Colour Management System | | * Oyranos is an open source Color Management System | |
| * | | * | |
| * @par Copyright: | | * @par Copyright: | |
|
| * 2004-2013 (C) Kai-Uwe Behrmann | | * 2004-2014 (C) Kai-Uwe Behrmann | |
| * | | * | |
| * @author Kai-Uwe Behrmann <ku.b@gmx.de> | | * @author Kai-Uwe Behrmann <ku.b@gmx.de> | |
| * @par License: | | * @par License: | |
| * new BSD - see: http://www.opensource.org/licenses/bsd-license
.php | | * new BSD - see: http://www.opensource.org/licenses/bsd-license
.php | |
|
| * @date 2013/01/14 | | * @date 2014/01/10 | |
| */ | | */ | |
| | | | |
| #ifndef OYRANOS_PROFILE_H | | #ifndef OYRANOS_PROFILE_H | |
| #define OYRANOS_PROFILE_H | | #define OYRANOS_PROFILE_H | |
| | | | |
| #ifdef __cplusplus | | #ifdef __cplusplus | |
| /*namespace oyranos {*/ | | /*namespace oyranos {*/ | |
| extern "C" { | | extern "C" { | |
| #endif /* __cplusplus */ | | #endif /* __cplusplus */ | |
| | | | |
|
| /** \addtogroup objects_profile Profile API | | /** \addtogroup objects_profile ICC Profile APIs | |
| | | @brief Select, read, manipulate and write ICC Profiles in memory and on | |
| | | disk. | |
| * | | * | |
| * To open a profile exist several methods in the oyProfile_Fromxxx APIs. | | * To open a profile exist several methods in the oyProfile_Fromxxx APIs. | |
| * oyProfile_FromStd(), oyProfile_FromFile() and oyProfile_FromMem() are b
asic | | * oyProfile_FromStd(), oyProfile_FromFile() and oyProfile_FromMem() are b
asic | |
| * profile open functions. oyProfile_FromSignature() is used for creating
a | | * profile open functions. oyProfile_FromSignature() is used for creating
a | |
| * dummy profile during profile filtering. | | * dummy profile during profile filtering. | |
| * oyProfile_FromMD5() is a lookup function from a profile hash, e.g. as | | * oyProfile_FromMD5() is a lookup function from a profile hash, e.g. as | |
| * provided by a 'psid' tag. \n | | * provided by a 'psid' tag. \n | |
| * Profile properties can be obtained from oyProfile_GetSignature(), like | | * Profile properties can be obtained from oyProfile_GetSignature(), like | |
|
| * colour spaces, date, magic number and so on. | | * color spaces, date, magic number and so on. | |
| * oyProfile_GetChannelNames(), oyProfile_GetText() and oyProfile_GetID() | | * oyProfile_GetChannelNames(), oyProfile_GetText() and oyProfile_GetID() | |
| * provide additional informations. \n | | * provide additional informations. \n | |
| * The profile element functions have Tag in their names. They work togeth
er | | * The profile element functions have Tag in their names. They work togeth
er | |
| * with the oyProfileTag_s APIs. \n | | * with the oyProfileTag_s APIs. \n | |
| * oyProfile_GetFileName() is a reverse lookup to obtain the name of a ins
talled | | * oyProfile_GetFileName() is a reverse lookup to obtain the name of a ins
talled | |
| * file from a profile, e.g. find the name of a reachable display profile. | | * file from a profile, e.g. find the name of a reachable display profile. | |
| * | | * | |
| * The oyProfiles_Create() allows to create profile lists with fine graine
d | | * The oyProfiles_Create() allows to create profile lists with fine graine
d | |
| * control. oyProfiles_ForStd() creates a list of profiles suitable to be
set | | * control. oyProfiles_ForStd() creates a list of profiles suitable to be
set | |
| * as default profiles according to the oyPROFILE_e categories. | | * as default profiles according to the oyPROFILE_e categories. | |
| * oyProfiles_DeviceRank() can be used together with a given device so sor
t | | * oyProfiles_DeviceRank() can be used together with a given device so sor
t | |
| * for a the best match in descenting order. | | * for a the best match in descenting order. | |
| | | | |
|
| * @{ | | * Low level APIs to obtain pure filenames and handle raw bits are in plac | |
| */ | | e: | |
| | | | |
| | | * - @ref profile_lists - provides the ICC profile search path content as | |
| | | string list | |
| | | * - @ref profile_handling - low level ICC profile I/O and more | |
| | | * @{ */ | |
| | | | |
| /** @brief general profile infos | | /** @brief general profile infos | |
| * @ingroup objects_profile | | * @ingroup objects_profile | |
| * | | * | |
| * use for oyProfile_GetSignature | | * use for oyProfile_GetSignature | |
| * | | * | |
| * @since Oyranos: version 0.1.8 | | * @since Oyranos: version 0.1.8 | |
| * @date 10 december 2007 (API 0.1.8) | | * @date 10 december 2007 (API 0.1.8) | |
| */ | | */ | |
| typedef enum { | | typedef enum { | |
|
| oySIGNATURE_COLOUR_SPACE, /**< colour space */ | | oySIGNATURE_COLOR_SPACE, /**< color space */ | |
| oySIGNATURE_PCS, /**< profile connection space */ | | oySIGNATURE_PCS, /**< profile connection space */ | |
| oySIGNATURE_SIZE, /**< internal stored size */ | | oySIGNATURE_SIZE, /**< internal stored size */ | |
| oySIGNATURE_CMM, /**< prefered CMM */ | | oySIGNATURE_CMM, /**< prefered CMM */ | |
| oySIGNATURE_VERSION, /**< version */ | | oySIGNATURE_VERSION, /**< version */ | |
| oySIGNATURE_CLASS, /**< usage class, e.g. 'mntr' ... */ | | oySIGNATURE_CLASS, /**< usage class, e.g. 'mntr' ... */ | |
| oySIGNATURE_MAGIC, /**< magic; ICC: 'acsp' */ | | oySIGNATURE_MAGIC, /**< magic; ICC: 'acsp' */ | |
| oySIGNATURE_PLATFORM, /**< operating system */ | | oySIGNATURE_PLATFORM, /**< operating system */ | |
| oySIGNATURE_OPTIONS, /**< various ICC header flags */ | | oySIGNATURE_OPTIONS, /**< various ICC header flags */ | |
| oySIGNATURE_MANUFACTURER, /**< device manufacturer */ | | oySIGNATURE_MANUFACTURER, /**< device manufacturer */ | |
| oySIGNATURE_MODEL, /**< device modell */ | | oySIGNATURE_MODEL, /**< device modell */ | |
| oySIGNATURE_INTENT, /**< seldom used profile claimed int
ent*/ | | oySIGNATURE_INTENT, /**< seldom used profile claimed int
ent*/ | |
| oySIGNATURE_CREATOR, /**< profile creator ID */ | | oySIGNATURE_CREATOR, /**< profile creator ID */ | |
| oySIGNATURE_DATETIME_YEAR, /**< creation time in UTC */ | | oySIGNATURE_DATETIME_YEAR, /**< creation time in UTC */ | |
| oySIGNATURE_DATETIME_MONTH, /**< creation time in UTC */ | | oySIGNATURE_DATETIME_MONTH, /**< creation time in UTC */ | |
| oySIGNATURE_DATETIME_DAY, /**< creation time in UTC */ | | oySIGNATURE_DATETIME_DAY, /**< creation time in UTC */ | |
| oySIGNATURE_DATETIME_HOURS, /**< creation time in UTC */ | | oySIGNATURE_DATETIME_HOURS, /**< creation time in UTC */ | |
| oySIGNATURE_DATETIME_MINUTES, /**< creation time in UTC */ | | oySIGNATURE_DATETIME_MINUTES, /**< creation time in UTC */ | |
| oySIGNATURE_DATETIME_SECONDS, /**< creation time in UTC */ | | oySIGNATURE_DATETIME_SECONDS, /**< creation time in UTC */ | |
| oySIGNATURE_ILLUMINANT, /**< profile illuminant */ | | oySIGNATURE_ILLUMINANT, /**< profile illuminant */ | |
|
| | | oySIGNATURE_ILLUMINANT_Y, /**< profile illuminant */ | |
| | | oySIGNATURE_ILLUMINANT_Z, /**< profile illuminant */ | |
| | | oySIGNATURE_ATTRIBUTES, /**< various ICC header attributes * | |
| | | / | |
| | | oySIGNATURE_ATTRIBUTES2, /**< various ICC header attributes * | |
| | | / | |
| oySIGNATURE_MAX | | oySIGNATURE_MAX | |
| } oySIGNATURE_TYPE_e; | | } oySIGNATURE_TYPE_e; | |
| | | | |
| const char * oyProfileSignatureName( oySIGNATURE_TYPE_e type ); | | const char * oyProfileSignatureName( oySIGNATURE_TYPE_e type ); | |
| const char * oyProfileSignatureDescription ( | | const char * oyProfileSignatureDescription ( | |
| oySIGNATURE_TYPE_e type ); | | oySIGNATURE_TYPE_e type ); | |
| | | | |
| /** @} *//* objects_profile */ | | /** @} *//* objects_profile */ | |
| | | | |
| #ifdef __cplusplus | | #ifdef __cplusplus | |
| | | | |
| End of changes. 8 change blocks. |
|---|
| 8 lines changed or deleted | | 21 lines changed or added | |
|---|
|