Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-30 08:34:16 +01:00
Code Issues Projects Releases Packages Wiki Activity

make main board bitmap static in an attempt to remove, or at least

Browse source 
postpone running up against, a memory leak that appears to be in the
java side of things.  Googling suggests lots of folks are having
problems with createBitmap (though I can put the createBitmap() call
in a 50-iteration loop and not crash -- may not be the problem after
all.)  Without this change I crash the 14th time opening a game.  With
it I go 30 and run out of patience.  Now that the board is locked in
vertical mode there's little point in recreating the bitmap anyway.
This commit is contained in:
Andy2 2011-07-08 21:49:51 -07:00
parent 8c36727578
commit 55376567f6
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardView.java
View file

@ -46,6 +46,8 @@ public class BoardView extends View implements DrawCtx, BoardHandler,
private static final int k_miniPaddingV = 2;
private static final float MIN_FONT_DIPS = 14.0f;
private static Bitmap s_bitmap; // the board
private Context m_context;
private Paint m_drawPaint;
private Paint m_fillPaint;
@ -57,7 +59,6 @@ public class BoardView extends View implements DrawCtx, BoardHandler,
private CurGameInfo m_gi;
private int m_layoutWidth;
private int m_layoutHeight;
private Bitmap m_bitmap; // the board
private Canvas m_canvas; // owns the bitmap
private int m_trayOwner;
private Rect m_valRect;
@ -161,7 +162,7 @@ public class BoardView extends View implements DrawCtx, BoardHandler,
{
synchronized( this ) {
if ( layoutBoardOnce() ) {
canvas.drawBitmap( m_bitmap, m_left, m_top, m_drawPaint );
canvas.drawBitmap( s_bitmap, m_left, m_top, m_drawPaint );
}
}
}
@ -277,10 +278,12 @@ public class BoardView extends View implements DrawCtx, BoardHandler,
m_left = dims.left;
m_top = dims.top;
m_bitmap = Bitmap.createBitmap( 1 + dims.width,
1 + dims.height,
Bitmap.Config.ARGB_8888 );
m_canvas = new Canvas( m_bitmap );
if ( null == s_bitmap ) {
s_bitmap = Bitmap.createBitmap( 1 + dims.width,
1 + dims.height,
Bitmap.Config.ARGB_8888 );
}
m_canvas = new Canvas( s_bitmap );
// need to synchronize??
m_jniThread.handle( JNIThread.JNICmd.CMD_LAYOUT, dims );