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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2013-07-08 01:51:10 +02:00
commit 22ec0bd34a
2 changed files with 4 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/res/values/strings.xml
View file

@ -770,7 +770,6 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
<string name="local_openstreetmap_uploading">Uploading …</string>
<string name="local_openstreetmap_were_uploaded">{0} POI/Bugs were uploaded</string>
<string name="local_openstreetmap_uploadall">Upload all</string>
<string name="local_openstreetmap_items"></string>
<string name="local_openstreetmap_show">Show on map</string>
<string name="local_openstreetmap_upload">Upload modification to OSM</string>
<string name="local_openstreetmap_delete">Delete modification</string>
@ -974,7 +973,6 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
<string name="local_index_address_data">Address data</string>
<string name="local_index_transport_data">Transportation data</string>
<string name="local_index_map_data">Map data</string>
<string name="local_index_items"></string>
<string name="local_indexes_cat_backup">Deactivated</string>
<string name="local_indexes_cat_tts">Voice data (TTS)</string>
<string name="local_indexes_cat_voice">Voice data (recorded)</string>

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

@ -43,13 +43,6 @@ public class RenderingIcons {
return null;
try {
// Bitmap ic = getIcon(ctx, s);
// if(ic == 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];
@ -60,10 +53,10 @@ public class RenderingIcons {
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 " + s +" " + dm.getHeight() + "x" + dm.getWidth());
}
// Bitmap dm = android.graphics.BitmapFactory.decodeByteArray(bitmapData, 0, bitmapData.length) ;
// if(dm != null){
// System.out.println("IC " + s +" " + dm.getHeight() + "x" + dm.getWidth());
// }
//if(android.graphics.BitmapFactory.decodeByteArray(bitmapData, 0, bitmapData.length) == null)
// throw new Exception();
return bitmapData;