aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core
diff options
context:
space:
mode:
authorGravatar reed@android.com <reed@android.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2009-12-16 17:25:43 +0000
committerGravatar reed@android.com <reed@android.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2009-12-16 17:25:43 +0000
commit63debae4c1020fa1e0ccd92ef3cbfdc8735acf8e (patch)
tree6cf89738aab0e498c3e3184f9658d227d0c8ad85 /src/core
parent200645d50ec212a6dec305bac0b75f67e175cdf4 (diff)
initial checkin for visualstudio build support
git-svn-id: http://skia.googlecode.com/svn/trunk@460 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/core')
-rw-r--r--src/core/SkBlitter_RGB16.cpp4
-rw-r--r--src/core/SkEdge.cpp4
-rw-r--r--src/core/SkFloatBits.cpp5
-rw-r--r--src/core/SkPath.cpp2
4 files changed, 5 insertions, 10 deletions
diff --git a/src/core/SkBlitter_RGB16.cpp b/src/core/SkBlitter_RGB16.cpp
index 9bc7ecdb61..882866b2a2 100644
--- a/src/core/SkBlitter_RGB16.cpp
+++ b/src/core/SkBlitter_RGB16.cpp
@@ -292,8 +292,8 @@ void SkRGB16_Opaque_Blitter::blitH(int x, int y, int width) SK_RESTRICT {
}
// return 1 or 0 from a bool
-static int Bool2Int(bool value) {
- return !!value;
+static inline int Bool2Int(int value) {
+ return !!value;
}
void SkRGB16_Opaque_Blitter::blitAntiH(int x, int y,
diff --git a/src/core/SkEdge.cpp b/src/core/SkEdge.cpp
index 92c78c8264..80ba9e3520 100644
--- a/src/core/SkEdge.cpp
+++ b/src/core/SkEdge.cpp
@@ -287,7 +287,7 @@ int SkQuadraticEdge::updateQuadratic()
fQy = newy;
fQDx = dx;
fQDy = dy;
- fCurveCount = SkToS16(count);
+ fCurveCount = SkToS8(count);
return success;
}
@@ -465,7 +465,7 @@ int SkCubicEdge::updateCubic()
fCx = newx;
fCy = newy;
- fCurveCount = SkToS16(count);
+ fCurveCount = SkToS8(count);
return success;
}
diff --git a/src/core/SkFloatBits.cpp b/src/core/SkFloatBits.cpp
index 1f675ff1a9..e6c2976a3e 100644
--- a/src/core/SkFloatBits.cpp
+++ b/src/core/SkFloatBits.cpp
@@ -147,11 +147,6 @@ int32_t SkFloatBits_toIntCeil(int32_t packed) {
#ifdef SK_CAN_USE_FLOAT
-float SkFloatBits_intToFloatNative(int x);
-float SkFloatBits_intToFloatNative(int x) {
- return x;
-}
-
float SkIntToFloatCast(int32_t value) {
if (0 == value) {
return 0;
diff --git a/src/core/SkPath.cpp b/src/core/SkPath.cpp
index 55be129ba0..1c771072a2 100644
--- a/src/core/SkPath.cpp
+++ b/src/core/SkPath.cpp
@@ -64,7 +64,7 @@ private:
// returns true if we should proceed
void init(SkPath* path) {
fPath = path;
- fDirty = path->fBoundsIsDirty;
+ fDirty = SkToBool(path->fBoundsIsDirty);
fEmpty = path->isEmpty();
// Cannot use fRect for our bounds unless we know it is sorted
fRect.sort();