commit a44ea515e728ccf28ad29ed046fc71943a27238e
author reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Jul 27 18:24:25 2011 +0000
committer reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Jul 27 18:24:25 2011 +0000
tree d55ee4ea03a2039e5d691d82cfed3b7ad592d7f9
parent ceff2870bc5e9114c2b5262423b13cf1e84a76fb

use SkConvertQuadToCubic()



git-svn-id: http://skia.googlecode.com/svn/trunk@1973 2bbb7eff-a529-9590-31e7-b0007b416f81

src/pdf/SkPDFUtils.cpp

diff --git a/src/pdf/SkPDFUtils.cpp b/src/pdf/SkPDFUtils.cpp
index 56271bc..a75038c 100644
--- a/src/pdf/SkPDFUtils.cpp
+++ b/src/pdf/SkPDFUtils.cpp
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#include "SkGeometry.h"
 #include "SkPaint.h"
 #include "SkPath.h"
 #include "SkPDFUtils.h"
@@ -119,15 +120,10 @@
                 AppendLine(args[1].fX, args[1].fY, content);
                 break;
             case SkPath::kQuad_Verb: {
-                // Convert quad to cubic (degree elevation). http://goo.gl/vS4i
-                const SkScalar three = SkIntToScalar(3);
-                args[1].scale(SkIntToScalar(2));
-                SkScalar ctl1X = SkScalarDiv(args[0].fX + args[1].fX, three);
-                SkScalar ctl1Y = SkScalarDiv(args[0].fY + args[1].fY, three);
-                SkScalar ctl2X = SkScalarDiv(args[2].fX + args[1].fX, three);
-                SkScalar ctl2Y = SkScalarDiv(args[2].fY + args[1].fY, three);
-                AppendCubic(ctl1X, ctl1Y, ctl2X, ctl2Y, args[2].fX, args[2].fY,
-                            content);
+                SkPoint cubic[4];
+                SkConvertQuadToCubic(args, cubic);
+                AppendCubic(cubic[1].fX, cubic[1].fY, cubic[2].fX, cubic[2].fY,
+                            cubic[3].fX, cubic[3].fY, content);
                 break;
             }
             case SkPath::kCubic_Verb: