AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix vs2015 build

Browse Source 
TBR=robertphillips@google.com

Review URL: https://codereview.chromium.org/1344203002
This commit is contained in:
bsalomon 2015-09-15 14:41:15 -07:00 committed by Commit bot
parent 0a5fa484fd
commit 0d705a4873
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/effects/GrCircleBlurFragmentProcessor.cpp
View File

@ -112,7 +112,7 @@ static inline float disk(float x, float y, float radius) {
} else if (distSq >= (radius+0.5f)*(radius+0.5f)) { } else if (distSq >= (radius+0.5f)*(radius+0.5f)) {
return 0.0f; return 0.0f;
} else { } else {
float ramp = radius + 0.5f - sqrt(distSq); float ramp = radius + 0.5f - sqrtf(distSq);
SkASSERT(ramp >= 0.0f && ramp <= 1.0f); SkASSERT(ramp >= 0.0f && ramp <= 1.0f);
return ramp; return ramp;
} }
@ -134,7 +134,7 @@ static void make_half_kernel(float* kernel, int kernelWH, float sigma) {
float x2 = (x-kernelOff) * (x-kernelOff); float x2 = (x-kernelOff) * (x-kernelOff);
float y2 = (y-kernelOff) * (y-kernelOff); float y2 = (y-kernelOff) * (y-kernelOff);
// The kernel is symmetric so only compute it once for both sides // The kernel is symmetric so only compute it once for both sides
kernel[y*kernelWH+(kernelWH-x-1)] = kernel[y*kernelWH+x] = exp(-(x2 + y2) * b); kernel[y*kernelWH+(kernelWH-x-1)] = kernel[y*kernelWH+x] = expf(-(x2 + y2) * b);
tot += 2.0f * kernel[y*kernelWH+x]; tot += 2.0f * kernel[y*kernelWH+x];
} }
} }