Revision: 52876
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52876
Author: campbellbarton
Date: 2012-12-11 14:19:41 +0000 (Tue, 11 Dec 2012)
Log Message:
-----------
code cleanup: neareast -> nearest
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/seqeffects.c
trunk/blender/source/blender/blenkernel/intern/tracking.c
trunk/blender/source/blender/compositor/operations/COM_ImageOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_MovieClipOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_MultilayerImageOperation.cpp
trunk/blender/source/blender/imbuf/IMB_imbuf.h
trunk/blender/source/blender/imbuf/intern/imageprocess.c
trunk/blender/source/blender/makesdna/DNA_tracking_types.h
trunk/blender/source/blender/makesrna/intern/rna_tracking.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_rotate.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_transform.c
Modified: trunk/blender/source/blender/blenkernel/intern/seqeffects.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/seqeffects.c 2012-12-11
14:18:37 UTC (rev 52875)
+++ trunk/blender/source/blender/blenkernel/intern/seqeffects.c 2012-12-11
14:19:41 UTC (rev 52876)
@@ -1745,7 +1745,7 @@
/* interpolate */
switch (interpolation) {
case 0:
- neareast_interpolation(ibuf1, out, xt,
yt, xi, yi);
+ nearest_interpolation(ibuf1, out, xt,
yt, xi, yi);
break;
case 1:
bilinear_interpolation(ibuf1, out, xt,
yt, xi, yi);
Modified: trunk/blender/source/blender/blenkernel/intern/tracking.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/tracking.c 2012-12-11
14:18:37 UTC (rev 52875)
+++ trunk/blender/source/blender/blenkernel/intern/tracking.c 2012-12-11
14:19:41 UTC (rev 52876)
@@ -3462,15 +3462,15 @@
BKE_tracking_stabilization_data_to_mat4(ibuf->x, ibuf->y,
aspect, tloc, tscale, tangle, mat);
invert_m4(mat);
- if (filter == TRACKING_FILTER_NEAREAST)
- interpolation = neareast_interpolation;
+ if (filter == TRACKING_FILTER_NEAREST)
+ interpolation = nearest_interpolation;
else if (filter == TRACKING_FILTER_BILINEAR)
interpolation = bilinear_interpolation;
else if (filter == TRACKING_FILTER_BICUBIC)
interpolation = bicubic_interpolation;
else
/* fallback to default interpolation method */
- interpolation = neareast_interpolation;
+ interpolation = nearest_interpolation;
for (j = 0; j < tmpibuf->y; j++) {
for (i = 0; i < tmpibuf->x; i++) {
Modified:
trunk/blender/source/blender/compositor/operations/COM_ImageOperation.cpp
===================================================================
--- trunk/blender/source/blender/compositor/operations/COM_ImageOperation.cpp
2012-12-11 14:18:37 UTC (rev 52875)
+++ trunk/blender/source/blender/compositor/operations/COM_ImageOperation.cpp
2012-12-11 14:19:41 UTC (rev 52876)
@@ -120,7 +120,7 @@
else {
switch (sampler) {
case COM_PS_NEAREST:
- neareast_interpolation_color(this->m_buffer,
NULL, output, x, y);
+ nearest_interpolation_color(this->m_buffer,
NULL, output, x, y);
break;
case COM_PS_BILINEAR:
bilinear_interpolation_color(this->m_buffer,
NULL, output, x, y);
@@ -143,7 +143,7 @@
tempcolor[3] = 1.0f;
switch (sampler) {
case COM_PS_NEAREST:
- neareast_interpolation_color(this->m_buffer,
NULL, tempcolor, x, y);
+ nearest_interpolation_color(this->m_buffer,
NULL, tempcolor, x, y);
break;
case COM_PS_BILINEAR:
bilinear_interpolation_color(this->m_buffer,
NULL, tempcolor, x, y);
Modified:
trunk/blender/source/blender/compositor/operations/COM_MovieClipOperation.cpp
===================================================================
---
trunk/blender/source/blender/compositor/operations/COM_MovieClipOperation.cpp
2012-12-11 14:18:37 UTC (rev 52875)
+++
trunk/blender/source/blender/compositor/operations/COM_MovieClipOperation.cpp
2012-12-11 14:19:41 UTC (rev 52876)
@@ -95,7 +95,7 @@
else {
switch (sampler) {
case COM_PS_NEAREST:
-
neareast_interpolation_color(this->m_movieClipBuffer, NULL, output, x, y);
+
nearest_interpolation_color(this->m_movieClipBuffer, NULL, output, x, y);
break;
case COM_PS_BILINEAR:
bilinear_interpolation_color(this->m_movieClipBuffer, NULL, output, x, y);
Modified:
trunk/blender/source/blender/compositor/operations/COM_MultilayerImageOperation.cpp
===================================================================
---
trunk/blender/source/blender/compositor/operations/COM_MultilayerImageOperation.cpp
2012-12-11 14:18:37 UTC (rev 52875)
+++
trunk/blender/source/blender/compositor/operations/COM_MultilayerImageOperation.cpp
2012-12-11 14:19:41 UTC (rev 52876)
@@ -54,7 +54,7 @@
if (this->m_numberOfChannels == 4) {
switch (sampler) {
case COM_PS_NEAREST:
-
neareast_interpolation_color(this->m_buffer, NULL, output, x, y);
+
nearest_interpolation_color(this->m_buffer, NULL, output, x, y);
break;
case COM_PS_BILINEAR:
bilinear_interpolation_color(this->m_buffer, NULL, output, x, y);
Modified: trunk/blender/source/blender/imbuf/IMB_imbuf.h
===================================================================
--- trunk/blender/source/blender/imbuf/IMB_imbuf.h 2012-12-11 14:18:37 UTC
(rev 52875)
+++ trunk/blender/source/blender/imbuf/IMB_imbuf.h 2012-12-11 14:19:41 UTC
(rev 52876)
@@ -407,11 +407,11 @@
* \attention defined in imageprocess.c
*/
void bicubic_interpolation(struct ImBuf *in, struct ImBuf *out, float u, float
v, int xout, int yout);
-void neareast_interpolation(struct ImBuf *in, struct ImBuf *out, float u,
float v, int xout, int yout);
+void nearest_interpolation(struct ImBuf *in, struct ImBuf *out, float u, float
v, int xout, int yout);
void bilinear_interpolation(struct ImBuf *in, struct ImBuf *out, float u,
float v, int xout, int yout);
void bicubic_interpolation_color(struct ImBuf *in, unsigned char col[4], float
col_float[4], float u, float v);
-void neareast_interpolation_color(struct ImBuf *in, unsigned char col[4],
float col_float[4], float u, float v);
+void nearest_interpolation_color(struct ImBuf *in, unsigned char col[4], float
col_float[4], float u, float v);
void bilinear_interpolation_color(struct ImBuf *in, unsigned char col[4],
float col_float[4], float u, float v);
void bilinear_interpolation_color_wrap(struct ImBuf *in, unsigned char col[4],
float col_float[4], float u, float v);
Modified: trunk/blender/source/blender/imbuf/intern/imageprocess.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/imageprocess.c 2012-12-11
14:18:37 UTC (rev 52875)
+++ trunk/blender/source/blender/imbuf/intern/imageprocess.c 2012-12-11
14:19:41 UTC (rev 52876)
@@ -219,7 +219,7 @@
/* function assumes out to be zero'ed, only does RGBA */
/* NEAREST INTERPOLATION */
-void neareast_interpolation_color(struct ImBuf *in, unsigned char outI[4],
float outF[4], float u, float v)
+void nearest_interpolation_color(struct ImBuf *in, unsigned char outI[4],
float outF[4], float u, float v)
{
float *dataF;
unsigned char *dataI;
@@ -268,7 +268,7 @@
}
}
-void neareast_interpolation(ImBuf *in, ImBuf *out, float x, float y, int xout,
int yout)
+void nearest_interpolation(ImBuf *in, ImBuf *out, float x, float y, int xout,
int yout)
{
unsigned char *outI = NULL;
float *outF = NULL;
@@ -279,7 +279,7 @@
pixel_from_buffer(out, &outI, &outF, xout, yout); /* gcc warns these
could be uninitialized, but its ok */
- neareast_interpolation_color(in, outI, outF, x, y);
+ nearest_interpolation_color(in, outI, outF, x, y);
}
/*********************** Threaded image processing *************************/
Modified: trunk/blender/source/blender/makesdna/DNA_tracking_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_tracking_types.h 2012-12-11
14:18:37 UTC (rev 52875)
+++ trunk/blender/source/blender/makesdna/DNA_tracking_types.h 2012-12-11
14:19:41 UTC (rev 52876)
@@ -373,7 +373,7 @@
/* MovieTrackingStrabilization->filter */
enum {
- TRACKING_FILTER_NEAREAST = 0,
+ TRACKING_FILTER_NEAREST = 0,
TRACKING_FILTER_BILINEAR = 1,
TRACKING_FILTER_BICUBIC = 2
};
Modified: trunk/blender/source/blender/makesrna/intern/rna_tracking.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_tracking.c 2012-12-11
14:18:37 UTC (rev 52875)
+++ trunk/blender/source/blender/makesrna/intern/rna_tracking.c 2012-12-11
14:19:41 UTC (rev 52876)
@@ -1161,7 +1161,7 @@
PropertyRNA *prop;
static EnumPropertyItem filter_items[] = {
- {TRACKING_FILTER_NEAREAST, "NEAREST", 0, "Nearest", ""},
+ {TRACKING_FILTER_NEAREST, "NEAREST", 0, "Nearest", ""},
{TRACKING_FILTER_BILINEAR, "BILINEAR", 0, "Bilinear", ""},
{TRACKING_FILTER_BICUBIC, "BICUBIC", 0, "Bicubic", ""},
{0, NULL, 0, NULL, NULL}
Modified:
trunk/blender/source/blender/nodes/composite/nodes/node_composite_rotate.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/nodes/node_composite_rotate.c
2012-12-11 14:18:37 UTC (rev 52875)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_rotate.c
2012-12-11 14:19:41 UTC (rev 52876)
@@ -91,7 +91,7 @@
switch (node->custom1) {
case 0:
- neareast_interpolation(ibuf,
obuf, u, v, xo, yo);
+ nearest_interpolation(ibuf,
obuf, u, v, xo, yo);
break;
case 1:
bilinear_interpolation(ibuf,
obuf, u, v, xo, yo);
Modified:
trunk/blender/source/blender/nodes/composite/nodes/node_composite_transform.c
===================================================================
---
trunk/blender/source/blender/nodes/composite/nodes/node_composite_transform.c
2012-12-11 14:18:37 UTC (rev 52875)
+++
trunk/blender/source/blender/nodes/composite/nodes/node_composite_transform.c
2012-12-11 14:19:41 UTC (rev 52876)
@@ -93,7 +93,7 @@
switch (filter_type) {
case 0:
- neareast_interpolation(ibuf,
obuf, vec[0], vec[1], i, j);
+ nearest_interpolation(ibuf,
obuf, vec[0], vec[1], i, j);
break;
case 1:
bilinear_interpolation(ibuf,
obuf, vec[0], vec[1], i, j);
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
