Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix icon rendering

Browse source
This commit is contained in:
Victor Shcherb 2013-07-07 16:40:02 +02:00
parent daa0d913f7
commit 8ebf3870c8
1 changed files with 25 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
OsmAnd/src/net/osmand/plus/render/RenderingIcons.java
View file

@ -1,7 +1,8 @@
package net.osmand.plus.render; package net.osmand.plus.render;
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.nio.ByteBuffer;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.Map; import java.util.Map;
@ -42,30 +43,30 @@ public class RenderingIcons {
return null; return null;
try { try {
Bitmap ic = getIcon(ctx, s); // Bitmap ic = getIcon(ctx, s);
if(ic == null) { // if(ic == null) {
return null; // return null;
// }
// ByteBuffer buf = ByteBuffer.allocate(ic.getByteCount());
// ic.copyPixelsToBuffer(buf);
// return buf.array();
final InputStream inputStream = ctx.getResources().openRawResource(resId.intValue());
final ByteArrayOutputStream proxyOutputStream = new ByteArrayOutputStream(1024);
final byte[] ioBuffer = new byte[1024];
int bytesRead;
while ((bytesRead = inputStream.read(ioBuffer)) >= 0) {
proxyOutputStream.write(ioBuffer, 0, bytesRead);
} }
ByteBuffer buf = ByteBuffer.allocate(ic.getByteCount()); inputStream.close();
ic.copyPixelsToBuffer(buf); final byte[] bitmapData = proxyOutputStream.toByteArray();
return buf.array(); log.info("Icon data length is " + bitmapData.length); //$NON-NLS-1$
// final InputStream inputStream = ctx.getResources().openRawResource(resId.intValue()); Bitmap dm = android.graphics.BitmapFactory.decodeByteArray(bitmapData, 0, bitmapData.length) ;
// final ByteArrayOutputStream proxyOutputStream = new ByteArrayOutputStream(1024); if(dm != null){
// final byte[] ioBuffer = new byte[1024]; System.out.println("IC " + dm.getHeight() + " " + dm.getWidth());
// int bytesRead; }
// while ((bytesRead = inputStream.read(ioBuffer)) >= 0) { //if(android.graphics.BitmapFactory.decodeByteArray(bitmapData, 0, bitmapData.length) == null)
// proxyOutputStream.write(ioBuffer, 0, bytesRead); // throw new Exception();
// } return bitmapData;
// inputStream.close();
// final byte[] bitmapData = proxyOutputStream.toByteArray();
// log.info("Icon data length is " + bitmapData.length); //$NON-NLS-1$
// Bitmap dm = android.graphics.BitmapFactory.decodeByteArray(bitmapData, 0, bitmapData.length) ;
// if(dm != null){
// System.out.println("IC " + dm.getHeight() + " " + dm.getWidth());
// }
// //if(android.graphics.BitmapFactory.decodeByteArray(bitmapData, 0, bitmapData.length) == null)
// // throw new Exception();
// return bitmapData;
} catch(Throwable e) { } catch(Throwable e) {
log.error("Failed to get byte stream from icon", e); //$NON-NLS-1$ log.error("Failed to get byte stream from icon", e); //$NON-NLS-1$
return null; return null;