Adding size parameter to read array functions

src/effects/SkEmbossMaskFilter.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 "SkEmbossMaskFilter.h"
@@ skipping 114 matching lines @@
 
     // restore original alpha
     memcpy(dst->fImage, src.fImage, src.computeImageSize());
 
     return true;
 }
 
 SkEmbossMaskFilter::SkEmbossMaskFilter(SkFlattenableReadBuffer& buffer)
         : SkMaskFilter(buffer) {
     SkASSERT(buffer.getArrayCount() == sizeof(Light));
-    buffer.readByteArray(&fLight);
+    buffer.readByteArray(&fLight, sizeof(Light));

[Stephen White, 2013/10/30 20:33:20]

Shouldn't we be calling validate() on the result? Or is that now handled
internally?

[sugoi1, 2013/10/31 14:16:24]

Yeah, this is done internally. If false is returned, an error is already set
inside SkValidatingReadBuffer.

     SkASSERT(fLight.fPad == 0); // for the font-cache lookup to be clean
     fBlurSigma = buffer.readScalar();
 #ifndef DELETE_THIS_CODE_WHEN_SKPS_ARE_REBUILT_AT_V13_AND_ALL_OTHER_INSTANCES_TOO
     // Fixing this must be done in two stages. When the skps are recaptured in V13,
     // remove the ConvertRadiusToSigma but retain the absolute value.
     // At the same time, switch the code in flatten to write a positive value.
     // When the skps are captured in V14 the absolute value can be removed.
     if (fBlurSigma > 0) {
         fBlurSigma = SkBlurMask::ConvertRadiusToSigma(fBlurSigma);
     } else {
@@ skipping 24 matching lines @@
     str->append(") ");
 
     str->appendf("ambient: %d specular: %d ",
         fLight.fAmbient, fLight.fSpecular);
 
     str->append("blurSigma: ");
     str->appendScalar(fBlurSigma);
     str->append(")");
 }
 #endif