From 09e1e74cd4f68ae2ac992063924a4f39368cb90c Mon Sep 17 00:00:00 2001
From: Egan Ford <datajerk@gmail.com>
Date: Mon, 16 Mar 2020 10:02:24 -0600
Subject: [PATCH] replaced zxing with zbarimg

---
 README.md            | 20 +++++++++++---------
 decodeanddownload.sh | 10 +++++++---
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 87a370e..b8fb1bd 100644
--- a/README.md
+++ b/README.md
@@ -37,9 +37,9 @@ make
 #### Prerequisites
 
 - MacOS
-- Virtual ][
+- Virtual ][ 9.2
 - `curl`
-- `zxing` (<https://github.com/glassechidna/zxing-cpp>)
+- `zbarimg` (Google for `zbar-0.10.tar.bz2`)
 - `tifftopnm` and `pnmtojpeg` from Netpbm (<http://netpbm.sourceforge.net/>)
 - `sox` and `soxi` from SoX (<http://sox.sourceforge.net/>)
 
@@ -48,12 +48,14 @@ make test
 ```
 
 #### Ad Hoc Testing
+
 ```
 ./quick.sh [search string or "random"]
 ./demo.sh [search string or "random"]
 ```
 
 Example Ad Hoc Session:
+
 ```
 $ ./demo.sh alien
 1       Alien Ambush
@@ -72,13 +74,13 @@ Ad hoc example session video output: <http://asciiexpress.net/files/gameservercl
 
 ### Appendix
 
-#### zxing-cpp build
+#### Zbar MacOS Build
 ```
-git clone https://github.com/glassechidna/zxing-cpp
-cd xzing-cpp
-cd build
-cmake -G "Unix Makefiles" ..
-make
-sudo cp zxing /usr/local/bin/
+sudo port install imagemagick qrencode
+tar zxvf zbar-0.10.tar.bz2
+cd zbar-0.10
+./configure --disable-video --without-python --without-gtk --without-qt --with-libiconv-prefix=/opt/local
+make -j
+sudo make install
 ```
 
diff --git a/decodeanddownload.sh b/decodeanddownload.sh
index 9328a99..e190e63 100755
--- a/decodeanddownload.sh
+++ b/decodeanddownload.sh
@@ -1,12 +1,16 @@
 #!/bin/bash
 
-# needs better error handling, zxing returns true on fail, test with Stellar Invaders
-
 set -e
 
 tifftopnm <$1 2>/dev/null | pnmtojpeg >decode.jpg
 
-URL=$(zxing decode.jpg && rm -f decode.jpg)
+# zxing version
+# needs better error handling, zxing returns true on fail, test with Stellar Invaders
+#URL=$(zxing decode.jpg && rm -f decode.jpg)
+
+# zbar version, better
+URL=$(zbarimg -q decode.jpg && rm -f decode.jpg)
+URL=$(echo $URL | sed 's/QR-Code://')
 
 curl -sL $URL | sox - quick.aif