Merging r50226 through r50236 from trunk into soc-2011-tomato
[blender.git] / source / blender / blenkernel / intern / seqeffects.c
index e1fd5a1639fde909308c30b3567e0568f3f329c9..e1c3decf24fdc5f1eaed7d0f3756a4248e28ac3c 100644 (file)
@@ -57,7 +57,7 @@
 
 #include "RNA_access.h"
 
-static void slize_get_byte_buffers(const SeqRenderData *context, const ImBuf *ibuf1, const ImBuf *ibuf2,
+static void slice_get_byte_buffers(const SeqRenderData *context, const ImBuf *ibuf1, const ImBuf *ibuf2,
                                    const ImBuf *ibuf3, const ImBuf *out, int start_line, unsigned char **rect1,
                                    unsigned char **rect2, unsigned char **rect3, unsigned char **rect_out)
 {
@@ -73,7 +73,7 @@ static void slize_get_byte_buffers(const SeqRenderData *context, const ImBuf *ib
                *rect3 = (unsigned char*) ibuf3->rect + offset;
 }
 
-static void slize_get_float_buffers(const SeqRenderData *context, const ImBuf *ibuf1, const ImBuf *ibuf2,
+static void slice_get_float_buffers(const SeqRenderData *context, const ImBuf *ibuf1, const ImBuf *ibuf2,
                                     const ImBuf *ibuf3, const ImBuf *out, int start_line,
                                     float **rect1, float **rect2, float **rect3, float **rect_out)
 {
@@ -289,14 +289,14 @@ static void do_alphaover_effect(SeqRenderData context, Sequence *UNUSED(seq), fl
        if (out->rect_float) {
                float *rect1 = NULL, *rect2 = NULL, *rect_out = NULL;
 
-               slize_get_float_buffers(&context, ibuf1, ibuf2, NULL, out, start_line, &rect1, &rect2, NULL, &rect_out);
+               slice_get_float_buffers(&context, ibuf1, ibuf2, NULL, out, start_line, &rect1, &rect2, NULL, &rect_out);
 
                do_alphaover_effect_float(facf0, facf1, context.rectx, total_lines, rect1, rect2, rect_out);
        }
        else {
                unsigned char *rect1 = NULL, *rect2 = NULL, *rect_out = NULL;
 
-               slize_get_byte_buffers(&context, ibuf1, ibuf2, NULL, out, start_line, &rect1, &rect2, NULL, &rect_out);
+               slice_get_byte_buffers(&context, ibuf1, ibuf2, NULL, out, start_line, &rect1, &rect2, NULL, &rect_out);
 
                do_alphaover_effect_byte(facf0, facf1, context.rectx, total_lines, (char *) rect1, (char *) rect2, (char *) rect_out);
        }
@@ -451,14 +451,14 @@ static void do_alphaunder_effect(SeqRenderData context, Sequence *UNUSED(seq), f
        if (out->rect_float) {
                float *rect1 = NULL, *rect2 = NULL, *rect_out = NULL;
 
-               slize_get_float_buffers(&context, ibuf1, ibuf2, NULL, out, start_line, &rect1, &rect2, NULL, &rect_out);
+               slice_get_float_buffers(&context, ibuf1, ibuf2, NULL, out, start_line, &rect1, &rect2, NULL, &rect_out);
 
                do_alphaunder_effect_float(facf0, facf1, context.rectx, total_lines, rect1, rect2, rect_out);
        }
        else {
                unsigned char *rect1 = NULL, *rect2 = NULL, *rect_out = NULL;
 
-               slize_get_byte_buffers(&context, ibuf1, ibuf2, NULL, out, start_line, &rect1, &rect2, NULL, &rect_out);
+               slice_get_byte_buffers(&context, ibuf1, ibuf2, NULL, out, start_line, &rect1, &rect2, NULL, &rect_out);
 
                do_alphaunder_effect_byte(facf0, facf1, context.rectx, total_lines, (char *) rect1, (char *) rect2, (char *) rect_out);
        }
@@ -561,14 +561,14 @@ static void do_cross_effect(SeqRenderData context, Sequence *UNUSED(seq), float
        if (out->rect_float) {
                float *rect1 = NULL, *rect2 = NULL, *rect_out = NULL;
 
-               slize_get_float_buffers(&context, ibuf1, ibuf2, NULL, out, start_line, &rect1, &rect2, NULL, &rect_out);
+               slice_get_float_buffers(&context, ibuf1, ibuf2, NULL, out, start_line, &rect1, &rect2, NULL, &rect_out);
 
                do_cross_effect_float(facf0, facf1, context.rectx, total_lines, rect1, rect2, rect_out);
        }
        else {
                unsigned char *rect1 = NULL, *rect2 = NULL, *rect_out = NULL;
 
-               slize_get_byte_buffers(&context, ibuf1, ibuf2, NULL, out, start_line, &rect1, &rect2, NULL, &rect_out);
+               slice_get_byte_buffers(&context, ibuf1, ibuf2, NULL, out, start_line, &rect1, &rect2, NULL, &rect_out);
 
                do_cross_effect_byte(facf0, facf1, context.rectx, total_lines, (char *) rect1, (char *) rect2, (char *) rect_out);
        }
@@ -810,14 +810,14 @@ static void do_gammacross_effect(SeqRenderData context, Sequence *UNUSED(seq), f
        if (out->rect_float) {
                float *rect1 = NULL, *rect2 = NULL, *rect_out = NULL;
 
-               slize_get_float_buffers(&context, ibuf1, ibuf2, NULL, out, start_line, &rect1, &rect2, NULL, &rect_out);
+               slice_get_float_buffers(&context, ibuf1, ibuf2, NULL, out, start_line, &rect1, &rect2, NULL, &rect_out);
 
                do_gammacross_effect_float(facf0, facf1, context.rectx, total_lines, rect1, rect2, rect_out);
        }
        else {
                unsigned char *rect1 = NULL, *rect2 = NULL, *rect_out = NULL;
 
-               slize_get_byte_buffers(&context, ibuf1, ibuf2, NULL, out, start_line, &rect1, &rect2, NULL, &rect_out);
+               slice_get_byte_buffers(&context, ibuf1, ibuf2, NULL, out, start_line, &rect1, &rect2, NULL, &rect_out);
 
                do_gammacross_effect_byte(facf0, facf1, context.rectx, total_lines, rect1, rect2, rect_out);
        }
@@ -916,14 +916,14 @@ static void do_add_effect(SeqRenderData context, Sequence *UNUSED(seq), float UN
        if (out->rect_float) {
                float *rect1 = NULL, *rect2 = NULL, *rect_out = NULL;
 
-               slize_get_float_buffers(&context, ibuf1, ibuf2, NULL, out, start_line, &rect1, &rect2, NULL, &rect_out);
+               slice_get_float_buffers(&context, ibuf1, ibuf2, NULL, out, start_line, &rect1, &rect2, NULL, &rect_out);
 
                do_add_effect_float(facf0, facf1, context.rectx, total_lines, rect1, rect2, rect_out);
        }
        else {
                unsigned char *rect1 = NULL, *rect2 = NULL, *rect_out = NULL;
 
-               slize_get_byte_buffers(&context, ibuf1, ibuf2, NULL, out, start_line, &rect1, &rect2, NULL, &rect_out);
+               slice_get_byte_buffers(&context, ibuf1, ibuf2, NULL, out, start_line, &rect1, &rect2, NULL, &rect_out);
 
                do_add_effect_byte(facf0, facf1, context.rectx, total_lines, rect1, rect2, rect_out);
        }
@@ -1020,14 +1020,14 @@ static void do_sub_effect(SeqRenderData context, Sequence *UNUSED(seq), float UN
        if (out->rect_float) {
                float *rect1 = NULL, *rect2 = NULL, *rect_out = NULL;
 
-               slize_get_float_buffers(&context, ibuf1, ibuf2, NULL, out, start_line, &rect1, &rect2, NULL, &rect_out);
+               slice_get_float_buffers(&context, ibuf1, ibuf2, NULL, out, start_line, &rect1, &rect2, NULL, &rect_out);
 
                do_sub_effect_float(facf0, facf1, context.rectx, total_lines, rect1, rect2, rect_out);
        }
        else {
                unsigned char *rect1 = NULL, *rect2 = NULL, *rect_out = NULL;
 
-               slize_get_byte_buffers(&context, ibuf1, ibuf2, NULL, out, start_line, &rect1, &rect2, NULL, &rect_out);
+               slice_get_byte_buffers(&context, ibuf1, ibuf2, NULL, out, start_line, &rect1, &rect2, NULL, &rect_out);
 
                do_sub_effect_byte(facf0, facf1, context.rectx, total_lines, (char *) rect1, (char *) rect2, (char *) rect_out);
        }
@@ -1217,14 +1217,14 @@ static void do_mul_effect(SeqRenderData context, Sequence *UNUSED(seq), float UN
        if (out->rect_float) {
                float *rect1 = NULL, *rect2 = NULL, *rect_out = NULL;
 
-               slize_get_float_buffers(&context, ibuf1, ibuf2, NULL, out, start_line, &rect1, &rect2, NULL, &rect_out);
+               slice_get_float_buffers(&context, ibuf1, ibuf2, NULL, out, start_line, &rect1, &rect2, NULL, &rect_out);
 
                do_mul_effect_float(facf0, facf1, context.rectx, total_lines, rect1, rect2, rect_out);
        }
        else {
                unsigned char *rect1 = NULL, *rect2 = NULL, *rect_out = NULL;
 
-               slize_get_byte_buffers(&context, ibuf1, ibuf2, NULL, out, start_line, &rect1, &rect2, NULL, &rect_out);
+               slice_get_byte_buffers(&context, ibuf1, ibuf2, NULL, out, start_line, &rect1, &rect2, NULL, &rect_out);
 
                do_mul_effect_byte(facf0, facf1, context.rectx, total_lines, rect1, rect2, rect_out);
        }
@@ -2751,7 +2751,7 @@ static void do_overdrop_effect(SeqRenderData context, Sequence *UNUSED(seq), flo
        if (out->rect_float) {
                float *rect1 = NULL, *rect2 = NULL, *rect_out = NULL;
 
-               slize_get_float_buffers(&context, ibuf1, ibuf2, NULL, out, start_line, &rect1, &rect2, NULL, &rect_out);
+               slice_get_float_buffers(&context, ibuf1, ibuf2, NULL, out, start_line, &rect1, &rect2, NULL, &rect_out);
 
                do_drop_effect_float(facf0, facf1, x, y, rect1, rect2, rect_out);
                do_alphaover_effect_float(facf0, facf1, x, y, rect1, rect2, rect_out);
@@ -2759,7 +2759,7 @@ static void do_overdrop_effect(SeqRenderData context, Sequence *UNUSED(seq), flo
        else {
                unsigned char *rect1 = NULL, *rect2 = NULL, *rect_out = NULL;
 
-               slize_get_byte_buffers(&context, ibuf1, ibuf2, NULL, out, start_line, &rect1, &rect2, NULL, &rect_out);
+               slice_get_byte_buffers(&context, ibuf1, ibuf2, NULL, out, start_line, &rect1, &rect2, NULL, &rect_out);
 
                do_drop_effect_byte(facf0, facf1, x, y, (char *) rect1, (char *) rect2, (char *) rect_out);
                do_alphaover_effect_byte(facf0, facf1, x, y, (char *) rect1, (char *) rect2, (char *) rect_out);