aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--include/core/SkRRect.h8
-rw-r--r--src/core/SkRRect.cpp3
2 files changed, 3 insertions, 8 deletions
diff --git a/include/core/SkRRect.h b/include/core/SkRRect.h
index 66c1ee24da..1b52da965c 100644
--- a/include/core/SkRRect.h
+++ b/include/core/SkRRect.h
@@ -55,6 +55,9 @@ public:
* by type(). The subtypes become progressively less restrictive.
*/
enum Type {
+ // !< Internal indicator that the sub type must be computed.
+ kUnknown_Type = -1,
+
// !< The RR is empty
kEmpty_Type,
@@ -197,11 +200,6 @@ public:
SkDEBUGCODE(void validate() const;)
private:
- enum {
- //!< Internal indicator that the sub type must be computed.
- kUnknown_Type = -1
- };
-
SkRect fRect;
// Radii order is UL, UR, LR, LL. Use Corner enum to index into fRadii[]
SkVector fRadii[4];
diff --git a/src/core/SkRRect.cpp b/src/core/SkRRect.cpp
index db1c7dd965..5740a19c82 100644
--- a/src/core/SkRRect.cpp
+++ b/src/core/SkRRect.cpp
@@ -276,12 +276,9 @@ void SkRRect::validate() const {
SkASSERT(!fRect.isEmpty());
SkASSERT(!allRadiiZero && !allRadiiSame && !allCornersSquare);
break;
-#if 0
- // error: case value not in enumerated type 'SkRRect::Type
case kUnknown_Type:
// no limits on this
break;
-#endif
}
}
#endif // SK_DEBUG