ANDROID: fix resize crash

Author: chrisws

Makefile.am

@@ -62,15 +62,6 @@ EXTRA_DIST =																		\
 deb:
 	fakeroot dpkg-buildpackage
 
-install-exec-hook:																	\
-	(mkdir -p $(pkgdatadir) &&												\
-	 mkdir -p $(pkgdatadir)/plugins &&								\
-	 mkdir -p $(pkgdatadir)/ide &&										\
-	 mkdir -p $(pkgdatadir)/samples &&								\
-	 cp documentation/sbasic_ref.csv $(pkgdatadir) &&	\
-	 cp plugins/*.* $(pkgdatadir)/plugins &&					\
-	 cp ide/*.* $(pkgdatadir)/ide)
-
 test:
 	(cd $(SUBDIRS) && make test)
 

debian/changelog

@@ -1,8 +1,13 @@
+smallbasic (0.11.10) unstable; urgency=low
+  * Built using common code from the android project and SDL
+
+ -- Chris Warren-Smith <cwarrensmith@gmail.com>  Sat, 19 July 2014 09:45:25 +1000
+
 smallbasic (0.10.8) unstable; urgency=low
   * Fix misc issues with const char* uncovered with new gcc
 
  -- Chris Warren-Smith <cwarrensmith@gmail.com>  Sat, 31 July 2010 09:45:25 +1000
-  
+
 smallbasic (0.10.7) unstable; urgency=low
   * Added defineKey and fixed delay problems with the inkey command
 

debian/control

@@ -13,6 +13,6 @@ Description: One more basic
  SmallBASIC is a fast and easy to learn BASIC language interpreter 
  ideal for everyday calculations, scripts and prototypes. 
  SmallBASIC includes trigonometric, matrices and algebra functions, 
- a built in IDE, a powerful string library, system, sound, and graphic
+ a powerful string library, system, sound, and graphic
  commands along with structured programming syntax. 
  SmallBASIC is licensed under the GPL. 

debian/rules

@@ -28,7 +28,7 @@ endif
 ifneq "$(wildcard /usr/share/misc/config.guess)" ""
 	cp -f /usr/share/misc/config.guess config.guess
 endif
-	./configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" --enable-fltk
+	./configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" --enable-sdl
 
 build: build-stamp
 
@@ -72,7 +72,7 @@ binary-arch: build install
 	dh_installchangelogs ChangeLog
 	dh_installdocs 
 	dh_installexamples 
-	dh_install --exclude=".svn" documentation/sbasic_ref.csv plugins samples/distro-examples usr/share/smallbasic
+	dh_install --exclude=".git" documentation/sbasic_ref.csv plugins samples/distro-examples usr/share/smallbasic
 	dh_installman
 	dh_link
 	dh_strip

ide/android/AndroidManifest.xml

@@ -7,7 +7,7 @@
   <!-- This is the platform API where NativeActivity was introduced. -->
   <uses-sdk android:minSdkVersion="9" />
 
-  <!-- This .apk has no Java code itself, so set hasCode to false. -->
+  <!-- This .apk has Java code, so set hasCode to true. -->
   <application android:label="@string/app_name"
                android:hasCode="true"
                android:hardwareAccelerated="true"

src/platform/android/common/Makefile.am

@@ -81,8 +81,8 @@ ant-build: ndk-build
 
 test: ant-build
 	(cd ../../../../ide/android && \
-   adb -d logcat -c && \
-   adb shell am start net.sourceforge.smallbasic/net.sourceforge.smallbasic.MainActivity && \
-   adb -d logcat)
+   adb -a logcat -c && \
+   adb -a shell am start net.sourceforge.smallbasic/net.sourceforge.smallbasic.MainActivity && \
+   adb -a logcat)
 
 

src/platform/android/jni/display.cpp

@@ -15,7 +15,6 @@
 
 #define FONT_FACE_REGULAR "Envy Code R.ttf"
 #define FONT_FACE_BOLD    "Envy Code R Bold.ttf"
-#define SIZE_LIMIT 10
 
 extern common::Graphics *graphics;
 
@@ -156,15 +155,3 @@ void maUpdateScreen(void) {
   ((Graphics *)graphics)->redraw();
 }
 
-int maCreateDrawableImage(MAHandle maHandle, int width, int height) {
-  int result = RES_OK;
-  if (height > graphics->getHeight() * SIZE_LIMIT) {
-    result -= 1;
-  } else {
-    Canvas *drawable = (Canvas *)maHandle;
-    result = drawable->create(width, height) ? RES_OK : -1;
-  }
-  return result;
-}
-
-

src/platform/common/canvas.h

@@ -12,8 +12,9 @@
 typedef uint16_t pixel_t;
 
 #if defined(_SDL)
-
 #include <SDL.h>
+#define MAX_CANVAS_SIZE 10
+
 struct Canvas {
   Canvas();
   virtual ~Canvas();
@@ -33,8 +34,9 @@ struct Canvas {
 };
 
 #else
-
 #include <android/rect.h>
+#define MAX_CANVAS_SIZE 10
+
 struct Canvas {
   Canvas();
   virtual ~Canvas();

src/platform/common/graphics.cpp

@@ -381,3 +381,14 @@ MAHandle maSetDrawTarget(MAHandle maHandle) {
   return graphics->setDrawTarget(maHandle);
 }
 
+int maCreateDrawableImage(MAHandle maHandle, int width, int height) {
+  int result = RES_OK;
+  int maxSize = max(graphics->getWidth(), graphics->getHeight());
+  if (height > maxSize * MAX_CANVAS_SIZE) {
+    result -= 1;
+  } else {
+    Canvas *drawable = (Canvas *)maHandle;
+    result = drawable->create(width, height) ? RES_OK : -1;
+  }
+  return result;
+}

src/platform/common/screen.cpp

@@ -498,12 +498,17 @@ void GraphicScreen::resize(int newWidth, int newHeight, int oldWidth, int oldHei
     dstPoint.x = 0;
     dstPoint.y = 0;
 
-    maCreateDrawableImage(newImage, newImageWidth, newImageHeight);
-    maSetDrawTarget(newImage);
-    maSetColor(_bg);
-    maFillRect(0, 0, newImageWidth, newImageHeight);
-    maDrawImageRegion(_image, &srcRect, &dstPoint, TRANS_NONE);
-    maDestroyPlaceholder(_image);
+    if (maCreateDrawableImage(newImage, newImageWidth, newImageHeight) == RES_OK) {
+      maSetDrawTarget(newImage);
+      maSetColor(_bg);
+      maFillRect(0, 0, newImageWidth, newImageHeight);
+      maDrawImageRegion(_image, &srcRect, &dstPoint, TRANS_NONE);
+      maDestroyPlaceholder(_image);
+    } else {
+      // cannot resize - alert and abort
+      deviceLog("Failed to resize to %d %d", newImageWidth, newImageHeight);
+      abort();
+    }
 
     _image = newImage;
     _imageWidth = newImageWidth;