aboutsummaryrefslogtreecommitdiffhomepage
path: root/experimental
diff options
context:
space:
mode:
authorGravatar jvanverth@google.com <jvanverth@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-12-18 14:41:18 +0000
committerGravatar jvanverth@google.com <jvanverth@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-12-18 14:41:18 +0000
commit77734b890de4299861d29b7d3b509b4f3e199b58 (patch)
tree564caba564dacbe72563fc137697e38da18fe081 /experimental
parent24b4f97d00988efefb856abdbd4357cafdc36c86 (diff)
Fix compile error on Windows -- remove unsupported branch hint.
git-svn-id: http://skia.googlecode.com/svn/trunk@6875 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'experimental')
-rw-r--r--experimental/AndroidPathRenderer/AndroidPathRenderer.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/experimental/AndroidPathRenderer/AndroidPathRenderer.cpp b/experimental/AndroidPathRenderer/AndroidPathRenderer.cpp
index ef4ade24bf..5d927e1006 100644
--- a/experimental/AndroidPathRenderer/AndroidPathRenderer.cpp
+++ b/experimental/AndroidPathRenderer/AndroidPathRenderer.cpp
@@ -32,8 +32,6 @@
#include "AndroidPathRenderer.h"
#include "Vertex.h"
-#include "cutils/compiler.h"
-
namespace android {
namespace uirenderer {
@@ -49,7 +47,7 @@ SkRect PathRenderer::ComputePathBounds(const SkPath& path, const SkPaint* paint)
}
void computeInverseScales(const SkMatrix* transform, float &inverseScaleX, float& inverseScaleY) {
- if (CC_UNLIKELY(transform && transform->getType() & (SkMatrix::kScale_Mask|SkMatrix::kAffine_Mask|SkMatrix::kPerspective_Mask))) {
+ if (transform && transform->getType() & (SkMatrix::kScale_Mask|SkMatrix::kAffine_Mask|SkMatrix::kPerspective_Mask)) {
float m00 = transform->getScaleX();
float m01 = transform->getSkewY();
float m10 = transform->getSkewX();