Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

style cleanup

Browse Source
This commit is contained in:
Campbell Barton
2013-10-09 05:59:35 +00:00
parent ac908090ad
commit 22a30f78f2
1 changed files with 36 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
source/blender/imbuf/intern/oiio/openimageio_api.cpp
View File

@@ -36,7 +36,7 @@
OIIO_NAMESPACE_USING OIIO_NAMESPACE_USING
#if defined (WIN32) && !defined(FREE_WINDOWS) #if defined(WIN32) && !defined(FREE_WINDOWS)
#include "utfconv.h" #include "utfconv.h"
#endif #endif
@@ -58,32 +58,31 @@ using namespace std;
typedef unsigned char uchar; typedef unsigned char uchar;
template <class T, class Q> template <class T, class Q>
static void static void fill_all_channels(T *pixels, int width, int height, int components, Q alpha)
fill_all_channels(T * pixels, int width, int height, int components, Q alpha)
{ {
if(components == 2) { if (components == 2) {
for(int i = width*height-1; i >= 0; i--) { for (int i = width * height - 1; i >= 0; i--) {
pixels[i*4+3] = pixels[i*2+1]; pixels[i * 4 + 3] = pixels[i * 2 + 1];
pixels[i*4+2] = pixels[i*2+0]; pixels[i * 4 + 2] = pixels[i * 2 + 0];
pixels[i*4+1] = pixels[i*2+0]; pixels[i * 4 + 1] = pixels[i * 2 + 0];
pixels[i*4+0] = pixels[i*2+0]; pixels[i * 4 + 0] = pixels[i * 2 + 0];
} }
} }
else if(components == 3) { else if (components == 3) {
for(int i = width*height-1; i >= 0; i--) { for (int i = width * height - 1; i >= 0; i--) {
pixels[i*4+3] = alpha; pixels[i * 4 + 3] = alpha;
pixels[i*4+2] = pixels[i*3+2]; pixels[i * 4 + 2] = pixels[i * 3 + 2];
pixels[i*4+1] = pixels[i*3+1]; pixels[i * 4 + 1] = pixels[i * 3 + 1];
pixels[i*4+0] = pixels[i*3+0]; pixels[i * 4 + 0] = pixels[i * 3 + 0];
} }
} }
else if(components == 1) { else if (components == 1) {
for(int i = width*height-1; i >= 0; i--) { for (int i = width * height - 1; i >= 0; i--) {
pixels[i*4+3] = alpha; pixels[i * 4 + 3] = alpha;
pixels[i*4+2] = pixels[i]; pixels[i * 4 + 2] = pixels[i];
pixels[i*4+1] = pixels[i]; pixels[i * 4 + 1] = pixels[i];
pixels[i*4+0] = pixels[i]; pixels[i * 4 + 0] = pixels[i];
} }
} }
@@ -92,18 +91,18 @@ fill_all_channels(T * pixels, int width, int height, int components, Q alpha)
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; ImBuf *ibuf;
int scanlinesize = width*components*sizeof(uchar); int scanlinesize = width * components * sizeof(uchar);
/* allocate the memory for the image */ /* allocate the memory for the image */
ibuf = IMB_allocImBuf(width, height, is_alpha ? 32 : 24, flags|IB_rect); ibuf = IMB_allocImBuf(width, height, is_alpha ? 32 : 24, flags | IB_rect);
try try
{ {
in->read_image(TypeDesc::UINT8, in->read_image(TypeDesc::UINT8,
(uchar *)ibuf->rect + (height-1) * scanlinesize, (uchar *)ibuf->rect + (height - 1) * scanlinesize,
AutoStride, AutoStride,
-scanlinesize, -scanlinesize,
AutoStride); AutoStride);
} }
catch (const std::exception &exc) catch (const std::exception &exc)
{ {
@@ -122,15 +121,15 @@ static ImBuf *imb_oiio_load_image(ImageInput *in, int width, int height, int com
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; ImBuf *ibuf;
int scanlinesize = width*components*sizeof(float); int scanlinesize = width * components * sizeof(float);
/* allocate the memory for the image */ /* allocate the memory for the image */
ibuf = IMB_allocImBuf(width, height, is_alpha ? 32 : 24, flags|IB_rectfloat); ibuf = IMB_allocImBuf(width, height, is_alpha ? 32 : 24, flags | IB_rectfloat);
try try
{ {
in->read_image(TypeDesc::FLOAT, in->read_image(TypeDesc::FLOAT,
(uchar *)ibuf->rect_float + (height-1) * scanlinesize, (uchar *)ibuf->rect_float + (height - 1) * scanlinesize,
AutoStride, AutoStride,
-scanlinesize, -scanlinesize,
AutoStride); AutoStride);
@@ -177,7 +176,7 @@ int imb_save_photoshop(struct ImBuf *ibuf, const char *name, int flags)
return(0); return(0);
} }
struct ImBuf *imb_load_photoshop (const char *filename, int flags, char colorspace[IM_MAX_SPACE]) struct ImBuf *imb_load_photoshop(const char *filename, int flags, char colorspace[IM_MAX_SPACE])
{ {
ImageInput *in = NULL; ImageInput *in = NULL;
struct ImBuf *ibuf = NULL; struct ImBuf *ibuf = NULL;
@@ -195,9 +194,9 @@ struct ImBuf *imb_load_photoshop (const char *filename, int flags, char colorspa
if (!in) return NULL; if (!in) return NULL;
ImageSpec spec, config; ImageSpec spec, config;
config.attribute ("oiio:UnassociatedAlpha", (int) 1); config.attribute("oiio:UnassociatedAlpha", (int) 1);
if(!in->open(filename, spec, config)) { if (!in->open(filename, spec, config)) {
delete in; delete in;
return NULL; return NULL;
} }
@@ -213,8 +212,8 @@ struct ImBuf *imb_load_photoshop (const char *filename, int flags, char colorspa
is_float = basesize > 1; is_float = basesize > 1;
/* we only handle certain number of components */ /* we only handle certain number of components */
if(!(components >= 1 && components <= 4)) { if (!(components >= 1 && components <= 4)) {
if(in) { if (in) {
in->close(); in->close();
delete in; delete in;
} }
@@ -241,14 +240,14 @@ struct ImBuf *imb_load_photoshop (const char *filename, int flags, char colorspa
try try
{ {
return(ibuf); return ibuf;
} }
catch (const std::exception &exc) catch (const std::exception &exc)
{ {
std::cerr << exc.what() << std::endl; std::cerr << exc.what() << std::endl;
if (ibuf) IMB_freeImBuf(ibuf); if (ibuf) IMB_freeImBuf(ibuf);
return (0); return NULL;
} }
} }