github/cordova-android
github/cordova-android
3
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2025-02-27 04:33:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cordova-android into CordovaWebView

Browse Source
This commit is contained in:
Joe Bowser 2012-06-05 10:05:36 -07:00
commit c8af154205
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
framework/src/org/apache/cordova/Capture.java
View File

@ -156,9 +156,10 @@ public class Capture extends Plugin {
* @throws JSONException * @throws JSONException
*/ */
private JSONObject getImageData(String filePath, JSONObject obj) throws JSONException { private JSONObject getImageData(String filePath, JSONObject obj) throws JSONException {
Bitmap bitmap = BitmapFactory.decodeFile(filePath); Bitmap bitmap = BitmapFactory.decodeFile(FileUtils.stripFileProtocol(filePath));
obj.put("height", bitmap.getHeight()); obj.put("height", bitmap.getHeight());
obj.put("width", bitmap.getWidth()); obj.put("width", bitmap.getWidth());
bitmap.recycle();
return obj; return obj;
} }

2
framework/src/org/apache/cordova/FileUtils.java
View File

@ -743,7 +743,7 @@ public class FileUtils extends Plugin {
* @param filePath to be checked. * @param filePath to be checked.
* @return * @return
*/ */
private String stripFileProtocol(String filePath) { public static String stripFileProtocol(String filePath) {
if (filePath.startsWith("file://")) { if (filePath.startsWith("file://")) {
filePath = filePath.substring(7); filePath = filePath.substring(7);
} }