diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-03-05 18:47:49 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-03-05 18:47:49 +0400 |
commit | f2bb536994baecb442942306d959666cad66bf61 (patch) | |
tree | 4873d8197ae2c770e52a749899e80f4fcd1dcdb9 /source/blender/imbuf/intern | |
parent | 65377714103259f0629ebfa8124a78364a997745 (diff) |
code cleanup: also change BKE_blender.h BLENDER_VERSION_CHAR to 'a' so as not to confuse things.
Diffstat (limited to 'source/blender/imbuf/intern')
-rw-r--r-- | source/blender/imbuf/intern/anim_movie.c | 8 | ||||
-rw-r--r-- | source/blender/imbuf/intern/cineon/cineon_dpx.c | 2 | ||||
-rw-r--r-- | source/blender/imbuf/intern/cineon/logImageCore.c | 2 | ||||
-rw-r--r-- | source/blender/imbuf/intern/rectop.c | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/imbuf/intern/anim_movie.c b/source/blender/imbuf/intern/anim_movie.c index 381e0b8c57c..4ef1f962a0f 100644 --- a/source/blender/imbuf/intern/anim_movie.c +++ b/source/blender/imbuf/intern/anim_movie.c @@ -822,10 +822,10 @@ static int ffmpeg_decode_video_frame(struct anim *anim) if (rval == AVERROR_EOF) { /* this sets size and data fields to zero, - which is necessary to decode the remaining data - in the decoder engine after EOF. It also prevents a memory - leak, since av_read_frame spills out a full size packet even - on EOF... (and: it's save to call on NULL packets) */ + * which is necessary to decode the remaining data + * in the decoder engine after EOF. It also prevents a memory + * leak, since av_read_frame spills out a full size packet even + * on EOF... (and: it's save to call on NULL packets) */ av_free_packet(&anim->next_packet); diff --git a/source/blender/imbuf/intern/cineon/cineon_dpx.c b/source/blender/imbuf/intern/cineon/cineon_dpx.c index ba84063f317..6cf628448a2 100644 --- a/source/blender/imbuf/intern/cineon/cineon_dpx.c +++ b/source/blender/imbuf/intern/cineon/cineon_dpx.c @@ -141,7 +141,7 @@ static int imb_save_dpx_cineon(ImBuf *ibuf, const char *filename, int use_cineon if (ibuf->rect_float != 0 && bitspersample != 8) { /* don't use the float buffer to save 8 bpp picture to prevent color banding - (there's no dithering algorithm behing the logImageSetDataRGBA function) */ + * (there's no dithering algorithm behing the logImageSetDataRGBA function) */ fbuf = (float *)MEM_mallocN(ibuf->x * ibuf->y * 4 * sizeof(float), "fbuf in imb_save_dpx_cineon"); diff --git a/source/blender/imbuf/intern/cineon/logImageCore.c b/source/blender/imbuf/intern/cineon/logImageCore.c index 3911e5c2ef3..332ad913d19 100644 --- a/source/blender/imbuf/intern/cineon/logImageCore.c +++ b/source/blender/imbuf/intern/cineon/logImageCore.c @@ -374,7 +374,7 @@ int logImageGetDataRGBA(LogImageFile *logImage, float *data, int dataIsLinearRGB LogImageElement mergedElement; /* Determine the depth of the picture and if there's a separate alpha element. - If the element is supported, load it into an unsigned ints array. */ + * If the element is supported, load it into an unsigned ints array. */ memset(&elementData, 0, 8 * sizeof(float *)); hasAlpha = 0; diff --git a/source/blender/imbuf/intern/rectop.c b/source/blender/imbuf/intern/rectop.c index 9b98ee7aeb0..3a79ea09228 100644 --- a/source/blender/imbuf/intern/rectop.c +++ b/source/blender/imbuf/intern/rectop.c @@ -517,7 +517,7 @@ void IMB_rectblend(struct ImBuf *dbuf, struct ImBuf *sbuf, int destx, dr = drect; sr = srect; for (x = width; x > 0; x--, dr++, sr++) { - if(*sr & IB_ALPHA_MASK) + if (*sr & IB_ALPHA_MASK) func((char *)dr, (char *)dr, (char *)sr, ((char *)sr)[3]); } |