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

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

Issue 768183002: Revert of Remove SK_SUPPORT_LEGACY_DEEPFLATTENING. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 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
« no previous file with comments | « src/effects/SkMagnifierImageFilter.cpp ('k') | src/effects/SkMatrixImageFilter.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 } 69 }
70 if ((kernelOffset.fX < 0) || (kernelOffset.fX >= kernelSize.fWidth) || 70 if ((kernelOffset.fX < 0) || (kernelOffset.fX >= kernelSize.fWidth) ||
71 (kernelOffset.fY < 0) || (kernelOffset.fY >= kernelSize.fHeight)) { 71 (kernelOffset.fY < 0) || (kernelOffset.fY >= kernelSize.fHeight)) {
72 return NULL; 72 return NULL;
73 } 73 }
74 return SkNEW_ARGS(SkMatrixConvolutionImageFilter, (kernelSize, kernel, gain, bias, 74 return SkNEW_ARGS(SkMatrixConvolutionImageFilter, (kernelSize, kernel, gain, bias,
75 kernelOffset, tileMode, c onvolveAlpha, 75 kernelOffset, tileMode, c onvolveAlpha,
76 input, cropRect, uniqueID )); 76 input, cropRect, uniqueID ));
77 } 77 }
78 78
79 #ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING
80 static bool tile_mode_is_valid(SkMatrixConvolutionImageFilter::TileMode tileMode ) {
81 switch (tileMode) {
82 case SkMatrixConvolutionImageFilter::kClamp_TileMode:
83 case SkMatrixConvolutionImageFilter::kRepeat_TileMode:
84 case SkMatrixConvolutionImageFilter::kClampToBlack_TileMode:
85 return true;
86 default:
87 break;
88 }
89 return false;
90 }
91
92 SkMatrixConvolutionImageFilter::SkMatrixConvolutionImageFilter(SkReadBuffer& buf fer)
93 : INHERITED(1, buffer) {
94 fKernelSize.fWidth = buffer.readInt();
95 fKernelSize.fHeight = buffer.readInt();
96 if ((fKernelSize.fWidth >= 1) && (fKernelSize.fHeight >= 1) &&
97 // Make sure size won't be larger than a signed int,
98 // which would still be extremely large for a kernel,
99 // but we don't impose a hard limit for kernel size
100 (gMaxKernelSize / fKernelSize.fWidth >= fKernelSize.fHeight)) {
101 size_t size = fKernelSize.fWidth * fKernelSize.fHeight;
102 fKernel = SkNEW_ARRAY(SkScalar, size);
103 SkDEBUGCODE(bool success =) buffer.readScalarArray(fKernel, size);
104 SkASSERT(success);
105 } else {
106 fKernel = 0;
107 }
108 fGain = buffer.readScalar();
109 fBias = buffer.readScalar();
110 fKernelOffset.fX = buffer.readInt();
111 fKernelOffset.fY = buffer.readInt();
112 fTileMode = (TileMode) buffer.readInt();
113 fConvolveAlpha = buffer.readBool();
114 buffer.validate((fKernel != 0) &&
115 SkScalarIsFinite(fGain) &&
116 SkScalarIsFinite(fBias) &&
117 tile_mode_is_valid(fTileMode) &&
118 (fKernelOffset.fX >= 0) && (fKernelOffset.fX < fKernelSize.f Width) &&
119 (fKernelOffset.fY >= 0) && (fKernelOffset.fY < fKernelSize.f Height));
120 }
121 #endif
122
79 SkFlattenable* SkMatrixConvolutionImageFilter::CreateProc(SkReadBuffer& buffer) { 123 SkFlattenable* SkMatrixConvolutionImageFilter::CreateProc(SkReadBuffer& buffer) {
80 SK_IMAGEFILTER_UNFLATTEN_COMMON(common, 1); 124 SK_IMAGEFILTER_UNFLATTEN_COMMON(common, 1);
81 SkISize kernelSize; 125 SkISize kernelSize;
82 kernelSize.fWidth = buffer.readInt(); 126 kernelSize.fWidth = buffer.readInt();
83 kernelSize.fHeight = buffer.readInt(); 127 kernelSize.fHeight = buffer.readInt();
84 const int count = buffer.getArrayCount(); 128 const int count = buffer.getArrayCount();
85 129
86 const int64_t kernelArea = sk_64_mul(kernelSize.width(), kernelSize.height() ); 130 const int64_t kernelArea = sk_64_mul(kernelSize.width(), kernelSize.height() );
87 if (!buffer.validate(kernelArea == count)) { 131 if (!buffer.validate(kernelArea == count)) {
88 return NULL; 132 return NULL;
(...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after
362 fKernelSize, 406 fKernelSize,
363 fKernel, 407 fKernel,
364 fGain, 408 fGain,
365 fBias, 409 fBias,
366 fKernelOffset, 410 fKernelOffset,
367 convert_tilemodes(fTileMode), 411 convert_tilemodes(fTileMode),
368 fConvolveAlpha); 412 fConvolveAlpha);
369 return true; 413 return true;
370 } 414 }
371 #endif 415 #endif
OLDNEW
« no previous file with comments | « src/effects/SkMagnifierImageFilter.cpp ('k') | src/effects/SkMatrixImageFilter.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698