Fix:graphics_android:When scaling image, report scaled size of image, not size it had before scaling.

git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@6003 ffa7fe5e-494d-0410-b361-a75ebd5db220

1 files changed, 3 insertions, 1 deletions

diff --git a/navit/graphics/android/graphics_android.c b/navit/graphics/android/graphics_android.c
index 38c71151..498779b6 100644
--- a/navit/graphics/android/graphics_android.c
+++ b/navit/graphics/android/graphics_android.c
@@ -243,7 +243,7 @@ image_new(struct graphics_priv *gra, struct graphics_image_methods *meth, char *
 	if (localBitmap) {
 		ret->width=(*jnienv)->CallIntMethod(jnienv, localBitmap, gra->Bitmap_getWidth);
 		ret->height=(*jnienv)->CallIntMethod(jnienv, localBitmap, gra->Bitmap_getHeight);
-		if(*w!=-1 || *h!=-1) {
+		if((*w!=-1 && *w!=ret->width) || (*h!=-1 && *w!=ret->height)) {
 			jclass scaledBitmap=(*jnienv)->CallStaticObjectMethod(jnienv, gra->BitmapClass, 
 				gra->Bitmap_createScaledBitmap, localBitmap, (*w==-1)?ret->width:*w, (*h==-1)?ret->height:*h, JNI_TRUE);
 			if(!scaledBitmap) {
@@ -251,6 +251,8 @@ image_new(struct graphics_priv *gra, struct graphics_image_methods *meth, char *
 			} else {
 				(*jnienv)->DeleteLocalRef(jnienv, localBitmap);
 				localBitmap=scaledBitmap;
+				ret->width=(*jnienv)->CallIntMethod(jnienv, localBitmap, gra->Bitmap_getWidth);
+				ret->height=(*jnienv)->CallIntMethod(jnienv, localBitmap, gra->Bitmap_getHeight);
 			}
 		}
 		ret->Bitmap = (*jnienv)->NewGlobalRef(jnienv, localBitmap);