xiaoyan159/vtm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix NPE in PathOverlay

Browse Source
This commit is contained in:
Hannes Janetzek 2013-06-06 12:01:10 +02:00
parent 47f4a3d97f
commit 004ad338ae
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/org/oscim/layers/overlay/PathOverlay.java
View File

@ -48,11 +48,10 @@ public class PathOverlay extends Layer {
private static final int MIN_DIST = 4; private static final int MIN_DIST = 4;
// pre-projected points // pre-projected points
private double[] mPreprojected; private double[] mPreprojected = new double[2];
// projected points // projected points
private float[] mPPoints; private float[] mPPoints;
private int mSize;
private final LineClipper mClipper; private final LineClipper mClipper;
// limit coords // limit coords
@ -87,19 +86,18 @@ public class PathOverlay extends Layer {
mCurY = ty; mCurY = ty;
mCurZ = tz; mCurZ = tz;
int size = mPoints.size();
if (mUpdatePoints) { if (mUpdatePoints) {
synchronized (mPoints) { synchronized (mPoints) {
mUpdatePoints = false; mUpdatePoints = false;
ArrayList<GeoPoint> geopoints = mPoints; ArrayList<GeoPoint> geopoints = mPoints;
int size = geopoints.size();
double[] points = mPreprojected; double[] points = mPreprojected;
mSize = size * 2;
if (mSize > points.length) { if (size * 2 > points.length) {
points = mPreprojected = new double[mSize]; points = mPreprojected = new double[size*2];
mPPoints = new float[mSize]; mPPoints = new float[size*2];
} }
for (int i = 0; i < size; i++) for (int i = 0; i < size; i++)
@ -108,7 +106,6 @@ public class PathOverlay extends Layer {
} }
int size = mSize;
if (size == 0) { if (size == 0) {
if (layers.baseLayers != null) { if (layers.baseLayers != null) {
layers.clear(); layers.clear();
@ -153,7 +150,7 @@ public class PathOverlay extends Layer {
int prevX = x; int prevX = x;
int prevY = y; int prevY = y;
for (int j = 2; j < size; j += 2) { for (int j = 2; j < size * 2; j += 2) {
x = (int) ((mPreprojected[j + 0] - mx) * scale); x = (int) ((mPreprojected[j + 0] - mx) * scale);
y = (int) ((mPreprojected[j + 1] - my) * scale); y = (int) ((mPreprojected[j + 1] - my) * scale);