diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-10-23 06:52:27 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-10-23 06:52:27 +0400 |
| commit | 304a32bf1f1e9a5b69c9ab938e80919c50a601ed (patch) | |
| tree | 78ae0d2b9a4ea7daf29c8ded9dd1d90a1fa047d7 /source/blender/imbuf/intern/oiio | |
| parent | 8748840564150e62c537c14172528b2d12e43e9c (diff) | |
style cleanup
Diffstat (limited to 'source/blender/imbuf/intern/oiio')
| -rw-r--r-- | source/blender/imbuf/intern/oiio/openimageio_api.cpp | 34 |
1 files changed, 20 insertions, 14 deletions
diff --git a/source/blender/imbuf/intern/oiio/openimageio_api.cpp b/source/blender/imbuf/intern/oiio/openimageio_api.cpp index 1ee4ee00500..fe74b8f7cce 100644 --- a/source/blender/imbuf/intern/oiio/openimageio_api.cpp +++ b/source/blender/imbuf/intern/oiio/openimageio_api.cpp @@ -99,13 +99,16 @@ static ImBuf *imb_oiio_load_image(ImageInput *in, int width, int height, int com try { if (!in->read_image(TypeDesc::UINT8, - (uchar *)ibuf->rect + (height - 1) * scanlinesize, - AutoStride, - -scanlinesize, - AutoStride)) { + (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); + << in->geterror() << std::endl; + + if (ibuf) + IMB_freeImBuf(ibuf); return NULL; } @@ -135,13 +138,16 @@ static ImBuf *imb_oiio_load_image_float(ImageInput *in, int width, int height, i try { if (!in->read_image(TypeDesc::FLOAT, - (uchar *)ibuf->rect_float + (height - 1) * scanlinesize, - AutoStride, - -scanlinesize, - AutoStride)) { + (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); + << in->geterror() << std::endl; + + if (ibuf) + IMB_freeImBuf(ibuf); return NULL; } @@ -205,7 +211,7 @@ struct ImBuf *imb_load_photoshop(const char *filename, int flags, char colorspac in = ImageInput::create(filename); if (!in) { std::cerr << __func__ << ": ImageInput::create() failed:" << std::endl - << OpenImageIO::geterror() << std::endl; + << OpenImageIO::geterror() << std::endl; return NULL; } @@ -214,7 +220,7 @@ struct ImBuf *imb_load_photoshop(const char *filename, int flags, char colorspac if (!in->open(filename, spec, config)) { std::cerr << __func__ << ": ImageInput::open() failed:" << std::endl - << in->geterror() << std::endl; + << in->geterror() << std::endl; delete in; return NULL; } |