Revision: 50229
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50229
Author: nazgul
Date: 2012-08-26 19:36:56 +0000 (Sun, 26 Aug 2012)
Log Message:
-----------
Sequencer: typo fix
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/seqeffects.c
Modified: trunk/blender/source/blender/blenkernel/intern/seqeffects.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/seqeffects.c 2012-08-26
18:21:34 UTC (rev 50228)
+++ trunk/blender/source/blender/blenkernel/intern/seqeffects.c 2012-08-26
19:36:56 UTC (rev 50229)
@@ -56,7 +56,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)
{
@@ -72,7 +72,7 @@
*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)
{
@@ -286,14 +286,14 @@
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);
}
@@ -448,14 +448,14 @@
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);
}
@@ -558,14 +558,14 @@
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);
}
@@ -807,14 +807,14 @@
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);
}
@@ -913,14 +913,14 @@
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);
}
@@ -1017,14 +1017,14 @@
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);
}
@@ -1214,14 +1214,14 @@
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);
}
@@ -2748,7 +2748,7 @@
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);
@@ -2756,7 +2756,7 @@
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);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
