Remove some now-unused #ifdefs.

src/effects/SkBlurMask.cpp

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkBlurMask.h"
@@ skipping 65 matching lines @@
                    int leftRadius, int rightRadius, int width, int height,
                    bool transpose)
 {
     int diameter = leftRadius + rightRadius;
     int kernelSize = diameter + 1;
     int border = SkMin32(width, diameter);
     uint32_t scale = (1 << 24) / kernelSize;
     int new_width = width + SkMax32(leftRadius, rightRadius) * 2;
     int dst_x_stride = transpose ? height : 1;
     int dst_y_stride = transpose ? 1 : new_width;
-#ifndef SK_DISABLE_BLUR_ROUNDING
     uint32_t half = 1 << 23;
-#else
-    uint32_t half = 0;
-#endif
     for (int y = 0; y < height; ++y) {
         uint32_t sum = 0;
         uint8_t* dptr = dst + y * dst_y_stride;
         const uint8_t* right = src + y * src_y_stride;
         const uint8_t* left = right;
         for (int x = 0; x < rightRadius - leftRadius; x++) {
             *dptr = 0;
             dptr += dst_x_stride;
         }
 #define LEFT_BORDER_ITER \
@@ skipping 182 matching lines @@
                          bool transpose, uint8_t outer_weight)
 {
     int diameter = radius * 2;
     int kernelSize = diameter + 1;
     int border = SkMin32(width, diameter);
     int inner_weight = 255 - outer_weight;
     outer_weight += outer_weight >> 7;
     inner_weight += inner_weight >> 7;
     uint32_t outer_scale = (outer_weight << 16) / kernelSize;
     uint32_t inner_scale = (inner_weight << 16) / (kernelSize - 2);
-#ifndef SK_DISABLE_BLUR_ROUNDING
     uint32_t half = 1 << 23;
-#else
-    uint32_t half = 0;
-#endif
     int new_width = width + diameter;
     int dst_x_stride = transpose ? height : 1;
     int dst_y_stride = transpose ? 1 : new_width;
     for (int y = 0; y < height; ++y) {
         uint32_t outer_sum = 0, inner_sum = 0;
         uint8_t* dptr = dst + y * dst_y_stride;
         const uint8_t* right = src + y * src_y_stride;
         const uint8_t* left = right;
         int x = 0;
 
@@ skipping 692 matching lines @@
         (void)autoCall.detach();
     }
 
     if (style == kInner_Style) {
         dst->fBounds = src.fBounds; // restore trimmed bounds
         dst->fRowBytes = src.fRowBytes;
     }
 
     return true;
 }