Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5)

Side by Side Diff: src/effects/SkMatrixConvolutionImageFilter.cpp

Issue 106943002: Fixed a few places where uninitialized memory could have been read (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright 2012 The Android Open Source Project 2 * Copyright 2012 The Android Open Source Project
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #include "SkMatrixConvolutionImageFilter.h" 8 #include "SkMatrixConvolutionImageFilter.h"
9 #include "SkBitmap.h" 9 #include "SkBitmap.h"
10 #include "SkColorPriv.h" 10 #include "SkColorPriv.h"
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 SkASSERT(success); 75 SkASSERT(success);
76 } else { 76 } else {
77 fKernel = 0; 77 fKernel = 0;
78 } 78 }
79 fGain = buffer.readScalar(); 79 fGain = buffer.readScalar();
80 fBias = buffer.readScalar(); 80 fBias = buffer.readScalar();
81 fTarget.fX = buffer.readInt(); 81 fTarget.fX = buffer.readInt();
82 fTarget.fY = buffer.readInt(); 82 fTarget.fY = buffer.readInt();
83 fTileMode = (TileMode) buffer.readInt(); 83 fTileMode = (TileMode) buffer.readInt();
84 fConvolveAlpha = buffer.readBool(); 84 fConvolveAlpha = buffer.readBool();
85 buffer.validate((fKernel != 0) && 85 buffer.validate(buffer.validate(true) &&
86 (fKernel != 0) &&
86 SkScalarIsFinite(fGain) && 87 SkScalarIsFinite(fGain) &&
87 SkScalarIsFinite(fBias) && 88 SkScalarIsFinite(fBias) &&
88 tile_mode_is_valid(fTileMode)); 89 tile_mode_is_valid(fTileMode));
89 } 90 }
90 91
91 void SkMatrixConvolutionImageFilter::flatten(SkFlattenableWriteBuffer& buffer) c onst { 92 void SkMatrixConvolutionImageFilter::flatten(SkFlattenableWriteBuffer& buffer) c onst {
92 this->INHERITED::flatten(buffer); 93 this->INHERITED::flatten(buffer);
93 buffer.writeInt(fKernelSize.fWidth); 94 buffer.writeInt(fKernelSize.fWidth);
94 buffer.writeInt(fKernelSize.fHeight); 95 buffer.writeInt(fKernelSize.fHeight);
95 buffer.writeScalarArray(fKernel, fKernelSize.fWidth * fKernelSize.fHeight); 96 buffer.writeScalarArray(fKernel, fKernelSize.fWidth * fKernelSize.fHeight);
(...skipping 564 matching lines...) Expand 10 before | Expand all | Expand 10 after
660 fBias, 661 fBias,
661 fTarget, 662 fTarget,
662 fTileMode, 663 fTileMode,
663 fConvolveAlpha); 664 fConvolveAlpha);
664 return true; 665 return true;
665 } 666 }
666 667
667 /////////////////////////////////////////////////////////////////////////////// 668 ///////////////////////////////////////////////////////////////////////////////
668 669
669 #endif 670 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698