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

fix concurrency bug: use a copy of RenderOverlays

Browse Source
This commit is contained in:
Hannes Janetzek
2013-04-08 18:07:14 +02:00
parent 0e62d375dd
commit 29c3f42043
2 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/org/oscim/renderer/GLRenderer.java
View File

@@ -24,7 +24,6 @@ import static org.oscim.generator.JobTile.STATE_READY;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.nio.ShortBuffer;
import java.util.List;
import java.util.concurrent.locks.ReentrantLock;
import javax.microedition.khronos.egl.EGLConfig;
@@ -483,17 +482,17 @@ public class GLRenderer implements GLSurfaceView.Renderer {
tilesChanged |= (uploadCnt > 0);
/* update overlays */
List<RenderOverlay> overlays = mMapView.getOverlayManager().getRenderLayers();
RenderOverlay[] overlays = mMapView.getOverlayManager().getRenderLayers();
for (int i = 0, n = overlays.size(); i < n; i++)
overlays.get(i).update(mMapPosition, positionChanged, tilesChanged, mMatrices);
for (int i = 0, n = overlays.length; i < n; i++)
overlays[i].update(mMapPosition, positionChanged, tilesChanged, mMatrices);
/* draw base layer */
TileRenderer.draw(tiles, tileCnt, pos, mMatrices);
/* draw overlays */
for (int i = 0, n = overlays.size(); i < n; i++) {
RenderOverlay renderOverlay = overlays.get(i);
for (int i = 0, n = overlays.length; i < n; i++) {
RenderOverlay renderOverlay = overlays[i];
if (renderOverlay.newData) {
renderOverlay.compile();