generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

working on cleaning up the android port - trying to fix the distortion coefficients bug

Browse Source
This commit is contained in:
Ethan Rublee 2010-10-12 02:23:08 +00:00
parent 2f859a8652
commit 525da9ef01
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
android/android-jni/Makefile
View File

@ -1,7 +1,7 @@
# The path to the NDK, requires crystax version r-4 for now, due to support # The path to the NDK, requires crystax version r-4 for now, due to support
#for the standard library # for the standard library
#load environment from local make file # load environment from local make file
LOCAL_ENV_MK=local.env.mk LOCAL_ENV_MK=local.env.mk
ifneq "$(wildcard $(LOCAL_ENV_MK))" "" ifneq "$(wildcard $(LOCAL_ENV_MK))" ""
include $(LOCAL_ENV_MK) include $(LOCAL_ENV_MK)
@ -9,8 +9,7 @@ else
$(shell cp sample.$(LOCAL_ENV_MK) $(LOCAL_ENV_MK)) $(shell cp sample.$(LOCAL_ENV_MK) $(LOCAL_ENV_MK))
$(info ERROR local environement not setup! try:) $(info ERROR local environement not setup! try:)
$(info gedit $(LOCAL_ENV_MK)) $(info gedit $(LOCAL_ENV_MK))
$(info Please setup the $(LOCAL_ENV_MK) - the default was just created') $(error Please setup the $(LOCAL_ENV_MK) - the default was just created')
include $(LOCAL_ENV_MK)
endif endif
ANDROID_NDK_BASE = $(ANDROID_NDK_ROOT) ANDROID_NDK_BASE = $(ANDROID_NDK_ROOT)

2
android/android-jni/jni/Calibration.cpp
View File

@ -69,7 +69,7 @@ bool runCalibration(vector<vector<Point2f> > imagePoints,
if (flags & CV_CALIB_FIX_ASPECT_RATIO) if (flags & CV_CALIB_FIX_ASPECT_RATIO)
cameraMatrix.at<double> (0, 0) = aspectRatio; cameraMatrix.at<double> (0, 0) = aspectRatio;
distCoeffs = Mat::zeros(5, 1, CV_64F); distCoeffs = Mat::zeros(4, 1, CV_64F);
vector<vector<Point3f> > objectPoints(1); vector<vector<Point3f> > objectPoints(1);
calcChessboardCorners(boardSize, squareSize, objectPoints[0]); calcChessboardCorners(boardSize, squareSize, objectPoints[0]);

4
android/android-jni/project_create.sh Executable file
View File

@ -0,0 +1,4 @@
#!/bin/sh
#this generates an ant based cli build of the android-jni project
android update project --name android-opencv \
--path .