mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2025-02-02 05:41:08 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

some cleanup of the old magick stuff to make diffing with the new stuff easier

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@2641 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
smparkes@smparkes.net 2013-04-09 04:53:28 +00:00
parent 23cceabba0
commit 2360d41904
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cpp/blackboxtest.sh
View file

@ -1,4 +1,4 @@
#!/bin/sh
#!/usr/bin/env bash
blackboxpath="../core/test/data/blackbox"

11
cpp/magick/src/main.cpp
View file

@ -123,7 +123,7 @@ int test_image(Image& image, bool hybrid, string expected = "") {
}
}
if (raw_dump && !hybrid) {/* don't print twice, and global is a bit better */
if (res == 0) {
cout << cell_result;
if (show_format) {
cout << " " << result_format;
@ -304,7 +304,12 @@ int main(int argc, char** argv) {
int gresult = 1;
int hresult = 1;
hresult = test_image_hybrid(image, expected);
gresult = test_image_global(image, expected);
if (!raw_dump || hresult != 0) {
gresult = test_image_global(image, expected);
if (raw_dump && gresult != 0) {
cout << "decoding failed" << endl;
}
}
gresult = gresult == 0;
hresult = hresult == 0;
@ -324,5 +329,3 @@ int main(int argc, char** argv) {
return 0;
}