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

Side by Side Diff: include/core/SkPaint.h

Issue 18942002: fix compile warnings (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: virtual destructor Created 7 years, 5 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/core/SkBitmap.h ('k') | src/core/SkBitmapFilter.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 2
3 /* 3 /*
4 * Copyright 2006 The Android Open Source Project 4 * Copyright 2006 The Android Open Source Project
5 * 5 *
6 * Use of this source code is governed by a BSD-style license that can be 6 * Use of this source code is governed by a BSD-style license that can be
7 * found in the LICENSE file. 7 * found in the LICENSE file.
8 */ 8 */
9 9
10 10
(...skipping 25 matching lines...) Expand all
36 struct SkPoint; 36 struct SkPoint;
37 class SkRasterizer; 37 class SkRasterizer;
38 class SkShader; 38 class SkShader;
39 class SkTypeface; 39 class SkTypeface;
40 40
41 typedef const SkGlyph& (*SkDrawCacheProc)(SkGlyphCache*, const char**, 41 typedef const SkGlyph& (*SkDrawCacheProc)(SkGlyphCache*, const char**,
42 SkFixed x, SkFixed y); 42 SkFixed x, SkFixed y);
43 43
44 typedef const SkGlyph& (*SkMeasureCacheProc)(SkGlyphCache*, const char**); 44 typedef const SkGlyph& (*SkMeasureCacheProc)(SkGlyphCache*, const char**);
45 45
46 #define kBicubicFilterBitmap_Flag kHighQualityFilterBitmap_Flag
47
46 /** \class SkPaint 48 /** \class SkPaint
47 49
48 The SkPaint class holds the style and color information about how to draw 50 The SkPaint class holds the style and color information about how to draw
49 geometries, text and bitmaps. 51 geometries, text and bitmaps.
50 */ 52 */
53
51 class SK_API SkPaint { 54 class SK_API SkPaint {
52 public: 55 public:
53 SkPaint(); 56 SkPaint();
54 SkPaint(const SkPaint& paint); 57 SkPaint(const SkPaint& paint);
55 ~SkPaint(); 58 ~SkPaint();
56 59
57 SkPaint& operator=(const SkPaint&); 60 SkPaint& operator=(const SkPaint&);
58 61
59 SK_API friend bool operator==(const SkPaint& a, const SkPaint& b); 62 SK_API friend bool operator==(const SkPaint& a, const SkPaint& b);
60 friend bool operator!=(const SkPaint& a, const SkPaint& b) { 63 friend bool operator!=(const SkPaint& a, const SkPaint& b) {
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 kStrikeThruText_Flag = 0x10, //!< mask to enable strike-thru text 104 kStrikeThruText_Flag = 0x10, //!< mask to enable strike-thru text
102 kFakeBoldText_Flag = 0x20, //!< mask to enable fake-bold text 105 kFakeBoldText_Flag = 0x20, //!< mask to enable fake-bold text
103 kLinearText_Flag = 0x40, //!< mask to enable linear-text 106 kLinearText_Flag = 0x40, //!< mask to enable linear-text
104 kSubpixelText_Flag = 0x80, //!< mask to enable subpixel text positi oning 107 kSubpixelText_Flag = 0x80, //!< mask to enable subpixel text positi oning
105 kDevKernText_Flag = 0x100, //!< mask to enable device kerning text 108 kDevKernText_Flag = 0x100, //!< mask to enable device kerning text
106 kLCDRenderText_Flag = 0x200, //!< mask to enable subpixel glyph rende rering 109 kLCDRenderText_Flag = 0x200, //!< mask to enable subpixel glyph rende rering
107 kEmbeddedBitmapText_Flag = 0x400, //!< mask to enable embedded bitmap st rikes 110 kEmbeddedBitmapText_Flag = 0x400, //!< mask to enable embedded bitmap st rikes
108 kAutoHinting_Flag = 0x800, //!< mask to force Freetype's autohinter 111 kAutoHinting_Flag = 0x800, //!< mask to force Freetype's autohinter
109 kVerticalText_Flag = 0x1000, 112 kVerticalText_Flag = 0x1000,
110 kGenA8FromLCD_Flag = 0x2000, // hack for GDI -- do not use if you can help it 113 kGenA8FromLCD_Flag = 0x2000, // hack for GDI -- do not use if you can help it
111 kBicubicFilterBitmap_Flag = 0x4000, // temporary flag 114 kHighQualityFilterBitmap_Flag = 0x4000, // temporary flag
112 kHighQualityDownsampleBitmap_Flag = 0x8000, // temporary flag 115 kHighQualityDownsampleBitmap_Flag = 0x8000, // temporary flag
113 116
114 // when adding extra flags, note that the fFlags member is specified 117 // when adding extra flags, note that the fFlags member is specified
115 // with a bit-width and you'll have to expand it. 118 // with a bit-width and you'll have to expand it.
116 119
117 kAllFlags = 0xFFFF 120 kAllFlags = 0xFFFF
118 }; 121 };
119 122
120 /** Return the paint's flags. Use the Flag enum to test flag values. 123 /** Return the paint's flags. Use the Flag enum to test flag values.
121 @return the paint's flags (see enums ending in _Flag for bit masks) 124 @return the paint's flags (see enums ending in _Flag for bit masks)
(...skipping 937 matching lines...) Expand 10 before | Expand all | Expand 10 after
1059 #ifdef SK_BUILD_FOR_ANDROID 1062 #ifdef SK_BUILD_FOR_ANDROID
1060 SkPaintOptionsAndroid fPaintOptionsAndroid; 1063 SkPaintOptionsAndroid fPaintOptionsAndroid;
1061 1064
1062 // In order for the == operator to work properly this must be the last field 1065 // In order for the == operator to work properly this must be the last field
1063 // in the struct so that we can do a memcmp to this field's offset. 1066 // in the struct so that we can do a memcmp to this field's offset.
1064 uint32_t fGenerationID; 1067 uint32_t fGenerationID;
1065 #endif 1068 #endif
1066 }; 1069 };
1067 1070
1068 #endif 1071 #endif
OLDNEW
« no previous file with comments | « include/core/SkBitmap.h ('k') | src/core/SkBitmapFilter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698