From 9037004f22033e0fc8cd5c14d6285e5fd540ce10 Mon Sep 17 00:00:00 2001 From: a1346054 <36859588+a1346054@users.noreply.github.com> Date: Tue, 7 Sep 2021 08:03:36 +0000 Subject: [PATCH] Several files: fix whitespace * trim trailing whitespace * trim excess whitespace * indentation Signed-off-by: Mauro Carvalho Chehab --- .github/workflows/ci.yml | 1 - ChangeLog | 2 +- HACKING.md | 12 ++++++------ android/AndroidManifest.xml | 2 +- android/README | 10 ++++------ android/build-ndk.xml | 3 +-- android/examples/CameraTest/AndroidManifest.xml | 2 +- android/examples/CameraTest/res/layout/main.xml | 2 +- .../zbar/android/CameraTest/CameraPreview.java | 4 ++-- .../zbar/android/CameraTest/CameraTestActivity.java | 8 ++++---- android/jni/Android.mk | 6 +++--- android/res/layout/main.xml | 6 +++--- doc/doxygen.conf.in | 4 ++-- include/zbar/zbargtk.h | 2 +- 14 files changed, 30 insertions(+), 34 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 102e7c5..12033db 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -154,7 +154,6 @@ jobs: # # Mac OS # - Mac_OS: name: Mac OS runs-on: macos-latest diff --git a/ChangeLog b/ChangeLog index 79e0abf..5a68b52 100644 --- a/ChangeLog +++ b/ChangeLog @@ -709,7 +709,7 @@ version 0.2: - moved EAN/UPC specific decoding into it's own module * fix confusing configure behavior which quietly avoided building targets with missing dependencies(?!) - configure will now fail with a descriptive error message if you + configure will now fail with a descriptive error message if you do not have Magick++ and fail to specify --without-imagemagick or do not have SDL and fail to specify --without-sdl * add configure summary describing what will be built (req #1698196) diff --git a/HACKING.md b/HACKING.md index 1357502..67d7f9f 100644 --- a/HACKING.md +++ b/HACKING.md @@ -30,16 +30,18 @@ get it from Github, use: autoreconf -vfi This will generate ./configure and all that other foo you usually get with -a release. You will need to have recent versions of some basic "developer +a release. You will need to have recent versions of some basic "developer tools" installed in order for this to work, particularly GNU autotools. These versions of autotools are known to work (newer versions should also be fine): + GNU autoconf 2.61 GNU automake 1.10.1 GNU libtool 2.2.6 GNU gettext 0.18.1.1 GNU pkg-config 0.25 xmlto 0.0.20-5 (for docs building) + All above mentioned tools (except xmlto) must be installed in the same prefix. Mixing prefixes (e.g. /usr/bin and /usr/local/bin) may lead to errors in configuration stages. @@ -72,7 +74,7 @@ patches and then push again to your clone, asking the patch merge using the GUI. Although we prefer if you submit patches via either Github or -Gitlab, you can also submit them via e-mail to: +Gitlab, you can also submit them via e-mail to: linux-media@vger.kernel.org @@ -80,11 +82,9 @@ If you opt to do so, please place [PATCH ZBar] at the subject of your e-mails for us to not mix them with patches for the Kernel or for other media tools. +To make your patch, run: - To make your patch, run: - - git diff > hacked.patch - + git diff > hacked.patch Other things for you to read, in order to know more about how to submit your work for upstreaming processes in general, that diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index a6d44d4..f497968 100644 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -12,4 +12,4 @@ - + diff --git a/android/README b/android/README index 392cdf8..c253110 100644 --- a/android/README +++ b/android/README @@ -51,7 +51,7 @@ Option 2 - via Eclipse Click the check box next to "libs" and the "Options" "Create top-level folder" check box (below). Then click "Finish". - + You should then see a "libs" folder under your project. Building @@ -61,7 +61,7 @@ Via Eclipse You have to add the zbar.jar file to your build path 1) select zbar.jar under libs 2) right-click, select "Build Path" -> "Add to Build Path" - + Via command-line You are all set; ant will automatically find jar files under the "libs" subdirectory. @@ -88,7 +88,7 @@ ZBar image scanner with the camera. Manually building ZBar JNI library ---------------------------------- -First download and unzip the iconv library source from +First download and unzip the iconv library source from http://www.gnu.org/software/libiconv/ Then kick off the build from the ZBar android directory. You will @@ -96,7 +96,7 @@ need to run the android tools to setup the local.properties file which setups sdk.dir. 1) cd /android - 2) android update project --path . + 2) android update project --path . 3) ant -Dndk.dir= -Diconv.src= zbar-all This will rebuild all source files, create zbar.jar and @@ -108,5 +108,3 @@ To clean run: ant -Dndk.dir= zbar-clean See build-ndk.xml for additional target options. - - diff --git a/android/build-ndk.xml b/android/build-ndk.xml index 7e535a7..938afa4 100644 --- a/android/build-ndk.xml +++ b/android/build-ndk.xml @@ -1,4 +1,4 @@ -