Fix build error when building Android in Release mode with -O2.

src/pdf/SkPDFShader.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkPDFShader.h"
@@ skipping 25 matching lines @@
     SkScalar    inv = mag ? SkScalarInvert(mag) : 0;
 
     vec.scale(inv);
     matrix->setSinCos(vec.fY, vec.fX);
     matrix->preTranslate(pts[0].fX, pts[0].fY);
     matrix->preScale(mag, mag);
 }
 
 /* Assumes t + startOffset is on the stack and does a linear interpolation on t
    between startOffset and endOffset from prevColor to curColor (for each color
-   component), leaving the result in component order on the stack.
+   component), leaving the result in component order on the stack. It assumes
+   there are always 3 components per color.
    @param range                  endOffset - startOffset
    @param curColor[components]   The current color components.
    @param prevColor[components]  The previous color components.
    @param result                 The result ps function.
  */
 static void interpolateColorCode(SkScalar range, SkScalar* curColor,
-                                 SkScalar* prevColor, int components,
-                                 SkString* result) {
+                                 SkScalar* prevColor, SkString* result) {
+    static const int kColorComponents = 3;
+
     // Figure out how to scale each color component.
-    SkAutoSTMalloc<4, SkScalar> multiplierAlloc(components);
-    SkScalar *multiplier = multiplierAlloc.get();
-    for (int i = 0; i < components; i++) {
+    SkScalar multiplier[kColorComponents];
+    for (int i = 0; i < kColorComponents; i++) {
         multiplier[i] = SkScalarDiv(curColor[i] - prevColor[i], range);
     }
 
     // Calculate when we no longer need to keep a copy of the input parameter t.
     // If the last component to use t is i, then dupInput[0..i - 1] = true
     // and dupInput[i .. components] = false.
-    SkAutoSTMalloc<4, bool> dupInputAlloc(components);
-    bool *dupInput = dupInputAlloc.get();
-    dupInput[components - 1] = false;
-    for (int i = components - 2; i >= 0; i--) {
+    bool dupInput[kColorComponents];
+    dupInput[kColorComponents - 1] = false;
+    for (int i = kColorComponents - 2; i >= 0; i--) {
         dupInput[i] = dupInput[i + 1] || multiplier[i + 1] != 0;
     }
 
     if (!dupInput[0] && multiplier[0] == 0) {
         result->append("pop ");
     }
 
-    for (int i = 0; i < components; i++) {
+    for (int i = 0; i < kColorComponents; i++) {
         // If the next components needs t and this component will consume a
         // copy, make another copy.
         if (dupInput[i] && multiplier[i] != 0) {
             result->append("dup ");
         }
 
         if (multiplier[i] == 0) {
             result->appendScalar(prevColor[i]);
             result->append(" ");
         } else {
@@ skipping 65 matching lines @@
     for (int i = 1 ; i < info.fColorCount; i++) {
         result->append("{dup ");
         result->appendScalar(info.fColorOffsets[i]);
         result->append(" le {");
         if (info.fColorOffsets[i - 1] != 0) {
             result->appendScalar(info.fColorOffsets[i - 1]);
             result->append(" sub\n");
         }
 
         interpolateColorCode(info.fColorOffsets[i] - info.fColorOffsets[i - 1],
-                             colorData[i], colorData[i - 1], kColorComponents,
-                             result);
+                             colorData[i], colorData[i - 1], result);
         result->append("}\n");
     }
 
     // Clamp the final color.
     result->append("{pop ");
     result->appendScalar(colorData[info.fColorCount - 1][0]);
     result->append(" ");
     result->appendScalar(colorData[info.fColorCount - 1][1]);
     result->append(" ");
     result->appendScalar(colorData[info.fColorCount - 1][2]);
@@ skipping 781 matching lines @@
         fPixelGeneration = fImage.getGenerationID();
     } else {
         fColorData.set(sk_malloc_throw(
                     fInfo.fColorCount * (sizeof(SkColor) + sizeof(SkScalar))));
         fInfo.fColors = reinterpret_cast<SkColor*>(fColorData.get());
         fInfo.fColorOffsets =
             reinterpret_cast<SkScalar*>(fInfo.fColors + fInfo.fColorCount);
         shader.asAGradient(&fInfo);
     }
 }