Several files: fix whitespace
* trim trailing whitespace * trim excess whitespace * indentation Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
This commit is contained in:
a1346054
Mauro Carvalho Chehab
parent
7758ff6fab
commit
9037004f22
1
.github/workflows/ci.yml
vendored
1
.github/workflows/ci.yml
vendored
@ -154,7 +154,6 @@ jobs:
|
||||
#
|
||||
# Mac OS
|
||||
#
|
||||
|
||||
Mac_OS:
|
||||
name: Mac OS
|
||||
runs-on: macos-latest
|
||||
|
||||
@ -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)
|
||||
|
||||
12
HACKING.md
12
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
|
||||
|
||||
@ -12,4 +12,4 @@
|
||||
</intent-filter>
|
||||
</activity>
|
||||
</application>
|
||||
</manifest>
|
||||
</manifest>
|
||||
|
||||
@ -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 <zbar project>/android
|
||||
2) android update project --path .
|
||||
2) android update project --path .
|
||||
3) ant -Dndk.dir=<NDK path> -Diconv.src=<iconv library src> zbar-all
|
||||
|
||||
This will rebuild all source files, create zbar.jar and
|
||||
@ -108,5 +108,3 @@ To clean run:
|
||||
ant -Dndk.dir=<NDK path> zbar-clean
|
||||
|
||||
See build-ndk.xml for additional target options.
|
||||
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
<!--
|
||||
<!--
|
||||
Ant build file to compile the ZBar JNI files using Android NDK tool
|
||||
targets:
|
||||
zbar-clean - removes build generated files, build dir, jar and zip files
|
||||
@ -63,4 +63,3 @@ targets:
|
||||
</zip>
|
||||
</target>
|
||||
</project>
|
||||
|
||||
|
||||
@ -16,4 +16,4 @@
|
||||
</intent-filter>
|
||||
</activity>
|
||||
</application>
|
||||
</manifest>
|
||||
</manifest>
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
<TextView
|
||||
android:id="@+id/scanText"
|
||||
android:text="Scanning..."
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="match_parent">
|
||||
</TextView>
|
||||
<Button
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
/*
|
||||
* Barebones implementation of displaying camera preview.
|
||||
*
|
||||
*
|
||||
* Created by lisah0 on 2012-02-24
|
||||
*/
|
||||
package net.sourceforge.zbar.android.CameraTest;
|
||||
@ -39,7 +39,7 @@ public class CameraPreview extends SurfaceView implements SurfaceHolder.Callback
|
||||
previewCallback = previewCb;
|
||||
autoFocusCallback = autoFocusCb;
|
||||
|
||||
/*
|
||||
/*
|
||||
* Set camera to continuous focus if supported, otherwise use
|
||||
* software auto-focus. Only works for API level >=9.
|
||||
*/
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/*
|
||||
* Basic no frills app which integrates the ZBar barcode scanner with
|
||||
* the camera.
|
||||
*
|
||||
*
|
||||
* Created by lisah0 on 2012-02-24
|
||||
*/
|
||||
package net.sourceforge.zbar.android.CameraTest;
|
||||
@ -52,7 +52,7 @@ public class CameraTestActivity extends Activity
|
||||
|
||||
static {
|
||||
System.loadLibrary("iconv");
|
||||
}
|
||||
}
|
||||
|
||||
public void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
@ -131,12 +131,12 @@ public class CameraTestActivity extends Activity
|
||||
barcode.setData(data);
|
||||
|
||||
int result = scanner.scanImage(barcode);
|
||||
|
||||
|
||||
if (result != 0) {
|
||||
previewing = false;
|
||||
mCamera.setPreviewCallback(null);
|
||||
mCamera.stopPreview();
|
||||
|
||||
|
||||
SymbolSet syms = scanner.getResults();
|
||||
for (Symbol sym : syms) {
|
||||
scanText.setText("barcode result " + sym.getData());
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# Android NDK makefile
|
||||
# Android NDK makefile
|
||||
#
|
||||
# build - <ndk path>/ndk-build ICONV_SRC=<iconv library src>
|
||||
# build - <ndk path>/ndk-build ICONV_SRC=<iconv library src>
|
||||
# clean - <ndk path>/ndk-build clean
|
||||
#
|
||||
MY_LOCAL_PATH := $(call my-dir)
|
||||
@ -69,7 +69,7 @@ LOCAL_SRC_FILES := ../../java/zbarjni.c \
|
||||
|
||||
LOCAL_C_INCLUDES := ../include \
|
||||
../zbar \
|
||||
$(ICONV_SRC)/include
|
||||
$(ICONV_SRC)/include
|
||||
|
||||
LOCAL_SHARED_LIBRARIES := libiconv
|
||||
|
||||
|
||||
@ -4,9 +4,9 @@
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent"
|
||||
>
|
||||
<TextView
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
<TextView
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Hello World, ACTIVITY_ENTRY_NAME"
|
||||
/>
|
||||
</LinearLayout>
|
||||
|
||||
@ -34,6 +34,6 @@ WARN_IF_UNDOCUMENTED = YES
|
||||
WARN_IF_DOC_ERROR = YES
|
||||
|
||||
GENERATE_XML = YES
|
||||
HTML_HEADER =
|
||||
HTML_HEADER =
|
||||
HTML_FOOTER = @top_srcdir@/doc/api/footer.html
|
||||
HTML_STYLESHEET =
|
||||
HTML_STYLESHEET =
|
||||
|
||||
@ -125,7 +125,7 @@ struct _ZBarGtkClass {
|
||||
* @widget: the object that received the signal
|
||||
* @symbol_type: the type of symbol decoded (a zbar_symbol_type_t)
|
||||
* @data: the data decoded from the symbol
|
||||
*
|
||||
*
|
||||
* emitted when a barcode is decoded from an image.
|
||||
* the symbol type and contained data are provided as separate
|
||||
* parameters
|
||||
|
||||
Loading…
Reference in New Issue
Block a user