include/effects/SkTestImageFilters.h - Issue 25430005: Fix for potential typedef issue

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: include/effects/SkTestImageFilters.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

OLD	NEW
1 #ifndef _SkTestImageFilters_h	1 #ifndef _SkTestImageFilters_h

2 #define _SkTestImageFilters_h	2 #define _SkTestImageFilters_h

3	3

4 #include "SkImageFilter.h"	4 #include "SkImageFilter.h"

5 #include "SkPoint.h"	5 #include "SkPoint.h"

6	6

7 // Fun mode that scales down (only) and then scales back up to look pixelated	7 // Fun mode that scales down (only) and then scales back up to look pixelated

8 class SK_API SkDownSampleImageFilter : public SkImageFilter {	8 class SK_API SkDownSampleImageFilter : public SkImageFilter {

	9 typedef SkImageFilter INHERITED;

	10

9 public:	11 public:

10 SkDownSampleImageFilter(SkScalar scale) : INHERITED(0), fScale(scale) {}	12 SkDownSampleImageFilter(SkScalar scale) : INHERITED(0), fScale(scale) {}

11	13

12 SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkDownSampleImageFilter)	14 SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkDownSampleImageFilter)

13	15

14 protected:	16 protected:

15 SkDownSampleImageFilter(SkFlattenableReadBuffer& buffer);	17 SkDownSampleImageFilter(SkFlattenableReadBuffer& buffer);

16 virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE;	18 virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE;

17	19

18 virtual bool onFilterImage(Proxy*, const SkBitmap& src, const SkMatrix&,	20 virtual bool onFilterImage(Proxy*, const SkBitmap& src, const SkMatrix&,

19 SkBitmap* result, SkIPoint* loc) SK_OVERRIDE;	21 SkBitmap* result, SkIPoint* loc) SK_OVERRIDE;

20	22

21 private:	23 private:

22 SkScalar fScale;	24 SkScalar fScale;

23

24 typedef SkImageFilter INHERITED;

25 };	25 };

26	26

27 #endif	27 #endif

OLD	NEW

« no previous file with comments | « include/effects/SkTableMaskFilter.h ('k') | include/effects/SkTransparentShader.h » ('j') | no next file with comments »