first draft of error checking / reporting API

src/core/SkPath.cpp

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkPath.h"
 #include "SkBuffer.h"
 #include "SkMath.h"
 #include "SkPathRef.h"
 #include "SkRRect.h"
 #include "SkThread.h"
+#include "SkErrorInternals.h"

[scroggo, 2013/04/08 19:24:53]

Should be in alphabetical order.

[humper, 2013/04/08 19:43:23]

Done.

 
 ////////////////////////////////////////////////////////////////////////////
 
 #if SK_DEBUG_PATH_REF
 
 SkPath::PathRefDebugRef::PathRefDebugRef(SkPath* owner) : fOwner(owner) {}
 
 SkPath::PathRefDebugRef::PathRefDebugRef(SkPathRef* pr, SkPath* owner)
 : fPathRef(pr)
 , fOwner(owner) {
@@ skipping 1001 matching lines @@
         ++verbs;
     }
     return true;
 }
 
 #define CUBIC_ARC_FACTOR    ((SK_ScalarSqrt2 - SK_Scalar1) * 4 / 3)
 
 void SkPath::addRoundRect(const SkRect& rect, SkScalar rx, SkScalar ry,
                           Direction dir) {
     assert_known_direction(dir);
+    
+    if (rx < 0 || ry < 0) {
+        SkErrorInternals::SetError( kError_InvalidArgument, 
+                                    "I got %f and %f as radii to SkPath::AddRoundRect, "
+                                    "but negative radii are not allowed.", 
+                                    SkScalarToDouble(rx), SkScalarToDouble(ry) );
+        return;
+    }
 
     SkScalar    w = rect.width();
     SkScalar    halfW = SkScalarHalf(w);
     SkScalar    h = rect.height();
     SkScalar    halfH = SkScalarHalf(h);
 
     if (halfW <= 0 || halfH <= 0) {
         return;
     }
 
@@ skipping 1904 matching lines @@
     switch (this->getFillType()) {
         case SkPath::kEvenOdd_FillType:
         case SkPath::kInverseEvenOdd_FillType:
             w &= 1;
             break;
         default:
             break;
     }
     return SkToBool(w);
 }