|
From: <jan...@us...> - 2010-06-29 11:50:31
|
Revision: 1052
http://swingme.svn.sourceforge.net/swingme/?rev=1052&view=rev
Author: janeroski
Date: 2010-06-29 11:49:46 +0000 (Tue, 29 Jun 2010)
Log Message:
-----------
Image: Hack for OutOfMemory Exception when creating images
Modified Paths:
--------------
AndroidME/src_MIDP/javax/microedition/lcdui/Image.java
Modified: AndroidME/src_MIDP/javax/microedition/lcdui/Image.java
===================================================================
--- AndroidME/src_MIDP/javax/microedition/lcdui/Image.java 2010-06-28 16:38:03 UTC (rev 1051)
+++ AndroidME/src_MIDP/javax/microedition/lcdui/Image.java 2010-06-29 11:49:46 UTC (rev 1052)
@@ -67,6 +67,14 @@
int size = Math.max(stream.available(), 8 * 1024);
BufferedInputStream buffInput = new BufferedInputStream(stream, size);
+ BitmapFactory.Options opts = new BitmapFactory.Options();
+ try {
+ BitmapFactory.Options.class.getField("inPurgeable").set(opts, true);
+ } catch (Exception e) {
+ // inPurgeable not supported
+ // http://www.droidnova.com/2d-sprite-animation-in-android-addendum,505.html
+ }
+
Bitmap bitmap;
try {
bitmap = BitmapFactory.decodeStream(buffInput);
@@ -115,6 +123,15 @@
}
public static Image createImage(byte[] imgData, int offset, int length) {
+
+ BitmapFactory.Options opts = new BitmapFactory.Options();
+ try {
+ BitmapFactory.Options.class.getField("inPurgeable").set(opts, true);
+ } catch (Exception e) {
+ // inPurgeable not supported
+ // http://www.droidnova.com/2d-sprite-animation-in-android-addendum,505.html
+ }
+
Bitmap bitmap;
try {
bitmap = BitmapFactory.decodeByteArray(imgData, offset, length);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2011-02-07 11:00:36
|
Revision: 1476
http://swingme.svn.sourceforge.net/swingme/?rev=1476&view=rev
Author: yuranet
Date: 2011-02-07 11:00:30 +0000 (Mon, 07 Feb 2011)
Log Message:
-----------
optimization for images. lots of love. xoxo -yura
Modified Paths:
--------------
AndroidME/src_MIDP/javax/microedition/lcdui/Image.java
Modified: AndroidME/src_MIDP/javax/microedition/lcdui/Image.java
===================================================================
--- AndroidME/src_MIDP/javax/microedition/lcdui/Image.java 2011-02-04 19:06:33 UTC (rev 1475)
+++ AndroidME/src_MIDP/javax/microedition/lcdui/Image.java 2011-02-07 11:00:30 UTC (rev 1476)
@@ -46,11 +46,11 @@
case Sprite.TRANS_ROT270:
case Sprite.TRANS_MIRROR_ROT90:
case Sprite.TRANS_MIRROR_ROT270: {
- res = Image.createTransparentImage(height, width);
+ res = Image.createImage(height, width, image.bitmap.getConfig());
break;
}
default: {
- res = Image.createTransparentImage(width, height);
+ res = Image.createImage(width, height, image.bitmap.getConfig());
}
}
@@ -91,20 +91,20 @@
return new Image(bitmap);
}
- private static Image createTransparentImage(int width, int height) {
+ private static Image createImage(int width, int height, Config config) {
Bitmap bitmap;
try {
- bitmap = Bitmap.createBitmap(width, height, Config.ARGB_8888);
+ bitmap = Bitmap.createBitmap(width, height, config);
} catch (OutOfMemoryError e) {
cleanMem();
- bitmap = Bitmap.createBitmap(width, height, Config.ARGB_8888);
+ bitmap = Bitmap.createBitmap(width, height, config);
}
return new Image(bitmap);
}
public static Image createImage(int width, int height) {
- Image res = createTransparentImage(width, height);
+ Image res = createImage(width, height, Config.ARGB_8888);
// MIDP: All pixels should be white
Graphics g = res.getGraphics();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2011-02-27 16:58:43
|
Revision: 1530
http://swingme.svn.sourceforge.net/swingme/?rev=1530&view=rev
Author: yuranet
Date: 2011-02-27 16:58:37 +0000 (Sun, 27 Feb 2011)
Log Message:
-----------
save of image added
Modified Paths:
--------------
AndroidME/src_MIDP/javax/microedition/lcdui/Image.java
Modified: AndroidME/src_MIDP/javax/microedition/lcdui/Image.java
===================================================================
--- AndroidME/src_MIDP/javax/microedition/lcdui/Image.java 2011-02-27 16:57:51 UTC (rev 1529)
+++ AndroidME/src_MIDP/javax/microedition/lcdui/Image.java 2011-02-27 16:58:37 UTC (rev 1530)
@@ -3,6 +3,7 @@
import java.io.BufferedInputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.io.OutputStream;
import javax.microedition.lcdui.game.Sprite;
@@ -214,6 +215,13 @@
// return bm;
}
+
+ public static void saveImage(Image img, OutputStream out) {
+ boolean good = img.bitmap.compress(Bitmap.CompressFormat.JPEG, 90, out);
+ if (!good) {
+ throw new RuntimeException("save failed of img: "+img);
+ }
+ }
private static void cleanMem() {
System.gc();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jan...@us...> - 2012-02-10 12:02:27
|
Revision: 2089
http://swingme.svn.sourceforge.net/swingme/?rev=2089&view=rev
Author: janeroski
Date: 2012-02-10 12:02:18 +0000 (Fri, 10 Feb 2012)
Log Message:
-----------
Images: Allow Images to load from Android resource IDs (BitmapDrawable)
Modified Paths:
--------------
AndroidME/src_MIDP/javax/microedition/lcdui/Image.java
Modified: AndroidME/src_MIDP/javax/microedition/lcdui/Image.java
===================================================================
--- AndroidME/src_MIDP/javax/microedition/lcdui/Image.java 2012-02-09 22:46:17 UTC (rev 2088)
+++ AndroidME/src_MIDP/javax/microedition/lcdui/Image.java 2012-02-10 12:02:18 UTC (rev 2089)
@@ -7,11 +7,13 @@
import javax.microedition.lcdui.game.Sprite;
+import android.content.res.Resources;
import android.graphics.Bitmap;
+import android.graphics.Bitmap.Config;
import android.graphics.BitmapFactory;
import android.graphics.Canvas;
import android.graphics.ColorMatrix;
-import android.graphics.Bitmap.Config;
+import android.graphics.drawable.BitmapDrawable;
/**
* for saving of image please use
@@ -67,10 +69,6 @@
}
public static Image createImage(InputStream stream) throws IOException {
-
- int size = Math.max(stream.available(), 8 * 1024);
- BufferedInputStream buffInput = new BufferedInputStream(stream, size);
-
BitmapFactory.Options opts = new BitmapFactory.Options();
try {
BitmapFactory.Options.class.getField("inPurgeable").set(opts, true);
@@ -80,15 +78,24 @@
}
Bitmap bitmap;
- try {
- bitmap = BitmapFactory.decodeStream(buffInput);
- } catch (OutOfMemoryError e) {
- cleanMem();
- buffInput.reset();
- buffInput.mark(1024);
- bitmap = BitmapFactory.decodeStream(buffInput);
+ if (stream instanceof ResourceInputStream) {
+ bitmap = ((ResourceInputStream) stream).getBitmap();
}
- if (bitmap==null) {
+ else {
+ int size = Math.max(stream.available(), 8 * 1024);
+ BufferedInputStream buffInput = new BufferedInputStream(stream, size);
+
+ try {
+ bitmap = BitmapFactory.decodeStream(buffInput);
+ } catch (OutOfMemoryError e) {
+ cleanMem();
+ buffInput.reset();
+ buffInput.mark(1024);
+ bitmap = BitmapFactory.decodeStream(buffInput);
+ }
+ }
+
+ if (bitmap == null) {
throw new IOException();
}
@@ -226,4 +233,27 @@
} catch (InterruptedException e) {
}
}
+
+ public static class ResourceInputStream extends InputStream {
+ private Resources res;
+ private int resId;
+
+ public ResourceInputStream(Resources res, int resId) {
+ this.res = res;
+ this.resId = resId;
+ }
+
+ @Override
+ public int read() throws IOException {
+ throw new RuntimeException("Not implemented");
+ }
+
+ Bitmap getBitmap() throws IOException {
+ try {
+ return ((BitmapDrawable) res.getDrawable(resId)).getBitmap();
+ } catch (Throwable e) {
+ throw new IOException(e);
+ }
+ }
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jan...@us...> - 2012-02-10 12:36:06
|
Revision: 2090
http://swingme.svn.sourceforge.net/swingme/?rev=2090&view=rev
Author: janeroski
Date: 2012-02-10 12:35:57 +0000 (Fri, 10 Feb 2012)
Log Message:
-----------
Images: Allow Images to load from Android resource IDs (BitmapDrawable)
- Compilation error on older android releases
Modified Paths:
--------------
AndroidME/src_MIDP/javax/microedition/lcdui/Image.java
Modified: AndroidME/src_MIDP/javax/microedition/lcdui/Image.java
===================================================================
--- AndroidME/src_MIDP/javax/microedition/lcdui/Image.java 2012-02-10 12:02:18 UTC (rev 2089)
+++ AndroidME/src_MIDP/javax/microedition/lcdui/Image.java 2012-02-10 12:35:57 UTC (rev 2090)
@@ -252,7 +252,7 @@
try {
return ((BitmapDrawable) res.getDrawable(resId)).getBitmap();
} catch (Throwable e) {
- throw new IOException(e);
+ throw new IOException(e.toString());
}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jan...@us...> - 2012-02-10 13:00:41
|
Revision: 2091
http://swingme.svn.sourceforge.net/swingme/?rev=2091&view=rev
Author: janeroski
Date: 2012-02-10 13:00:32 +0000 (Fri, 10 Feb 2012)
Log Message:
-----------
Images: Allow Images to load from Android resource IDs (BitmapDrawable)
- Compilation error on older android releases - Better fix
Modified Paths:
--------------
AndroidME/src_MIDP/javax/microedition/lcdui/Image.java
Modified: AndroidME/src_MIDP/javax/microedition/lcdui/Image.java
===================================================================
--- AndroidME/src_MIDP/javax/microedition/lcdui/Image.java 2012-02-10 12:35:57 UTC (rev 2090)
+++ AndroidME/src_MIDP/javax/microedition/lcdui/Image.java 2012-02-10 13:00:32 UTC (rev 2091)
@@ -252,7 +252,9 @@
try {
return ((BitmapDrawable) res.getDrawable(resId)).getBitmap();
} catch (Throwable e) {
- throw new IOException(e.toString());
+ IOException ex = new IOException();
+ ex.initCause(e);
+ throw ex;
}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2012-06-27 10:42:56
|
Revision: 2135
http://swingme.svn.sourceforge.net/swingme/?rev=2135&view=rev
Author: yuranet
Date: 2012-06-27 10:42:45 +0000 (Wed, 27 Jun 2012)
Log Message:
-----------
try and load android res
Modified Paths:
--------------
AndroidME/src_MIDP/javax/microedition/lcdui/Image.java
Modified: AndroidME/src_MIDP/javax/microedition/lcdui/Image.java
===================================================================
--- AndroidME/src_MIDP/javax/microedition/lcdui/Image.java 2012-06-27 09:50:33 UTC (rev 2134)
+++ AndroidME/src_MIDP/javax/microedition/lcdui/Image.java 2012-06-27 10:42:45 UTC (rev 2135)
@@ -136,9 +136,12 @@
}
public static Image createImage(String resource) throws IOException {
- InputStream in = Image.class.getResourceAsStream(resource);
- if (in == null) {
- throw new IOException();
+ InputStream in = getResourceAsStream(resource);// try and load from android res
+ if (in==null) {
+ in = Image.class.getResourceAsStream(resource);
+ if (in == null) {
+ throw new IOException("can not find: "+resource);
+ }
}
return createImage(in);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2012-07-21 17:46:44
|
Revision: 2177
http://swingme.svn.sourceforge.net/swingme/?rev=2177&view=rev
Author: yuranet
Date: 2012-07-21 17:46:38 +0000 (Sat, 21 Jul 2012)
Log Message:
-----------
images look better
Modified Paths:
--------------
AndroidME/src_MIDP/javax/microedition/lcdui/Image.java
Modified: AndroidME/src_MIDP/javax/microedition/lcdui/Image.java
===================================================================
--- AndroidME/src_MIDP/javax/microedition/lcdui/Image.java 2012-07-16 09:56:11 UTC (rev 2176)
+++ AndroidME/src_MIDP/javax/microedition/lcdui/Image.java 2012-07-21 17:46:38 UTC (rev 2177)
@@ -95,13 +95,16 @@
int size = Math.max(stream.available(), 8 * 1024);
BufferedInputStream buffInput = new BufferedInputStream(stream, size);
+ BitmapFactory.Options options = new BitmapFactory.Options();
+ options.inPreferredConfig = Bitmap.Config.ARGB_8888;
+
try {
- bitmap = BitmapFactory.decodeStream(buffInput);
+ bitmap = BitmapFactory.decodeStream(buffInput,null,options);
} catch (OutOfMemoryError e) {
cleanMem();
buffInput.reset();
buffInput.mark(1024);
- bitmap = BitmapFactory.decodeStream(buffInput);
+ bitmap = BitmapFactory.decodeStream(buffInput,null,options);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2012-09-04 17:39:45
|
Revision: 2202
http://swingme.svn.sourceforge.net/swingme/?rev=2202&view=rev
Author: yuranet
Date: 2012-09-04 17:39:35 +0000 (Tue, 04 Sep 2012)
Log Message:
-----------
better error
Modified Paths:
--------------
AndroidME/src_MIDP/javax/microedition/lcdui/Image.java
Modified: AndroidME/src_MIDP/javax/microedition/lcdui/Image.java
===================================================================
--- AndroidME/src_MIDP/javax/microedition/lcdui/Image.java 2012-09-03 17:08:16 UTC (rev 2201)
+++ AndroidME/src_MIDP/javax/microedition/lcdui/Image.java 2012-09-04 17:39:35 UTC (rev 2202)
@@ -117,13 +117,18 @@
private static Image createImage(int width, int height, Config config) {
Bitmap bitmap;
+ OutOfMemoryError error=null;
try {
bitmap = Bitmap.createBitmap(width, height, config);
} catch (OutOfMemoryError e) {
cleanMem();
+ error = e;
bitmap = Bitmap.createBitmap(width, height, config);
}
+ if (bitmap==null) {
+ throw new RuntimeException("Bitmap.createBitmap returned null for w="+width+" h="+height+" config="+config+" error="+error );
+ }
return new Image(bitmap);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2012-11-07 18:27:46
|
Revision: 2219
http://swingme.svn.sourceforge.net/swingme/?rev=2219&view=rev
Author: yuranet
Date: 2012-11-07 18:27:39 +0000 (Wed, 07 Nov 2012)
Log Message:
-----------
inDither false
Modified Paths:
--------------
AndroidME/src_MIDP/javax/microedition/lcdui/Image.java
Modified: AndroidME/src_MIDP/javax/microedition/lcdui/Image.java
===================================================================
--- AndroidME/src_MIDP/javax/microedition/lcdui/Image.java 2012-10-31 19:21:58 UTC (rev 2218)
+++ AndroidME/src_MIDP/javax/microedition/lcdui/Image.java 2012-11-07 18:27:39 UTC (rev 2219)
@@ -72,14 +72,6 @@
}
public static Image createImage(InputStream stream) throws IOException {
- BitmapFactory.Options opts = new BitmapFactory.Options();
- try {
- BitmapFactory.Options.class.getField("inPurgeable").set(opts, true);
- } catch (Exception e) {
- // inPurgeable not supported
- // http://www.droidnova.com/2d-sprite-animation-in-android-addendum,505.html
- }
-
Bitmap bitmap;
if (stream instanceof ResourceInputStream) {
try {
@@ -97,6 +89,8 @@
BitmapFactory.Options options = new BitmapFactory.Options();
options.inPreferredConfig = Bitmap.Config.ARGB_8888;
+ options.inDither = false;
+ options.inPurgeable = true; // http://www.droidnova.com/2d-sprite-animation-in-android-addendum,505.html
try {
bitmap = BitmapFactory.decodeStream(buffInput,null,options);
@@ -170,10 +164,10 @@
Bitmap bitmap;
try {
- bitmap = BitmapFactory.decodeByteArray(imgData, offset, length);
+ bitmap = BitmapFactory.decodeByteArray(imgData, offset, length, opts);
} catch (OutOfMemoryError e) {
cleanMem();
- bitmap = BitmapFactory.decodeByteArray(imgData, offset, length);
+ bitmap = BitmapFactory.decodeByteArray(imgData, offset, length, opts);
}
if (bitmap==null) {
return null;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2013-06-23 18:41:31
|
Revision: 2265
http://sourceforge.net/p/swingme/code/2265
Author: yuranet
Date: 2013-06-23 18:41:28 +0000 (Sun, 23 Jun 2013)
Log Message:
-----------
better excetpion type
Modified Paths:
--------------
AndroidME/src_MIDP/javax/microedition/lcdui/Image.java
Modified: AndroidME/src_MIDP/javax/microedition/lcdui/Image.java
===================================================================
--- AndroidME/src_MIDP/javax/microedition/lcdui/Image.java 2013-06-18 21:02:41 UTC (rev 2264)
+++ AndroidME/src_MIDP/javax/microedition/lcdui/Image.java 2013-06-23 18:41:28 UTC (rev 2265)
@@ -91,7 +91,7 @@
options.inPreferredConfig = Bitmap.Config.ARGB_8888;
options.inDither = false;
options.inPurgeable = true; // http://www.droidnova.com/2d-sprite-animation-in-android-addendum,505.html
-
+
try {
bitmap = BitmapFactory.decodeStream(buffInput,null,options);
} catch (OutOfMemoryError e) {
@@ -125,7 +125,7 @@
bitmap = Bitmap.createBitmap(width, height, config);
}
if (bitmap==null) {
- throw new RuntimeException("Bitmap.createBitmap returned null for w="+width+" h="+height+" config="+config+" error="+error );
+ throw new OutOfMemoryError("Bitmap.createBitmap returned null for w="+width+" h="+height+" config="+config+" error="+error );
}
return new Image(bitmap);
}
@@ -258,11 +258,11 @@
name = name.substring(1);
}
name = name.replace(".9.png", "").replace(".png", "").replace(".jpg", "").replace(".gif", "");
-
+
Resources res = AndroidMeApp.getContext().getResources();
-
+
int id = res.getIdentifier(name, "drawable", AndroidMeApp.getContext().getPackageName() );
-
+
if (id > 0) {
return new ResourceInputStream(res, id);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2013-07-02 21:49:49
|
Revision: 2268
http://sourceforge.net/p/swingme/code/2268
Author: yuranet
Date: 2013-07-02 21:49:47 +0000 (Tue, 02 Jul 2013)
Log Message:
-----------
toString
Modified Paths:
--------------
AndroidME/src_MIDP/javax/microedition/lcdui/Image.java
Modified: AndroidME/src_MIDP/javax/microedition/lcdui/Image.java
===================================================================
--- AndroidME/src_MIDP/javax/microedition/lcdui/Image.java 2013-06-27 23:35:11 UTC (rev 2267)
+++ AndroidME/src_MIDP/javax/microedition/lcdui/Image.java 2013-07-02 21:49:47 UTC (rev 2268)
@@ -232,6 +232,11 @@
bitmap.setPixel(x, y, color);
}
+ @Override
+ public String toString() {
+ return "Image"+bitmap.toString();
+ }
+
public static void filter(Image source, Image bm, ColorMatrix cm) {
// Image bm = createImage(source.getWidth(), source.getHeight());
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2014-01-05 19:35:11
|
Revision: 2301
http://sourceforge.net/p/swingme/code/2301
Author: yuranet
Date: 2014-01-05 19:35:08 +0000 (Sun, 05 Jan 2014)
Log Message:
-----------
more debug info in Image
Modified Paths:
--------------
AndroidME/src_MIDP/javax/microedition/lcdui/Image.java
Modified: AndroidME/src_MIDP/javax/microedition/lcdui/Image.java
===================================================================
--- AndroidME/src_MIDP/javax/microedition/lcdui/Image.java 2013-12-04 02:19:31 UTC (rev 2300)
+++ AndroidME/src_MIDP/javax/microedition/lcdui/Image.java 2014-01-05 19:35:08 UTC (rev 2301)
@@ -82,6 +82,10 @@
ex.initCause(e);
throw ex;
}
+
+ if (bitmap == null) {
+ throw new IOException("ResourceInputStream.getBitmap returned null "+stream);
+ }
}
else {
int size = Math.max(stream.available(), 8 * 1024);
@@ -100,12 +104,11 @@
buffInput.mark(1024);
bitmap = BitmapFactory.decodeStream(buffInput,null,options);
}
- }
- if (bitmap == null) {
- throw new IOException();
+ if (bitmap == null) {
+ throw new IOException("BitmapFactory.decodeStream returned null "+buffInput+" "+options);
+ }
}
-
return new Image(bitmap);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2014-02-22 19:58:37
|
Revision: 2307
http://sourceforge.net/p/swingme/code/2307
Author: yuranet
Date: 2014-02-22 19:58:29 +0000 (Sat, 22 Feb 2014)
Log Message:
-----------
even more info
Modified Paths:
--------------
AndroidME/src_MIDP/javax/microedition/lcdui/Image.java
Modified: AndroidME/src_MIDP/javax/microedition/lcdui/Image.java
===================================================================
--- AndroidME/src_MIDP/javax/microedition/lcdui/Image.java 2014-02-22 19:47:32 UTC (rev 2306)
+++ AndroidME/src_MIDP/javax/microedition/lcdui/Image.java 2014-02-22 19:58:29 UTC (rev 2307)
@@ -96,17 +96,19 @@
options.inDither = false;
options.inPurgeable = true; // http://www.droidnova.com/2d-sprite-animation-in-android-addendum,505.html
+ OutOfMemoryError error = null;
try {
bitmap = BitmapFactory.decodeStream(buffInput,null,options);
} catch (OutOfMemoryError e) {
cleanMem();
+ error = e;
buffInput.reset();
buffInput.mark(1024);
bitmap = BitmapFactory.decodeStream(buffInput,null,options);
}
if (bitmap == null) {
- throw new IOException("BitmapFactory.decodeStream returned null "+buffInput+" "+options);
+ throw new IOException("BitmapFactory.decodeStream returned null "+buffInput+" "+options+" "+error);
}
}
return new Image(bitmap);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2014-02-22 22:06:36
|
Revision: 2309
http://sourceforge.net/p/swingme/code/2309
Author: yuranet
Date: 2014-02-22 22:06:32 +0000 (Sat, 22 Feb 2014)
Log Message:
-----------
better toString
Modified Paths:
--------------
AndroidME/src_MIDP/javax/microedition/lcdui/Image.java
Modified: AndroidME/src_MIDP/javax/microedition/lcdui/Image.java
===================================================================
--- AndroidME/src_MIDP/javax/microedition/lcdui/Image.java 2014-02-22 20:30:58 UTC (rev 2308)
+++ AndroidME/src_MIDP/javax/microedition/lcdui/Image.java 2014-02-22 22:06:32 UTC (rev 2309)
@@ -239,7 +239,7 @@
@Override
public String toString() {
- return "Image"+bitmap.toString();
+ return "Image{"+bitmap.toString()+"}";
}
public static void filter(Image source, Image bm, ColorMatrix cm) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2014-12-14 00:21:42
|
Revision: 2330
http://sourceforge.net/p/swingme/code/2330
Author: yuranet
Date: 2014-12-14 00:21:39 +0000 (Sun, 14 Dec 2014)
Log Message:
-----------
more debug for null from BitmapFactory.decodeStream
Modified Paths:
--------------
AndroidME/src_MIDP/javax/microedition/lcdui/Image.java
Modified: AndroidME/src_MIDP/javax/microedition/lcdui/Image.java
===================================================================
--- AndroidME/src_MIDP/javax/microedition/lcdui/Image.java 2014-12-13 22:17:36 UTC (rev 2329)
+++ AndroidME/src_MIDP/javax/microedition/lcdui/Image.java 2014-12-14 00:21:39 UTC (rev 2330)
@@ -88,6 +88,7 @@
}
}
else {
+ int available = stream.available();
int size = Math.max(stream.available(), 8 * 1024);
BufferedInputStream buffInput = new BufferedInputStream(stream, size);
@@ -108,7 +109,7 @@
}
if (bitmap == null) {
- throw new IOException("BitmapFactory.decodeStream returned null "+buffInput+" "+options+" "+error);
+ throw new IOException("BitmapFactory.decodeStream returned null " + stream + " available=" + available + " " + options.outMimeType + " " + options.outWidth + "x" + options.outHeight + " " + error);
}
}
return new Image(bitmap);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2015-01-03 01:35:33
|
Revision: 2337
http://sourceforge.net/p/swingme/code/2337
Author: yuranet
Date: 2015-01-03 01:35:31 +0000 (Sat, 03 Jan 2015)
Log Message:
-----------
use var
Modified Paths:
--------------
AndroidME/src_MIDP/javax/microedition/lcdui/Image.java
Modified: AndroidME/src_MIDP/javax/microedition/lcdui/Image.java
===================================================================
--- AndroidME/src_MIDP/javax/microedition/lcdui/Image.java 2014-12-27 19:52:31 UTC (rev 2336)
+++ AndroidME/src_MIDP/javax/microedition/lcdui/Image.java 2015-01-03 01:35:31 UTC (rev 2337)
@@ -89,7 +89,7 @@
}
else {
int available = stream.available();
- int size = Math.max(stream.available(), 8 * 1024);
+ int size = Math.max(available, 8 * 1024);
BufferedInputStream buffInput = new BufferedInputStream(stream, size);
BitmapFactory.Options options = new BitmapFactory.Options();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2019-04-19 16:40:38
|
Revision: 2373
http://sourceforge.net/p/swingme/code/2373
Author: yuranet
Date: 2019-04-19 16:40:36 +0000 (Fri, 19 Apr 2019)
Log Message:
-----------
warning on size mismatch
Modified Paths:
--------------
AndroidME/src_MIDP/javax/microedition/lcdui/Image.java
Modified: AndroidME/src_MIDP/javax/microedition/lcdui/Image.java
===================================================================
--- AndroidME/src_MIDP/javax/microedition/lcdui/Image.java 2019-04-19 14:16:09 UTC (rev 2372)
+++ AndroidME/src_MIDP/javax/microedition/lcdui/Image.java 2019-04-19 16:40:36 UTC (rev 2373)
@@ -8,6 +8,7 @@
import javax.microedition.lcdui.game.Sprite;
import net.yura.android.AndroidMeApp;
+import net.yura.mobile.logging.Logger;
import android.content.res.Resources;
import android.graphics.Bitmap;
@@ -275,7 +276,7 @@
int id = res.getIdentifier(name, "drawable", AndroidMeApp.getContext().getPackageName() );
if (id > 0) {
- return new ResourceInputStream(res, id);
+ return new ResourceInputStream(res, id, name);
}
return null;
}
@@ -283,10 +284,12 @@
public static class ResourceInputStream extends InputStream {
private Resources res;
private int resId;
+ String name;
- public ResourceInputStream(Resources res, int resId) {
+ public ResourceInputStream(Resources res, int resId, String name) {
this.res = res;
this.resId = resId;
+ this.name = name;
}
@Override
@@ -299,12 +302,18 @@
}
public Bitmap getBitmap() {
- return ((BitmapDrawable)getDrawable()).getBitmap();
+ Drawable drawable = getDrawable();
+ Bitmap bitmap = ((BitmapDrawable)drawable).getBitmap();
+ if (bitmap.getWidth() != drawable.getIntrinsicWidth()) {
+ // TODO in target api 28 this will start happening
+ Logger.warn("size does not match " + this);
+ }
+ return bitmap;
}
@Override
public String toString() {
- return "RIS{res="+res+",id="+resId+"}";
+ return "RIS{name="+name+",res="+res+",id="+resId+"}";
}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-03-12 18:56:13
|
Revision: 2416
http://sourceforge.net/p/swingme/code/2416
Author: yuranet
Date: 2021-03-12 18:56:11 +0000 (Fri, 12 Mar 2021)
Log Message:
-----------
more info about bitmaps
Modified Paths:
--------------
AndroidME/src_MIDP/javax/microedition/lcdui/Image.java
Modified: AndroidME/src_MIDP/javax/microedition/lcdui/Image.java
===================================================================
--- AndroidME/src_MIDP/javax/microedition/lcdui/Image.java 2021-03-12 18:30:59 UTC (rev 2415)
+++ AndroidME/src_MIDP/javax/microedition/lcdui/Image.java 2021-03-12 18:56:11 UTC (rev 2416)
@@ -303,7 +303,15 @@
@Override
public String toString() {
- return "Image{"+bitmap.toString()+"}";
+ return "Image{" +
+ "config=" + bitmap.getConfig() +
+ ", width=" + bitmap.getWidth() +
+ ", height=" + bitmap.getHeight() +
+ ", density=" + bitmap.getDensity() +
+ ", mutable=" + bitmap.isMutable() +
+ ", recycled=" + bitmap.isRecycled() +
+ ", bitmap=" + bitmap.toString() +
+ '}';
}
public static void filter(Image source, Image bm, ColorMatrix cm) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-03-17 22:24:58
|
Revision: 2420
http://sourceforge.net/p/swingme/code/2420
Author: yuranet
Date: 2021-03-17 22:24:56 +0000 (Wed, 17 Mar 2021)
Log Message:
-----------
handle any image dpi Samsung will throw at us
Modified Paths:
--------------
AndroidME/src_MIDP/javax/microedition/lcdui/Image.java
Modified: AndroidME/src_MIDP/javax/microedition/lcdui/Image.java
===================================================================
--- AndroidME/src_MIDP/javax/microedition/lcdui/Image.java 2021-03-16 13:18:32 UTC (rev 2419)
+++ AndroidME/src_MIDP/javax/microedition/lcdui/Image.java 2021-03-17 22:24:56 UTC (rev 2420)
@@ -112,6 +112,8 @@
options.inPreferredConfig = Bitmap.Config.ARGB_8888;
options.inDither = false;
options.inPurgeable = true; // http://www.droidnova.com/2d-sprite-animation-in-android-addendum,505.html
+ options.inScaled = false;
+ options.inSampleSize = 1;
OutOfMemoryError error = null;
try {
@@ -121,6 +123,8 @@
error = e;
buffInput.reset();
buffInput.mark(1024);
+ options.inScaled = true;
+ options.inSampleSize = 0;
bitmap = BitmapFactory.decodeStream(buffInput,null,options);
}
@@ -128,9 +132,16 @@
throw new IOException("BitmapFactory.decodeStream returned null " + stream + " available=" + available + " " + options.outMimeType + " " + options.outWidth + "x" + options.outHeight + " " + error);
}
- // this should always be none or same as display
+ // for testing/emulating loading images at low res as some Samsungs sometimes do
+ //bitmap.setDensity(getTargetDensity() / options.inSampleSize);
+
+ // some Samsungs will scale the image to be smaller (bitmap=315 system=420)
if (bitmap.getDensity() != Bitmap.DENSITY_NONE && bitmap.getDensity() != getTargetDensity()) {
- System.err.println("unexpected bitmap density " + bitmap.getDensity() + " (system=" + getTargetDensity() + ")");
+ int systemDensity = getTargetDensity();
+ int bitmapDensity = bitmap.getDensity();
+ int w = bitmap.getWidth();
+ int h = bitmap.getHeight();
+ System.err.println("changed bitmap density=" + bitmapDensity + " " + w + "x" + h + " (system=" + systemDensity + " " + scaleFromDensity(w, bitmapDensity, systemDensity) + "x" + scaleFromDensity(h, bitmapDensity, systemDensity) + ")");
}
}
return new Image(bitmap);
@@ -290,7 +301,40 @@
}
public void getRGB(int[] rgb, int offset, int scanlength, int x, int y, int width, int height) {
+ final int scanHeight = height;
+
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+ int bitmapDensity = bitmap.getDensity();
+ int systemDensity = getTargetDensity();
+ if (bitmapDensity != Bitmap.DENSITY_NONE && bitmapDensity != systemDensity) {
+ x = scaleFromDensity(x, systemDensity, bitmapDensity);
+ y = scaleFromDensity(y, systemDensity, bitmapDensity);
+ width = scaleFromDensity(width, systemDensity, bitmapDensity);
+ height = scaleFromDensity(height, systemDensity, bitmapDensity);
+
+ // can end up with 0 height because of rounding error
+ if (height == 0) {
+ height = 1;
+ }
+
+ // can end up 1 more then end through rounding error
+ if (y + height == bitmap.getHeight() + 1) {
+ y = bitmap.getHeight() - height;
+ }
+ }
+ }
+
bitmap.getPixels(rgb, offset, scanlength, x, y, width, height);
+
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+ int bitmapDensity = bitmap.getDensity();
+ int systemDensity = getTargetDensity();
+ if (bitmapDensity != Bitmap.DENSITY_NONE && bitmapDensity != systemDensity) {
+ for (int c = offset + scanlength * scanHeight - 1; c >= offset; c--) {
+ rgb[c] = rgb[((c / scanlength) * scanlength) + scaleFromDensity(c % scanlength, systemDensity, bitmapDensity)];
+ }
+ }
+ }
}
public boolean isMutable() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-03-18 20:33:14
|
Revision: 2422
http://sourceforge.net/p/swingme/code/2422
Author: yuranet
Date: 2021-03-18 20:33:12 +0000 (Thu, 18 Mar 2021)
Log Message:
-----------
use stable density, seems to be correct more times
Modified Paths:
--------------
AndroidME/src_MIDP/javax/microedition/lcdui/Image.java
Modified: AndroidME/src_MIDP/javax/microedition/lcdui/Image.java
===================================================================
--- AndroidME/src_MIDP/javax/microedition/lcdui/Image.java 2021-03-18 11:49:40 UTC (rev 2421)
+++ AndroidME/src_MIDP/javax/microedition/lcdui/Image.java 2021-03-18 20:33:12 UTC (rev 2422)
@@ -137,13 +137,20 @@
// some Samsungs will scale the image to be smaller (bitmap=315 system=420)
if (bitmap.getDensity() != Bitmap.DENSITY_NONE && bitmap.getDensity() != getTargetDensity()) {
- int systemDensity = getTargetDensity();
- int bitmapDensity = bitmap.getDensity();
- int w = bitmap.getWidth();
- int h = bitmap.getHeight();
- System.err.println("changed bitmap density=" + bitmapDensity + " " + w + "x" + h + " (system=" + systemDensity + " " + scaleFromDensity(w, bitmapDensity, systemDensity) + "x" + scaleFromDensity(h, bitmapDensity, systemDensity) + ")");
+ System.err.println("unexpected bitmap density=" + bitmap.getDensity() + " (system=" + getTargetDensity()+")");
}
}
+
+ if (bitmap.getDensity() != Bitmap.DENSITY_NONE && bitmap.getDensity() != getTargetDensity()) {
+ int systemDensity = getTargetDensity();
+ int bitmapDensity = bitmap.getDensity();
+ int w = bitmap.getWidth();
+ int h = bitmap.getHeight();
+ System.out.println("bitmap density=" + bitmapDensity + " " + w + "x" + h +
+ " (system=" + systemDensity + " " + scaleFromDensity(w, bitmapDensity, systemDensity) + "x" + scaleFromDensity(h, bitmapDensity, systemDensity) + ")" +
+ " for " + stream);
+ }
+
return new Image(bitmap);
}
@@ -256,10 +263,11 @@
* @see android.graphics.drawable.Drawable#resolveDensity(Resources, int)
*/
static int getTargetDensity() {
- // not really sure in what situations density changes, but lets make sure we scale to current density
- //if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
- // return DisplayMetrics.DENSITY_DEVICE_STABLE;
- //}
+ // since we keep images around from startup, better to use stable density if we can
+ // also on API-26 and API-30 the current density does not seem to match bitmaps density
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+ return DisplayMetrics.DENSITY_DEVICE_STABLE;
+ }
Resources res = AndroidMeApp.getContext().getResources();
final int densityDpi = res.getDisplayMetrics().densityDpi;
return densityDpi == 0 ? DisplayMetrics.DENSITY_DEFAULT : densityDpi;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-03-18 21:25:48
|
Revision: 2424
http://sourceforge.net/p/swingme/code/2424
Author: yuranet
Date: 2021-03-18 21:25:46 +0000 (Thu, 18 Mar 2021)
Log Message:
-----------
allow smaller scanlength
Modified Paths:
--------------
AndroidME/src_MIDP/javax/microedition/lcdui/Image.java
Modified: AndroidME/src_MIDP/javax/microedition/lcdui/Image.java
===================================================================
--- AndroidME/src_MIDP/javax/microedition/lcdui/Image.java 2021-03-18 20:35:01 UTC (rev 2423)
+++ AndroidME/src_MIDP/javax/microedition/lcdui/Image.java 2021-03-18 21:25:46 UTC (rev 2424)
@@ -315,6 +315,9 @@
int bitmapDensity = bitmap.getDensity();
int systemDensity = getTargetDensity();
if (bitmapDensity != Bitmap.DENSITY_NONE && bitmapDensity != systemDensity) {
+ if (scanlength < width) {
+ throw new IllegalArgumentException("scanlength ("+scanHeight+") must be >= width ("+width+")");
+ }
x = scaleFromDensity(x, systemDensity, bitmapDensity);
y = scaleFromDensity(y, systemDensity, bitmapDensity);
width = scaleFromDensity(width, systemDensity, bitmapDensity);
@@ -329,6 +332,15 @@
if (y + height == bitmap.getHeight() + 1) {
y = bitmap.getHeight() - height;
}
+
+ if (scanlength < width) {
+ int[] data = new int[width * height];
+ bitmap.getPixels(data, 0, width, x, y, width, height);
+ for (int c = scanlength * scanHeight - 1; c >= 0; c--) {
+ rgb[offset + c] = data[((c / scanlength) * width) + scaleFromDensity(c % scanlength, systemDensity, bitmapDensity)];
+ }
+ return;
+ }
}
}
@@ -338,8 +350,8 @@
int bitmapDensity = bitmap.getDensity();
int systemDensity = getTargetDensity();
if (bitmapDensity != Bitmap.DENSITY_NONE && bitmapDensity != systemDensity) {
- for (int c = offset + scanlength * scanHeight - 1; c >= offset; c--) {
- rgb[c] = rgb[((c / scanlength) * scanlength) + scaleFromDensity(c % scanlength, systemDensity, bitmapDensity)];
+ for (int c = scanlength * scanHeight - 1; c >= 0; c--) {
+ rgb[offset + c] = rgb[offset + ((c / scanlength) * scanlength) + scaleFromDensity(c % scanlength, systemDensity, bitmapDensity)];
}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-03-18 22:20:08
|
Revision: 2425
http://sourceforge.net/p/swingme/code/2425
Author: yuranet
Date: 2021-03-18 22:20:06 +0000 (Thu, 18 Mar 2021)
Log Message:
-----------
omg this is driving me nuts
Modified Paths:
--------------
AndroidME/src_MIDP/javax/microedition/lcdui/Image.java
Modified: AndroidME/src_MIDP/javax/microedition/lcdui/Image.java
===================================================================
--- AndroidME/src_MIDP/javax/microedition/lcdui/Image.java 2021-03-18 21:25:46 UTC (rev 2424)
+++ AndroidME/src_MIDP/javax/microedition/lcdui/Image.java 2021-03-18 22:20:06 UTC (rev 2425)
@@ -172,6 +172,11 @@
if (bitmap==null) {
throw new OutOfMemoryError("Bitmap.createBitmap returned null for w="+width+" h="+height+" config="+config+" error="+error );
}
+
+ if (bitmap.getDensity() != Bitmap.DENSITY_NONE && bitmap.getDensity() != getTargetDensity()) {
+ System.err.println("unexpected new bitmap density=" + bitmap.getDensity() + " (system=" + getTargetDensity()+")");
+ }
+
return new Image(bitmap);
}
@@ -263,14 +268,18 @@
* @see android.graphics.drawable.Drawable#resolveDensity(Resources, int)
*/
static int getTargetDensity() {
- // since we keep images around from startup, better to use stable density if we can
- // also on API-26 and API-30 the current density does not seem to match bitmaps density
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
- return DisplayMetrics.DENSITY_DEVICE_STABLE;
- }
- Resources res = AndroidMeApp.getContext().getResources();
- final int densityDpi = res.getDisplayMetrics().densityDpi;
- return densityDpi == 0 ? DisplayMetrics.DENSITY_DEFAULT : densityDpi;
+ // on API-29 this returns total rubbish, even on the emulator (display.dpi=480 display.stableDensity=320)
+ //if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+ //return DisplayMetrics.DENSITY_DEVICE_STABLE;
+ //}
+
+ // since we keep images around from startup, better to use density from startup
+ return Integer.parseInt(System.getProperty("display.dpi"));
+
+ // on API-26 and API-30 the current density does not seem to match bitmaps density
+ //Resources res = AndroidMeApp.getContext().getResources();
+ //final int densityDpi = res.getDisplayMetrics().densityDpi;
+ //return densityDpi == 0 ? DisplayMetrics.DENSITY_DEFAULT : densityDpi;
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-03-19 11:44:08
|
Revision: 2428
http://sourceforge.net/p/swingme/code/2428
Author: yuranet
Date: 2021-03-19 11:44:06 +0000 (Fri, 19 Mar 2021)
Log Message:
-----------
more rounding errors handled
Modified Paths:
--------------
AndroidME/src_MIDP/javax/microedition/lcdui/Image.java
Modified: AndroidME/src_MIDP/javax/microedition/lcdui/Image.java
===================================================================
--- AndroidME/src_MIDP/javax/microedition/lcdui/Image.java 2021-03-19 06:54:29 UTC (rev 2427)
+++ AndroidME/src_MIDP/javax/microedition/lcdui/Image.java 2021-03-19 11:44:06 UTC (rev 2428)
@@ -336,11 +336,27 @@
if (height == 0) {
height = 1;
}
+ if (width == 0) {
+ width = 1;
+ }
// can end up 1 more then end through rounding error
if (y + height == bitmap.getHeight() + 1) {
- y = bitmap.getHeight() - height;
+ if (y == 0) {
+ height = bitmap.getHeight();
+ }
+ else {
+ y = bitmap.getHeight() - height;
+ }
}
+ if (x + width == bitmap.getWidth() + 1) {
+ if (x == 0) {
+ width = bitmap.getWidth();
+ }
+ else {
+ x = bitmap.getWidth() - width;
+ }
+ }
if (scanlength < width) {
int[] data = new int[width * height];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-04-02 22:35:59
|
Revision: 2433
http://sourceforge.net/p/swingme/code/2433
Author: yuranet
Date: 2021-04-02 22:35:56 +0000 (Fri, 02 Apr 2021)
Log Message:
-----------
more density logging
Modified Paths:
--------------
AndroidME/src_MIDP/javax/microedition/lcdui/Image.java
Modified: AndroidME/src_MIDP/javax/microedition/lcdui/Image.java
===================================================================
--- AndroidME/src_MIDP/javax/microedition/lcdui/Image.java 2021-03-31 22:36:49 UTC (rev 2432)
+++ AndroidME/src_MIDP/javax/microedition/lcdui/Image.java 2021-04-02 22:35:56 UTC (rev 2433)
@@ -131,9 +131,20 @@
throw new IOException("BitmapFactory.decodeStream returned null " + stream + " available=" + available + " " + options.outMimeType + " " + options.outWidth + "x" + options.outHeight + " " + error);
}
+ int systemDensity = getTargetDensity();
+
+ if (systemDensity == Bitmap.DENSITY_NONE) {
+ // does this ever happen? should we return DisplayMetrics.DENSITY_DEFAULT?
+ System.err.println("startup density is zero");
+ }
+ if (systemDensity != AndroidMeApp.getContext().getResources().getDisplayMetrics().densityDpi) {
+ // on API-26 and API-30 on some Samsungs the current density does not seem to match bitmaps density
+ System.err.println("startup density does not match current density");
+ }
+
// some Samsungs will set density to a random number, so we fix it so it draws correctly
- if (bitmap.getDensity() != Bitmap.DENSITY_NONE && bitmap.getDensity() != getTargetDensity()) {
- int systemDensity = getTargetDensity();
+ if (bitmap.getDensity() != Bitmap.DENSITY_NONE && bitmap.getDensity() != systemDensity) {
+
int bitmapDensity = bitmap.getDensity();
int w = bitmap.getWidth();
int h = bitmap.getHeight();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
