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

Fix warnings that appear when logging off.

Browse source
This commit is contained in:
eehouse 2010-02-15 02:54:10 +00:00
parent 928f65a266
commit 135d936a7d
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
xwords4/android/XWords4/jni/anddict.c
View file

@ -113,8 +113,7 @@ andMakeBitmap( AndDictionaryCtxt* ctxt, XP_U8** ptrp )
JNIEnv* env = ctxt->env;
bitmap = and_util_makeJBitmap( ctxt->jniutil, nCols, nRows, colors );
jobject tmp = (*env)->NewGlobalRef( env, bitmap );
XP_ASSERT( tmp == bitmap );
(void)(*env)->NewGlobalRef( env, bitmap );
(*env)->DeleteLocalRef( env, bitmap );
XP_FREE( ctxt->super.mpool, colors );
}
@ -376,8 +375,7 @@ and_dictionary_destroy( DictionaryCtxt* dict )
jobject
and_dictionary_getChars( JNIEnv* env, DictionaryCtxt* dict )
{
AndDictionaryCtxt* anddict = (AndDictionaryCtxt*)dict;
XP_ASSERT( env == anddict->env );
XP_ASSERT( env == ((AndDictionaryCtxt*)dict)->env );
/* This is cheating: specials will be rep'd as 1,2, etc. But as long as
java code wants to ignore them anyway that's ok. Otherwise need to

6
xwords4/android/XWords4/jni/utilwrapper.c
View file

@ -52,7 +52,9 @@ and_util_getVTManager( XW_UtilCtxt* uc )
static XWStreamCtxt*
and_util_makeStreamFromAddr( XW_UtilCtxt* uc, XP_PlayerAddr channelNo )
{
#ifdef DEBUG
AndUtil* util = (AndUtil*)uc;
#endif
AndGlobals* globals = (AndGlobals*)uc->closure;
XWStreamCtxt* stream = and_empty_stream( MPPARM(util->util.mpool)
globals );
@ -265,11 +267,11 @@ and_util_getCurSeconds( XW_UtilCtxt* uc )
static DictionaryCtxt*
and_util_makeEmptyDict( XW_UtilCtxt* uc )
{
AndUtil* util = (AndUtil*)uc;
#ifdef STUBBED_DICT
XP_ASSERT(0);
#else
return and_dictionary_make_empty( MPPARM_NOCOMMA( util->util.mpool ) );
return
and_dictionary_make_empty( MPPARM_NOCOMMA( ((AndUtil*)uc)->util.mpool ) );
#endif
}