xiaoyan159/vtm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Do not catch graphics exception too early (#413)

Browse Source
This commit is contained in:
Andrey Novikov
2017-09-27 13:54:05 +03:00
committed by Emux
parent 75c2841a13
commit 4a848cc08c
8 changed files with 36 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
vtm/src/org/oscim/backend/CanvasAdapter.java
View File

@@ -111,9 +111,9 @@ public abstract class CanvasAdapter {
* @param inputStream the input stream
* @return the bitmap
*/
protected abstract Bitmap decodeBitmapImpl(InputStream inputStream);
protected abstract Bitmap decodeBitmapImpl(InputStream inputStream) throws IOException;
public static Bitmap decodeBitmap(InputStream inputStream) {
public static Bitmap decodeBitmap(InputStream inputStream) throws IOException {
return g.decodeBitmapImpl(inputStream);
}
@@ -123,9 +123,9 @@ public abstract class CanvasAdapter {
* @param inputStream the input stream
* @return the SVG bitmap
*/
protected abstract Bitmap decodeSvgBitmapImpl(InputStream inputStream, int width, int height, int percent);
protected abstract Bitmap decodeSvgBitmapImpl(InputStream inputStream, int width, int height, int percent) throws IOException;
public static Bitmap decodeSvgBitmap(InputStream inputStream, int width, int height, int percent) {
public static Bitmap decodeSvgBitmap(InputStream inputStream, int width, int height, int percent) throws IOException {
return g.decodeSvgBitmapImpl(inputStream, width, height, percent);
}
@@ -136,13 +136,13 @@ public abstract class CanvasAdapter {
* @param src the resource
* @return the bitmap
*/
protected abstract Bitmap loadBitmapAssetImpl(String relativePathPrefix, String src, int width, int height, int percent);
protected abstract Bitmap loadBitmapAssetImpl(String relativePathPrefix, String src, int width, int height, int percent) throws IOException;
public static Bitmap getBitmapAsset(String relativePathPrefix, String src) {
public static Bitmap getBitmapAsset(String relativePathPrefix, String src) throws IOException {
return getBitmapAsset(relativePathPrefix, src, 0, 0, 100);
}
public static Bitmap getBitmapAsset(String relativePathPrefix, String src, int width, int height, int percent) {
public static Bitmap getBitmapAsset(String relativePathPrefix, String src, int width, int height, int percent) throws IOException {
return g.loadBitmapAssetImpl(relativePathPrefix, src, width, height, percent);
}

4
vtm/src/org/oscim/theme/XmlMapsforgeThemeBuilder.java
View File

@@ -1039,7 +1039,7 @@ public class XmlMapsforgeThemeBuilder extends DefaultHandler {
try {
b.bitmap = CanvasAdapter.getBitmapAsset(mTheme.getRelativePathPrefix(), symbol, b.symbolWidth, b.symbolHeight, b.symbolPercent);
} catch (Exception e) {
log.debug(e.getMessage());
log.error("{}: {}", symbol, e.getMessage());
}
} else
b.texture = getAtlasRegion(symbol);
@@ -1132,7 +1132,7 @@ public class XmlMapsforgeThemeBuilder extends DefaultHandler {
if (bitmap != null)
return buildSymbol(b, src, bitmap);
} catch (Exception e) {
log.debug(e.getMessage());
log.error("{}: {}", src, e.getMessage());
}
return null;
}

4
vtm/src/org/oscim/theme/XmlThemeBuilder.java
View File

@@ -1016,7 +1016,7 @@ public class XmlThemeBuilder extends DefaultHandler {
try {
b.bitmap = CanvasAdapter.getBitmapAsset(mTheme.getRelativePathPrefix(), symbol, b.symbolWidth, b.symbolHeight, b.symbolPercent);
} catch (Exception e) {
log.debug(e.getMessage());
log.error("{}: {}", symbol, e.getMessage());
}
} else
b.texture = getAtlasRegion(symbol);
@@ -1109,7 +1109,7 @@ public class XmlThemeBuilder extends DefaultHandler {
if (bitmap != null)
return buildSymbol(b, src, bitmap);
} catch (Exception e) {
log.debug(e.getMessage());
log.error("{}: {}", src, e.getMessage());
}
return null;
}

2
vtm/src/org/oscim/utils/Utils.java
View File

@@ -61,7 +61,7 @@ public final class Utils {
return new TextureItem(bitmap, true);
}
} catch (Exception e) {
log.debug("missing file / {}", e.getMessage());
log.error("{}: missing file / {}", src, e.getMessage());
}
return null;
}