From f7994ba402916c3c24fe7b1193b4eac9ee949bc9 Mon Sep 17 00:00:00 2001
From: srowen <srowen@59b500cc-1b3d-0410-9834-0bbf25fbcc57>
Date: Fri, 28 Mar 2008 16:57:55 +0000
Subject: [PATCH] Updates for 0.6; set aside a different android-m3-home
 variable for android-m3 build

git-svn-id: http://zxing.googlecode.com/svn/trunk@321 59b500cc-1b3d-0410-9834-0bbf25fbcc57
---
 CHANGES              | 21 ++++++++++++++++++++-
 android-m3/build.xml |  6 +++---
 build.properties     |  9 ++++++---
 3 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/CHANGES b/CHANGES
index 94366d8f..c03d6461 100644
--- a/CHANGES
+++ b/CHANGES
@@ -102,4 +102,23 @@
   - First checkin of Data Matrix decoder code. Not yet enabled in reader
     applications.
   - "Result" object now returns raw bytes decoded; maybe useful in some cases
-  - More unit tests for common code, EAN-8, UPC-E
\ No newline at end of file
+  - More unit tests for common code, EAN-8, UPC-E
+
+0.6 (28 Mar 2008)
+  - Updated android client to work on latest M5 SDK; M3-compatiable version
+    preserved in android-m3
+  - Added tel: URL support to clients
+  - Added geo: URL support; only enabled for Android client so far
+  - Added initial support for short NDEF messages, but not yet enabled
+  - Bug fix to corner-case of perspective transformation code
+  - Now attempts to configure camera's exposure controls if available
+  - Fixed rotation transform used in "try harder" mode; result did not
+    contain the whole image
+  - "Try harder" mode tries 2D formats first to avoid false positives
+    in detailed search for 1D codes, in some cases
+  - More aggressive inlining by ProGuard, notable performance boost
+  - Small Reed-Solomon optimizations for 0- and 1-error case
+  - Refactored GridSampler out into common package for use by Data Matrix
+  - GridSampler now smarter about bounds checking and point nudging;
+    should avoid some ArrayIndexOutOfBoundsException issues
+  - More unit tests
diff --git a/android-m3/build.xml b/android-m3/build.xml
index 57b6d537..ad05c46c 100644
--- a/android-m3/build.xml
+++ b/android-m3/build.xml
@@ -20,7 +20,7 @@
      build.xml file. -->
 <project name="BarcodeReader" default="package">
   <property file="../build.properties"/>
-  <property name="sdk-folder" value="${android-home}"/>
+  <property name="sdk-folder" value="${android-m3-home}"/>
   <property name="android-tools" value="${sdk-folder}/tools"/>
 
   <!-- The intermediates directory -->
@@ -58,10 +58,10 @@
 
   <target name="init">
     <tstamp/>
-    <fail message="Please set 'android-home' in build.properties">
+    <fail message="Please set 'android-m3-home' in build.properties">
       <condition>
         <not>
-          <available file="${android-home}" type="dir"/>
+          <available file="${android-m3-home}" type="dir"/>
         </not>
       </condition>
     </fail>
diff --git a/build.properties b/build.properties
index 04b0724e..b6b8b9f3 100644
--- a/build.properties
+++ b/build.properties
@@ -1,4 +1,4 @@
-version=0.5.5
+version=0.6
 
 # Set this to a location where Sun's Wireless Toolkit, version 2.5.2 or later, has been installed
 # Location on Linux varies but is typically under /usr/local or /usr/lib
@@ -22,7 +22,10 @@ version=0.5.5
 
 # Uncomment and set appropriately
 #BB-JDK-home=C:\\Program Files\\Research In Motion\\Blackberry JDE 4.3.0
-#BB-JDK-home=bb-home
+#BB-JDK-home=/usr/local/bb-home
 
 # Set this to the location where you installed the Android SDK.
-#android-home=/usr/local/android
\ No newline at end of file
+#android-home=/usr/local/android
+
+# Set this to the location of an M3 Android SDK, if you are building the M3 version
+#android-m3-home=/usr/local/android
\ No newline at end of file
-- 
2.20.1