Java API: corrected names of methods in Utils class; fixed bug in DMatch (thank for Hussein Abdinoor); added new utility method loadResource
Andrey Kamaev
14 years ago
parent
13e392763b
commit
d9d74678a9
11 changed files with 125 additions and 76 deletions
@ -1,62 +1,92 @@ |
||||
package org.opencv.android; |
||||
|
||||
import org.opencv.core.CvException; |
||||
import org.opencv.core.Mat; |
||||
|
||||
import java.io.File; |
||||
import java.io.FileOutputStream; |
||||
import java.io.IOException; |
||||
import java.io.InputStream; |
||||
|
||||
import android.content.Context; |
||||
import android.graphics.Bitmap; |
||||
|
||||
public class Utils { |
||||
|
||||
public static String ExportResource(Context context, int resourceId) { |
||||
return ExportResource(context, resourceId, "OpenCV_data"); |
||||
} |
||||
|
||||
public static String ExportResource(Context context, int resourceId, String dirname) { |
||||
String fullname = context.getResources().getString(resourceId); |
||||
String resName = fullname.substring(fullname.lastIndexOf("/") + 1); |
||||
try { |
||||
InputStream is = context.getResources().openRawResource(resourceId); |
||||
File resDir = context.getDir(dirname, Context.MODE_PRIVATE); |
||||
File resFile = new File(resDir, resName); |
||||
|
||||
FileOutputStream os = new FileOutputStream(resFile); |
||||
|
||||
byte[] buffer = new byte[4096]; |
||||
int bytesRead; |
||||
while ((bytesRead = is.read(buffer)) != -1) { |
||||
os.write(buffer, 0, bytesRead); |
||||
} |
||||
is.close(); |
||||
os.close(); |
||||
|
||||
return resFile.getAbsolutePath(); |
||||
} catch (IOException e) { |
||||
e.printStackTrace(); |
||||
throw new CvException("Failed to export resource " + resName |
||||
+ ". Exception thrown: " + e); |
||||
} |
||||
} |
||||
|
||||
public static Mat BitmapToMat(Bitmap b) { |
||||
return new Mat(nBitmapToMat(b)); |
||||
} |
||||
|
||||
public static boolean MatToBitmap(Mat m, Bitmap b) { |
||||
return nMatToBitmap(m.nativeObj, b); |
||||
} |
||||
|
||||
// native stuff
|
||||
static { |
||||
System.loadLibrary("opencv_java"); |
||||
} |
||||
|
||||
private static native long nBitmapToMat(Bitmap b); |
||||
|
||||
private static native boolean nMatToBitmap(long m, Bitmap b); |
||||
} |
||||
package org.opencv.android; |
||||
|
||||
import android.content.Context; |
||||
import android.graphics.Bitmap; |
||||
|
||||
import org.opencv.core.CvException; |
||||
import org.opencv.core.CvType; |
||||
import org.opencv.core.Mat; |
||||
import org.opencv.highgui.Highgui; |
||||
|
||||
import java.io.ByteArrayOutputStream; |
||||
import java.io.File; |
||||
import java.io.FileOutputStream; |
||||
import java.io.IOException; |
||||
import java.io.InputStream; |
||||
|
||||
public class Utils { |
||||
|
||||
public static String exportResource(Context context, int resourceId) { |
||||
return exportResource(context, resourceId, "OpenCV_data"); |
||||
} |
||||
|
||||
public static String exportResource(Context context, int resourceId, String dirname) { |
||||
String fullname = context.getResources().getString(resourceId); |
||||
String resName = fullname.substring(fullname.lastIndexOf("/") + 1); |
||||
try { |
||||
InputStream is = context.getResources().openRawResource(resourceId); |
||||
File resDir = context.getDir(dirname, Context.MODE_PRIVATE); |
||||
File resFile = new File(resDir, resName); |
||||
|
||||
FileOutputStream os = new FileOutputStream(resFile); |
||||
|
||||
byte[] buffer = new byte[4096]; |
||||
int bytesRead; |
||||
while ((bytesRead = is.read(buffer)) != -1) { |
||||
os.write(buffer, 0, bytesRead); |
||||
} |
||||
is.close(); |
||||
os.close(); |
||||
|
||||
return resFile.getAbsolutePath(); |
||||
} catch (IOException e) { |
||||
e.printStackTrace(); |
||||
throw new CvException("Failed to export resource " + resName |
||||
+ ". Exception thrown: " + e); |
||||
} |
||||
} |
||||
|
||||
public static Mat loadResource(Context context, int resourceId) throws IOException |
||||
{ |
||||
return loadResource(context, resourceId, -1); |
||||
} |
||||
|
||||
public static Mat loadResource(Context context, int resourceId, int flags) throws IOException |
||||
{ |
||||
InputStream is = context.getResources().openRawResource(resourceId); |
||||
ByteArrayOutputStream os = new ByteArrayOutputStream(is.available()); |
||||
|
||||
byte[] buffer = new byte[4096]; |
||||
int bytesRead; |
||||
while ((bytesRead = is.read(buffer)) != -1) { |
||||
os.write(buffer, 0, bytesRead); |
||||
} |
||||
is.close(); |
||||
|
||||
Mat encoded = new Mat(1, os.size(), CvType.CV_8U); |
||||
encoded.put(0, 0, os.toByteArray()); |
||||
os.close(); |
||||
|
||||
Mat decoded = Highgui.imdecode(encoded, flags); |
||||
encoded.release(); |
||||
|
||||
return decoded; |
||||
} |
||||
|
||||
public static Mat bitmapToMat(Bitmap b) { |
||||
return new Mat(nBitmapToMat(b)); |
||||
} |
||||
|
||||
public static boolean matToBitmap(Mat m, Bitmap b) { |
||||
return nMatToBitmap(m.nativeObj, b); |
||||
} |
||||
|
||||
// native stuff
|
||||
static { |
||||
System.loadLibrary("opencv_java"); |
||||
} |
||||
|
||||
private static native long nBitmapToMat(Bitmap b); |
||||
|
||||
private static native boolean nMatToBitmap(long m, Bitmap b); |
||||
} |
||||
|
||||
Loading…
Reference in new issue