diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-10-23 20:21:55 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-10-23 20:21:55 +0400 |
| commit | fec81d9b56075f46f6dde196ac85140872cff74e (patch) | |
| tree | 6ee12fcc0b04ba3041f1b7e4d17281136375beb1 /source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp | |
| parent | c623ba5e4b2aa68a5717ba17500c14217bc417aa (diff) | |
use min_ max_ functions in more places.
also fix minor error in MOD decimate when the modifier did nothing the reported face count would be wrong.
Diffstat (limited to 'source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp')
| -rw-r--r-- | source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp b/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp index 262252f7d8c..4bdb2591cb7 100644 --- a/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp +++ b/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp @@ -190,7 +190,7 @@ void FastGaussianBlurOperation::IIR_gauss(MemoryBuffer *src, float sigma, unsign } (void)0 // intermediate buffers - sz = MAX2(src_width, src_height); + sz = max(src_width, src_height); X = (double *)MEM_callocN(sz * sizeof(double), "IIR_gauss X buf"); Y = (double *)MEM_callocN(sz * sizeof(double), "IIR_gauss Y buf"); W = (double *)MEM_callocN(sz * sizeof(double), "IIR_gauss W buf"); |