[SCM] Multi-format 1D/2D barcode image processing library branch, upstream, updated. 24d4480bc48cf9eabf7b2bd2f528248b0e458809

[srowen]

The following commit has been merged in the upstream branch:
commit 95dcb86e4d9766e82334fa947980f538a95343d9
Author: srowen <srowen at 59b500cc-1b3d-0410-9834-0bbf25fbcc57>
Date:   Sat May 15 11:28:01 2010 +0000

    Reinstate more optimization, but avoid disagreement with dex by properly disabling the controversial optimizations: field and method merging, mostly
    
    git-svn-id: http://zxing.googlecode.com/svn/trunk@1365 59b500cc-1b3d-0410-9834-0bbf25fbcc57

diff --git a/android/build.xml b/android/build.xml
index d619e40..fa683d6 100644
--- a/android/build.xml
+++ b/android/build.xml
@@ -202,11 +202,9 @@ limitations under the License.
       <arg value="-keep class com.google.zxing.client.android.*Activity"/>
       <arg value="-keep class com.google.zxing.client.android.ViewfinderView { public * ; }"/>
       <arg value="-keep class com.google.zxing.client.android.book.SearchBookContents* { public * ; }"/>
-      <!-- This works around some strange Android/ProGuard problem verifying MaskUtil -->
-      <arg value="-keep class com.google.zxing.qrcode.encoder.MaskUtil { public * ; }"/>
       <arg value="-target 5"/>
-      <!-- Keeping this low also avoids some weird Android/ProGuard issue I couldn't resolve otherwise --> 
-      <arg value="-optimizationpasses 2"/>
+      <arg value="-optimizationpasses 5"/>
+      <arg value="-optimizations !field/*,!class/merging/*"/> <!-- works around dex VerifyError -->
       <arg value="-dontshrink"/>
       <arg value="-dontobfuscate"/>
       <arg value="-dontskipnonpubliclibraryclasses"/>

-- 
Multi-format 1D/2D barcode image processing library