[Navit-cvs-commit] SF.net SVN: navit:[6003] trunk/navit/navit/graphics/android/ graphics_android.c

[<md...@us...>]

Revision: 6003
          http://sourceforge.net/p/navit/code/6003
Author:   mdankov
Date:     2015-01-21 21:14:07 +0000 (Wed, 21 Jan 2015)
Log Message:
-----------
Fix:graphics_android:When scaling image, report scaled size of image, not size it had before scaling.

Modified Paths:
--------------
    trunk/navit/navit/graphics/android/graphics_android.c

Modified: trunk/navit/navit/graphics/android/graphics_android.c
===================================================================
--- trunk/navit/navit/graphics/android/graphics_android.c	2015-01-19 22:07:16 UTC (rev 6002)
+++ trunk/navit/navit/graphics/android/graphics_android.c	2015-01-21 21:14:07 UTC (rev 6003)
@@ -243,7 +243,7 @@
 	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 @@
 			} 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);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.