Adding color as default for CameraConfig, and updating the README.txt

diff --git a/android/android-jni/README.txt b/android/android-jni/README.txt
index 5e90975..36eb32a 100644 (file)
--- a/android/android-jni/README.txt
+++ b/android/android-jni/README.txt
@@ -34,4 +34,8 @@ code. See Calibration or CVCamera in the opencv/android/apps directory
 With cdt installed in eclipse, you may also "convert to C++ project" once you have
 opened this as an android project. Select makefile project->toolchain other to do this.
 
+Eclipse tip of the day:
+You may get build warnings when linking to the project, complainging about duplicate something
+or other in you .svn directories.  Right click project->settings->java build path->source->excude paths->add
+.svn/ and **/.svn/ should do it ;)
     

diff --git a/android/android-jni/sample.local.env.mk b/android/android-jni/sample.local.env.mk
index 74fbcdb..5a34cc7 100644 (file)
--- a/android/android-jni/sample.local.env.mk
+++ b/android/android-jni/sample.local.env.mk
@@ -6,4 +6,5 @@ OPENCV_CONFIG=../build/android-opencv.mk
 #you can download the ndk from http://www.crystax.net/android/ndk-r4.php
 ANDROID_NDK_ROOT=$(HOME)/android-ndk-r4-crystax
 
+#define only armeabi-v7a to make the final apk smaller or armeabi
 ARM_TARGETS=armeabi armeabi-v7a
\ No newline at end of file

diff --git a/android/android-jni/src/com/opencv/camera/CameraConfig.java b/android/android-jni/src/com/opencv/camera/CameraConfig.java
index 77f4e60..6befd4e 100644 (file)
--- a/android/android-jni/src/com/opencv/camera/CameraConfig.java
+++ b/android/android-jni/src/com/opencv/camera/CameraConfig.java
@@ -24,7 +24,7 @@ public class CameraConfig extends Activity {
                // Restore preferences
                SharedPreferences settings = ctx.getSharedPreferences(CAMERA_SETTINGS,
                                0);
-               int mode = settings.getInt(CAMERA_MODE, CAMERA_MODE_BW);
+               int mode = settings.getInt(CAMERA_MODE, CAMERA_MODE_COLOR);
                return mode;
        }
 
@@ -52,7 +52,7 @@ public class CameraConfig extends Activity {
                SharedPreferences settings = ctx.getSharedPreferences(CAMERA_SETTINGS,
                                0);
                size[0] = settings.getInt(IMAGE_WIDTH, 600);
-               size[1] = settings.getInt(IMAGE_HEIGHT, 600);
+               size[1] = settings.getInt(IMAGE_HEIGHT, 400);
 
        }