diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:17:24 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:21:24 +0300 |
commit | e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch) | |
tree | 8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/imbuf/intern/oiio | |
parent | b3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff) |
ClangFormat: apply to source, most of intern
Apply clang format as proposed in T53211.
For details on usage and instructions for migrating branches
without conflicts, see:
https://wiki.blender.org/wiki/Tools/ClangFormat
Diffstat (limited to 'source/blender/imbuf/intern/oiio')
-rw-r--r-- | source/blender/imbuf/intern/oiio/CMakeLists.txt | 40 | ||||
-rw-r--r-- | source/blender/imbuf/intern/oiio/openimageio_api.cpp | 404 | ||||
-rw-r--r-- | source/blender/imbuf/intern/oiio/openimageio_api.h | 9 |
3 files changed, 223 insertions, 230 deletions
diff --git a/source/blender/imbuf/intern/oiio/CMakeLists.txt b/source/blender/imbuf/intern/oiio/CMakeLists.txt index 3311d3fd9b4..984e62bc75a 100644 --- a/source/blender/imbuf/intern/oiio/CMakeLists.txt +++ b/source/blender/imbuf/intern/oiio/CMakeLists.txt @@ -19,14 +19,14 @@ # ***** END GPL LICENSE BLOCK ***** set(INC - . - .. - ../.. - ../../../blenkernel - ../../../blenlib - ../../../makesdna - ../../../../../intern/guardedalloc - ../../../../../intern/utfconv + . + .. + ../.. + ../../../blenkernel + ../../../blenlib + ../../../makesdna + ../../../../../intern/guardedalloc + ../../../../../intern/utfconv ) set(INC_SYS @@ -34,25 +34,25 @@ set(INC_SYS ) set(SRC - openimageio_api.h + openimageio_api.h - openimageio_api.cpp + openimageio_api.cpp ) set(LIB ) if(WITH_OPENIMAGEIO) - list(APPEND INC_SYS - ${OPENIMAGEIO_INCLUDE_DIRS} - ${BOOST_INCLUDE_DIR} - ) - if(WITH_IMAGE_OPENEXR) - list(APPEND INC_SYS - ${OPENEXR_INCLUDE_DIRS} - ) - endif() - add_definitions(-DWITH_OPENIMAGEIO) + list(APPEND INC_SYS + ${OPENIMAGEIO_INCLUDE_DIRS} + ${BOOST_INCLUDE_DIR} + ) + if(WITH_IMAGE_OPENEXR) + list(APPEND INC_SYS + ${OPENEXR_INCLUDE_DIRS} + ) + endif() + add_definitions(-DWITH_OPENIMAGEIO) endif() blender_add_lib(bf_imbuf_openimageio "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/source/blender/imbuf/intern/oiio/openimageio_api.cpp b/source/blender/imbuf/intern/oiio/openimageio_api.cpp index 4a21478de13..7b14678ed62 100644 --- a/source/blender/imbuf/intern/oiio/openimageio_api.cpp +++ b/source/blender/imbuf/intern/oiio/openimageio_api.cpp @@ -24,7 +24,7 @@ #include <set> #if defined(WIN32) -#include "utfconv.h" +# include "utfconv.h" #endif // NOTE: Keep first, BLI_path_util conflicts with OIIO's format. @@ -32,8 +32,7 @@ #include <openimageio_api.h> #include <OpenImageIO/imageio.h> -extern "C" -{ +extern "C" { #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" @@ -52,232 +51,227 @@ using std::unique_ptr; typedef unsigned char uchar; -template <class T, class Q> +template<class T, class Q> static void fill_all_channels(T *pixels, int width, int height, int components, Q alpha) { - if (components == 2) { - for (int i = width * height - 1; i >= 0; i--) { - pixels[i * 4 + 3] = pixels[i * 2 + 1]; - pixels[i * 4 + 2] = pixels[i * 2 + 0]; - pixels[i * 4 + 1] = pixels[i * 2 + 0]; - pixels[i * 4 + 0] = pixels[i * 2 + 0]; - } - } - else if (components == 3) { - for (int i = width * height - 1; i >= 0; i--) { - pixels[i * 4 + 3] = alpha; - pixels[i * 4 + 2] = pixels[i * 3 + 2]; - pixels[i * 4 + 1] = pixels[i * 3 + 1]; - pixels[i * 4 + 0] = pixels[i * 3 + 0]; - - } - } - else if (components == 1) { - for (int i = width * height - 1; i >= 0; i--) { - pixels[i * 4 + 3] = alpha; - pixels[i * 4 + 2] = pixels[i]; - pixels[i * 4 + 1] = pixels[i]; - pixels[i * 4 + 0] = pixels[i]; - } - } - + if (components == 2) { + for (int i = width * height - 1; i >= 0; i--) { + pixels[i * 4 + 3] = pixels[i * 2 + 1]; + pixels[i * 4 + 2] = pixels[i * 2 + 0]; + pixels[i * 4 + 1] = pixels[i * 2 + 0]; + pixels[i * 4 + 0] = pixels[i * 2 + 0]; + } + } + else if (components == 3) { + for (int i = width * height - 1; i >= 0; i--) { + pixels[i * 4 + 3] = alpha; + pixels[i * 4 + 2] = pixels[i * 3 + 2]; + pixels[i * 4 + 1] = pixels[i * 3 + 1]; + pixels[i * 4 + 0] = pixels[i * 3 + 0]; + } + } + else if (components == 1) { + for (int i = width * height - 1; i >= 0; i--) { + pixels[i * 4 + 3] = alpha; + pixels[i * 4 + 2] = pixels[i]; + pixels[i * 4 + 1] = pixels[i]; + pixels[i * 4 + 0] = pixels[i]; + } + } } -static ImBuf *imb_oiio_load_image(ImageInput *in, int width, int height, int components, int flags, bool is_alpha) +static ImBuf *imb_oiio_load_image( + ImageInput *in, int width, int height, int components, int flags, bool is_alpha) { - ImBuf *ibuf; - int scanlinesize = width * components * sizeof(uchar); - - /* allocate the memory for the image */ - ibuf = IMB_allocImBuf(width, height, is_alpha ? 32 : 24, flags | IB_rect); - - try - { - if (!in->read_image(TypeDesc::UINT8, - (uchar *)ibuf->rect + (height - 1) * scanlinesize, - AutoStride, - -scanlinesize, - AutoStride)) - { - std::cerr << __func__ << ": ImageInput::read_image() failed:" << std::endl - << in->geterror() << std::endl; - - if (ibuf) - IMB_freeImBuf(ibuf); - - return NULL; - } - } - catch (const std::exception &exc) - { - std::cerr << exc.what() << std::endl; - if (ibuf) IMB_freeImBuf(ibuf); - - return NULL; - } - - /* ImBuf always needs 4 channels */ - fill_all_channels((uchar *)ibuf->rect, width, height, components, 0xFF); - - return ibuf; + ImBuf *ibuf; + int scanlinesize = width * components * sizeof(uchar); + + /* allocate the memory for the image */ + ibuf = IMB_allocImBuf(width, height, is_alpha ? 32 : 24, flags | IB_rect); + + try { + if (!in->read_image(TypeDesc::UINT8, + (uchar *)ibuf->rect + (height - 1) * scanlinesize, + AutoStride, + -scanlinesize, + AutoStride)) { + std::cerr << __func__ << ": ImageInput::read_image() failed:" << std::endl + << in->geterror() << std::endl; + + if (ibuf) + IMB_freeImBuf(ibuf); + + return NULL; + } + } + catch (const std::exception &exc) { + std::cerr << exc.what() << std::endl; + if (ibuf) + IMB_freeImBuf(ibuf); + + return NULL; + } + + /* ImBuf always needs 4 channels */ + fill_all_channels((uchar *)ibuf->rect, width, height, components, 0xFF); + + return ibuf; } -static ImBuf *imb_oiio_load_image_float(ImageInput *in, int width, int height, int components, int flags, bool is_alpha) +static ImBuf *imb_oiio_load_image_float( + ImageInput *in, int width, int height, int components, int flags, bool is_alpha) { - ImBuf *ibuf; - int scanlinesize = width * components * sizeof(float); - - /* allocate the memory for the image */ - ibuf = IMB_allocImBuf(width, height, is_alpha ? 32 : 24, flags | IB_rectfloat); - - try - { - if (!in->read_image(TypeDesc::FLOAT, - (uchar *)ibuf->rect_float + (height - 1) * scanlinesize, - AutoStride, - -scanlinesize, - AutoStride)) - { - std::cerr << __func__ << ": ImageInput::read_image() failed:" << std::endl - << in->geterror() << std::endl; - - if (ibuf) - IMB_freeImBuf(ibuf); - - return NULL; - } - } - catch (const std::exception &exc) - { - std::cerr << exc.what() << std::endl; - if (ibuf) IMB_freeImBuf(ibuf); - - return NULL; - } - - /* ImBuf always needs 4 channels */ - fill_all_channels((float *)ibuf->rect_float, width, height, components, 1.0f); - - /* note: Photoshop 16 bit files never has alpha with it, so no need to handle associated/unassociated alpha */ - return ibuf; + ImBuf *ibuf; + int scanlinesize = width * components * sizeof(float); + + /* allocate the memory for the image */ + ibuf = IMB_allocImBuf(width, height, is_alpha ? 32 : 24, flags | IB_rectfloat); + + try { + if (!in->read_image(TypeDesc::FLOAT, + (uchar *)ibuf->rect_float + (height - 1) * scanlinesize, + AutoStride, + -scanlinesize, + AutoStride)) { + std::cerr << __func__ << ": ImageInput::read_image() failed:" << std::endl + << in->geterror() << std::endl; + + if (ibuf) + IMB_freeImBuf(ibuf); + + return NULL; + } + } + catch (const std::exception &exc) { + std::cerr << exc.what() << std::endl; + if (ibuf) + IMB_freeImBuf(ibuf); + + return NULL; + } + + /* ImBuf always needs 4 channels */ + fill_all_channels((float *)ibuf->rect_float, width, height, components, 1.0f); + + /* note: Photoshop 16 bit files never has alpha with it, so no need to handle associated/unassociated alpha */ + return ibuf; } -extern "C" -{ +extern "C" { int imb_is_a_photoshop(const char *filename) { - const char *photoshop_extension[] = { - ".psd", - ".pdd", - ".psb", - NULL, - }; - - return BLI_path_extension_check_array(filename, photoshop_extension); + const char *photoshop_extension[] = { + ".psd", + ".pdd", + ".psb", + NULL, + }; + + return BLI_path_extension_check_array(filename, photoshop_extension); } int imb_save_photoshop(struct ImBuf *ibuf, const char * /*name*/, int flags) { - if (flags & IB_mem) { - std::cerr << __func__ << ": Photoshop PSD-save: Create PSD in memory" - << " currently not supported" << std::endl; - imb_addencodedbufferImBuf(ibuf); - ibuf->encodedsize = 0; - return(0); - } - - return(0); + if (flags & IB_mem) { + std::cerr << __func__ << ": Photoshop PSD-save: Create PSD in memory" + << " currently not supported" << std::endl; + imb_addencodedbufferImBuf(ibuf); + ibuf->encodedsize = 0; + return (0); + } + + return (0); } struct ImBuf *imb_load_photoshop(const char *filename, int flags, char colorspace[IM_MAX_SPACE]) { - struct ImBuf *ibuf = NULL; - int width, height, components; - bool is_float, is_alpha; - int basesize; - char file_colorspace[IM_MAX_SPACE]; - - /* load image from file through OIIO */ - if (imb_is_a_photoshop(filename) == 0) return (NULL); - - colorspace_set_default_role(colorspace, IM_MAX_SPACE, COLOR_ROLE_DEFAULT_BYTE); - - unique_ptr<ImageInput> in(ImageInput::create(filename)); - if (!in) { - std::cerr << __func__ << ": ImageInput::create() failed:" << std::endl - << OIIO_NAMESPACE::geterror() << std::endl; - return NULL; - } - - ImageSpec spec, config; - config.attribute("oiio:UnassociatedAlpha", (int) 1); - - if (!in->open(filename, spec, config)) { - std::cerr << __func__ << ": ImageInput::open() failed:" << std::endl - << in->geterror() << std::endl; - return NULL; - } - - string ics = spec.get_string_attribute("oiio:ColorSpace"); - BLI_strncpy(file_colorspace, ics.c_str(), IM_MAX_SPACE); - - /* only use colorspaces exis */ - if (colormanage_colorspace_get_named(file_colorspace)) - strcpy(colorspace, file_colorspace); - else - std::cerr << __func__ << ": The embed colorspace (\"" << file_colorspace - << "\") not supported in existent OCIO configuration file. Fallback " - << "to system default colorspace (\"" << colorspace << "\")." << std::endl; - - width = spec.width; - height = spec.height; - components = spec.nchannels; - is_alpha = spec.alpha_channel != -1; - basesize = spec.format.basesize(); - is_float = basesize > 1; - - /* we only handle certain number of components */ - if (!(components >= 1 && components <= 4)) { - if (in) { - in->close(); - } - return NULL; - } - - if (is_float) - ibuf = imb_oiio_load_image_float(in.get(), width, height, components, flags, is_alpha); - else - ibuf = imb_oiio_load_image(in.get(), width, height, components, flags, is_alpha); - - if (in) { - in->close(); - } - - if (!ibuf) - return NULL; - - /* ImBuf always needs 4 channels */ - ibuf->ftype = IMB_FTYPE_PSD; - ibuf->channels = 4; - ibuf->planes = (3 + (is_alpha ? 1 : 0)) * 4 << basesize; - - try - { - return ibuf; - } - catch (const std::exception &exc) - { - std::cerr << exc.what() << std::endl; - if (ibuf) IMB_freeImBuf(ibuf); - - return NULL; - } + struct ImBuf *ibuf = NULL; + int width, height, components; + bool is_float, is_alpha; + int basesize; + char file_colorspace[IM_MAX_SPACE]; + + /* load image from file through OIIO */ + if (imb_is_a_photoshop(filename) == 0) + return (NULL); + + colorspace_set_default_role(colorspace, IM_MAX_SPACE, COLOR_ROLE_DEFAULT_BYTE); + + unique_ptr<ImageInput> in(ImageInput::create(filename)); + if (!in) { + std::cerr << __func__ << ": ImageInput::create() failed:" << std::endl + << OIIO_NAMESPACE::geterror() << std::endl; + return NULL; + } + + ImageSpec spec, config; + config.attribute("oiio:UnassociatedAlpha", (int)1); + + if (!in->open(filename, spec, config)) { + std::cerr << __func__ << ": ImageInput::open() failed:" << std::endl + << in->geterror() << std::endl; + return NULL; + } + + string ics = spec.get_string_attribute("oiio:ColorSpace"); + BLI_strncpy(file_colorspace, ics.c_str(), IM_MAX_SPACE); + + /* only use colorspaces exis */ + if (colormanage_colorspace_get_named(file_colorspace)) + strcpy(colorspace, file_colorspace); + else + std::cerr << __func__ << ": The embed colorspace (\"" << file_colorspace + << "\") not supported in existent OCIO configuration file. Fallback " + << "to system default colorspace (\"" << colorspace << "\")." << std::endl; + + width = spec.width; + height = spec.height; + components = spec.nchannels; + is_alpha = spec.alpha_channel != -1; + basesize = spec.format.basesize(); + is_float = basesize > 1; + + /* we only handle certain number of components */ + if (!(components >= 1 && components <= 4)) { + if (in) { + in->close(); + } + return NULL; + } + + if (is_float) + ibuf = imb_oiio_load_image_float(in.get(), width, height, components, flags, is_alpha); + else + ibuf = imb_oiio_load_image(in.get(), width, height, components, flags, is_alpha); + + if (in) { + in->close(); + } + + if (!ibuf) + return NULL; + + /* ImBuf always needs 4 channels */ + ibuf->ftype = IMB_FTYPE_PSD; + ibuf->channels = 4; + ibuf->planes = (3 + (is_alpha ? 1 : 0)) * 4 << basesize; + + try { + return ibuf; + } + catch (const std::exception &exc) { + std::cerr << exc.what() << std::endl; + if (ibuf) + IMB_freeImBuf(ibuf); + + return NULL; + } } int OIIO_getVersionHex(void) { - return openimageio_version(); + return openimageio_version(); } -} // export "C" +} // export "C" diff --git a/source/blender/imbuf/intern/oiio/openimageio_api.h b/source/blender/imbuf/intern/oiio/openimageio_api.h index d6249af2a0a..520ad0c5da5 100644 --- a/source/blender/imbuf/intern/oiio/openimageio_api.h +++ b/source/blender/imbuf/intern/oiio/openimageio_api.h @@ -21,7 +21,6 @@ * \ingroup openimageio */ - #ifndef __OPENIMAGEIO_API_H__ #define __OPENIMAGEIO_API_H__ @@ -33,11 +32,11 @@ extern "C" { struct ImBuf; -int imb_is_a_photoshop (const char *name); +int imb_is_a_photoshop(const char *name); -int imb_save_photoshop (struct ImBuf *ibuf, const char *name, int flags); +int imb_save_photoshop(struct ImBuf *ibuf, const char *name, int flags); -struct ImBuf *imb_load_photoshop (const char *name, int flags, char *colorspace); +struct ImBuf *imb_load_photoshop(const char *name, int flags, char *colorspace); int OIIO_getVersionHex(void); @@ -46,4 +45,4 @@ int OIIO_getVersionHex(void); #endif -#endif /* __OPENIMAGEIO_API_H__ */ +#endif /* __OPENIMAGEIO_API_H__ */ |