diff options
author | 2015-08-14 22:02:19 +0000 | |
---|---|---|
committer | 2015-08-14 22:02:19 +0000 | |
commit | e3f0a881c20072a644317330ecf7409c81e96888 (patch) | |
tree | f8bb8057903a065947d053d519d9abfa76cfd362 | |
parent | 4a2a890b32a1e8c3ffeea82b3c12f707b5a9b8f4 (diff) | |
parent | 8d9b5fbdf0a005941b7f0019102cc7b94a41a2d6 (diff) |
Merge "Make the value for shadowRadius less than 1.0 work"
-rw-r--r-- | libs/hwui/FontRenderer.cpp | 2 | ||||
-rw-r--r-- | libs/hwui/utils/Blur.cpp | 16 | ||||
-rw-r--r-- | libs/hwui/utils/Blur.h | 2 |
3 files changed, 11 insertions, 9 deletions
diff --git a/libs/hwui/FontRenderer.cpp b/libs/hwui/FontRenderer.cpp index c1b50c108c2f..bc75daba44c0 100644 --- a/libs/hwui/FontRenderer.cpp +++ b/libs/hwui/FontRenderer.cpp @@ -773,7 +773,7 @@ void FontRenderer::blurImage(uint8_t** image, int32_t width, int32_t height, flo #endif float *gaussian = new float[2 * intRadius + 1]; - Blur::generateGaussianWeights(gaussian, intRadius); + Blur::generateGaussianWeights(gaussian, radius); uint8_t* scratch = new uint8_t[width * height]; Blur::horizontal(gaussian, intRadius, *image, scratch, width, height); diff --git a/libs/hwui/utils/Blur.cpp b/libs/hwui/utils/Blur.cpp index 877a42216c27..e66cecccd284 100644 --- a/libs/hwui/utils/Blur.cpp +++ b/libs/hwui/utils/Blur.cpp @@ -60,7 +60,9 @@ static float legacyConvertRadiusToSigma(float radius) { return radius > 0 ? 0.3f * radius + 0.6f : 0.0f; } -void Blur::generateGaussianWeights(float* weights, int32_t radius) { +void Blur::generateGaussianWeights(float* weights, float radius) { + int32_t intRadius = convertRadiusToInt(radius); + // Compute gaussian weights for the blur // e is the euler's number static float e = 2.718281828459045f; @@ -68,7 +70,7 @@ void Blur::generateGaussianWeights(float* weights, int32_t radius) { // g(x) = ( 1 / sqrt( 2 * pi ) * sigma) * e ^ ( -x^2 / 2 * sigma^2 ) // x is of the form [-radius .. 0 .. radius] // and sigma varies with radius. - float sigma = legacyConvertRadiusToSigma((float) radius); + float sigma = legacyConvertRadiusToSigma(radius); // Now compute the coefficints // We will store some redundant values to save some math during @@ -78,16 +80,16 @@ void Blur::generateGaussianWeights(float* weights, int32_t radius) { float coeff2 = - 1.0f / (2.0f * sigma * sigma); float normalizeFactor = 0.0f; - for (int32_t r = -radius; r <= radius; r ++) { + for (int32_t r = -intRadius; r <= intRadius; r ++) { float floatR = (float) r; - weights[r + radius] = coeff1 * pow(e, floatR * floatR * coeff2); - normalizeFactor += weights[r + radius]; + weights[r + intRadius] = coeff1 * pow(e, floatR * floatR * coeff2); + normalizeFactor += weights[r + intRadius]; } //Now we need to normalize the weights because all our coefficients need to add up to one normalizeFactor = 1.0f / normalizeFactor; - for (int32_t r = -radius; r <= radius; r ++) { - weights[r + radius] *= normalizeFactor; + for (int32_t r = -intRadius; r <= intRadius; r ++) { + weights[r + intRadius] *= normalizeFactor; } } diff --git a/libs/hwui/utils/Blur.h b/libs/hwui/utils/Blur.h index b14533312719..3f21832bf2b5 100644 --- a/libs/hwui/utils/Blur.h +++ b/libs/hwui/utils/Blur.h @@ -34,7 +34,7 @@ public: // accounts for that error and snaps to the appropriate integer boundary. static uint32_t convertRadiusToInt(float radius); - static void generateGaussianWeights(float* weights, int32_t radius); + static void generateGaussianWeights(float* weights, float radius); static void horizontal(float* weights, int32_t radius, const uint8_t* source, uint8_t* dest, int32_t width, int32_t height); static void vertical(float* weights, int32_t radius, const uint8_t* source, |