From a2b1358580105547fecf2158f272d00f7de9538a Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Thu, 8 Apr 2021 09:35:40 +0900 Subject: [PATCH 1/3] README.md: Update for quirc-demo-opencv --- README.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/README.md b/README.md index 7d79121..3b370e5 100644 --- a/README.md +++ b/README.md @@ -40,6 +40,13 @@ displayed on the image and printed on stdout. This requires SDL and V4L2. +### quirc-demo-opencv + +A demo similar to `quirc-demo`. +But this version uses OpenCV instead of other libraries. + +This requires OpenCV. + ### quirc-scanner This program turns your camera into a barcode scanner. It's almost the same as @@ -81,6 +88,7 @@ are unable to build everything: * inspect * quirc-scanner * quirc-demo +* quirc-demo-opencv Library use ----------- From ef1b97015ed6679bebc03334229faad5647b23ff Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Thu, 8 Apr 2021 09:39:44 +0900 Subject: [PATCH 2/3] Makefile: quirc-demo-opencv doesn't use libjpeg --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 8677978..2fc4a14 100644 --- a/Makefile +++ b/Makefile @@ -51,7 +51,7 @@ quirc-demo: $(DEMO_OBJ) $(DEMO_UTIL_OBJ) demo/demo.o libquirc.a $(CC) -o $@ $(DEMO_OBJ) $(DEMO_UTIL_OBJ) demo/demo.o libquirc.a $(LDFLAGS) -lm -ljpeg $(SDL_LIBS) -lSDL_gfx quirc-demo-opencv: $(DEMO_UTIL_OBJ) demo/demo_opencv.o libquirc.a - $(CXX) -o $@ $(DEMO_UTIL_OBJ) demo/demo_opencv.o libquirc.a $(LDFLAGS) -lm -ljpeg $(OPENCV_LIBS) + $(CXX) -o $@ $(DEMO_UTIL_OBJ) demo/demo_opencv.o libquirc.a $(LDFLAGS) -lm $(OPENCV_LIBS) quirc-scanner: $(DEMO_OBJ) $(DEMO_UTIL_OBJ) demo/scanner.o libquirc.a $(CC) -o $@ $(DEMO_OBJ) $(DEMO_UTIL_OBJ) demo/scanner.o libquirc.a $(LDFLAGS) -lm -ljpeg From a3623ea4f4858bbf9f8719868c2db3ef1c5894a8 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Thu, 8 Apr 2021 09:46:30 +0900 Subject: [PATCH 3/3] README.md: Update extra dependencies for each programs --- README.md | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 3b370e5..baa72ce 100644 --- a/README.md +++ b/README.md @@ -28,8 +28,7 @@ a good choice for this purpose: The distribution comes with, in addition to the library, several test programs. While the core library is very portable, these programs have some additional -dependencies. All of them require libjpeg, and two (`quirc-demo` and `inspect`) -require SDL. The camera demos use Linux-specific APIs: +dependencies as documented below. ### quirc-demo @@ -38,14 +37,14 @@ video stream is displayed on screen as it's received, and any QR codes recognised are highlighted in the image, with the decoded information both displayed on the image and printed on stdout. -This requires SDL and V4L2. +This requires: libjpeg, libpng, SDL, V4L2 ### quirc-demo-opencv A demo similar to `quirc-demo`. But this version uses OpenCV instead of other libraries. -This requires OpenCV. +This requires: OpenCV ### quirc-scanner @@ -53,7 +52,7 @@ This program turns your camera into a barcode scanner. It's almost the same as the `demo` application, but it doesn't display the video stream, and thus doesn't require a graphical display. -This requires V4L2. +This requires: libjpeg, V4L2 ### qrtest @@ -62,13 +61,15 @@ tree containing a bunch of JPEG images, it will attempt to locate and decode QR codes in each image. Speed and success statistics are collected and printed on stdout. +This requires: libjpeg, libpng + ### inspect This test is used for debugging. Given a single JPEG image, it will display a diagram showing the internal state of the decoder as well as printing additional information on stdout. -This requires SDL. +This requires: libjpeg, libpng, SDL Installation ------------