Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKen Hughes <khughes@pacific.edu>2007-10-27 00:04:04 +0400
committerKen Hughes <khughes@pacific.edu>2007-10-27 00:04:04 +0400
commit38e7c267a6b02c144b9912eb916cb5631cd9a4a9 (patch)
tree354bbc61082b3b4a5b5e2b67a111ff6fbdc2d0d0 /source/blender/nodes/intern/CMP_util.c
parent135b16662d499c251bd4b3cf0c048f49778090a8 (diff)
Replace ceilf()/floorf() with ceil()/floor() to fix VC7 compilation problems
reported by Stephane Soppera.
Diffstat (limited to 'source/blender/nodes/intern/CMP_util.c')
-rw-r--r--source/blender/nodes/intern/CMP_util.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/nodes/intern/CMP_util.c b/source/blender/nodes/intern/CMP_util.c
index b6b73221384..eee33e33ff5 100644
--- a/source/blender/nodes/intern/CMP_util.c
+++ b/source/blender/nodes/intern/CMP_util.c
@@ -962,7 +962,7 @@ void qd_multPixel(CompBuf* src, int x, int y, float f)
// bilinear interpolation with wraparound
void qd_getPixelLerpWrap(CompBuf* src, float u, float v, float* col)
{
- const float ufl = floorf(u), vfl = floorf(v);
+ const float ufl = floor(u), vfl = floor(v);
const int nx = (int)ufl % src->x, ny = (int)vfl % src->y;
const int x1 = (nx < 0) ? (nx + src->x) : nx;
const int y1 = (ny < 0) ? (ny + src->y) : ny;
@@ -984,9 +984,9 @@ void qd_getPixelLerpWrap(CompBuf* src, float u, float v, float* col)
// as above, without wrap around
void qd_getPixelLerp(CompBuf* src, float u, float v, float* col)
{
- const float ufl = floorf(u), vfl = floorf(v);
+ const float ufl = floor(u), vfl = floor(v);
const int x1 = (int)ufl, y1 = (int)vfl;
- const int x2 = (int)ceilf(u), y2 = (int)ceilf(v);
+ const int x2 = (int)ceil(u), y2 = (int)ceil(v);
if ((x2 >= 0) && (y2 >= 0) && (x1 < src->x) && (y1 < src->y)) {
const float B[4] = {0,0,0,0};
const int ox1 = (x1 < 0), oy1 = (y1 < 0), ox2 = (x2 >= src->x), oy2 = (y2 >= src->y);
@@ -1009,9 +1009,9 @@ void qd_getPixelLerp(CompBuf* src, float u, float v, float* col)
// as above, sampling only one channel
void qd_getPixelLerpChan(CompBuf* src, float u, float v, int chan, float* out)
{
- const float ufl = floorf(u), vfl = floorf(v);
+ const float ufl = floor(u), vfl = floor(v);
const int x1 = (int)ufl, y1 = (int)vfl;
- const int x2 = (int)ceilf(u), y2 = (int)ceilf(v);
+ const int x2 = (int)ceil(u), y2 = (int)ceil(v);
if (chan >= src->type) chan = 0;
if ((x2 >= 0) && (y2 >= 0) && (x1 < src->x) && (y1 < src->y)) {
const float B[4] = {0,0,0,0};