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

Side by Side Diff: include/effects/SkBicubicImageFilter.h

Issue 25430005: Fix for potential typedef issue Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 7 years, 2 months 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
« no previous file with comments | « include/effects/SkAvoidXfermode.h ('k') | include/effects/SkBitmapSource.h » ('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 2013 The Android Open Source Project 2 * Copyright 2013 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 #ifndef SkBicubicImageFilter_DEFINED 8 #ifndef SkBicubicImageFilter_DEFINED
9 #define SkBicubicImageFilter_DEFINED 9 #define SkBicubicImageFilter_DEFINED
10 10
11 #include "SkImageFilter.h" 11 #include "SkImageFilter.h"
12 #include "SkScalar.h" 12 #include "SkScalar.h"
13 #include "SkSize.h" 13 #include "SkSize.h"
14 #include "SkPoint.h" 14 #include "SkPoint.h"
15 15
16 /*! \class SkBicubicImageFilter 16 /*! \class SkBicubicImageFilter
17 Bicubic resampling image filter. This filter does a 16-tap bicubic 17 Bicubic resampling image filter. This filter does a 16-tap bicubic
18 filter using the given matrix. 18 filter using the given matrix.
19 */ 19 */
20 20
21 class SK_API SkBicubicImageFilter : public SkImageFilter { 21 class SK_API SkBicubicImageFilter : public SkImageFilter {
22 typedef SkImageFilter INHERITED;
23
22 public: 24 public:
23 /** Construct a (scaling-only) bicubic resampling image filter. 25 /** Construct a (scaling-only) bicubic resampling image filter.
24 @param scale How much to scale the image. 26 @param scale How much to scale the image.
25 @param coefficients The 16 coefficients of the bicubic matrix. 27 @param coefficients The 16 coefficients of the bicubic matrix.
26 @param input The input image filter. If NULL, the src bitmap 28 @param input The input image filter. If NULL, the src bitmap
27 passed to filterImage() is used instead. 29 passed to filterImage() is used instead.
28 */ 30 */
29 31
30 SkBicubicImageFilter(const SkSize& scale, const SkScalar coefficients[16], 32 SkBicubicImageFilter(const SkSize& scale, const SkScalar coefficients[16],
31 SkImageFilter* input = NULL); 33 SkImageFilter* input = NULL);
(...skipping 11 matching lines...) Expand all
43 45
44 #if SK_SUPPORT_GPU 46 #if SK_SUPPORT_GPU
45 virtual bool canFilterImageGPU() const SK_OVERRIDE { return true; } 47 virtual bool canFilterImageGPU() const SK_OVERRIDE { return true; }
46 virtual bool filterImageGPU(Proxy* proxy, const SkBitmap& src, const SkMatri x& ctm, 48 virtual bool filterImageGPU(Proxy* proxy, const SkBitmap& src, const SkMatri x& ctm,
47 SkBitmap* result, SkIPoint* offset) SK_OVERRIDE; 49 SkBitmap* result, SkIPoint* offset) SK_OVERRIDE;
48 #endif 50 #endif
49 51
50 private: 52 private:
51 SkSize fScale; 53 SkSize fScale;
52 SkScalar fCoefficients[16]; 54 SkScalar fCoefficients[16];
53 typedef SkImageFilter INHERITED;
54 }; 55 };
55 56
56 #endif 57 #endif
OLDNEW
« no previous file with comments | « include/effects/SkAvoidXfermode.h ('k') | include/effects/SkBitmapSource.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698