diff options
| author |  robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-03-28 16:19:11 +0000 |
|---|---|---|
| committer | robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-03-28 16:19:11 +0000 |
| commit | d3b9fbbc48c13a1b2a664cf7e01374a44c201f51 (patch) | |
| tree | f4f1ade2e1ce0953eeb0551c96603e51bfdd08e2 /third_party | |
| parent | 42aea289cbf801997b653a906a37a7f7e948b645 (diff) | |
Code changes for ANGLE GL interface. .gyp file changes will be delivered later.
http://codereview.appspot.com/5940046/
git-svn-id: http://skia.googlecode.com/svn/trunk@3519 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/glu/README.skia | 3 | ||||
| -rw-r--r-- | third_party/glu/libtess/sweep.c | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/third_party/glu/README.skia b/third_party/glu/README.skia index 0b6b624dd5..a6b10d9240 100644 --- a/third_party/glu/README.skia +++ b/third_party/glu/README.skia @@ -39,3 +39,6 @@ The following changes were made in order to incorporate this code: - rename all __gl_ functions to Sk__gl_ to avoid conflicting with other static linkers of this library. + + - In sweep.c, added explicit cast to GLfloat in VertexWeights() to silence + compiler complaint diff --git a/third_party/glu/libtess/sweep.c b/third_party/glu/libtess/sweep.c index 6fe8a478f5..635a08c194 100644 --- a/third_party/glu/libtess/sweep.c +++ b/third_party/glu/libtess/sweep.c @@ -465,8 +465,8 @@ static void VertexWeights( GLUvertex *isect, GLUvertex *org, GLUvertex *dst, GLdouble t1 = VertL1dist( org, isect ); GLdouble t2 = VertL1dist( dst, isect ); - weights[0] = 0.5 * t2 / (t1 + t2); - weights[1] = 0.5 * t1 / (t1 + t2); + weights[0] = (GLfloat)(0.5 * t2 / (t1 + t2)); + weights[1] = (GLfloat)(0.5 * t1 / (t1 + t2)); isect->coords[0] += weights[0]*org->coords[0] + weights[1]*dst->coords[0]; isect->coords[1] += weights[0]*org->coords[1] + weights[1]*dst->coords[1]; isect->coords[2] += weights[0]*org->coords[2] + weights[1]*dst->coords[2]; |