Commit Graph

568 Commits

Author SHA1 Message Date
Nikos Ftylitakis 9973b3dd78
Merge pull request #198 from Ilya-Songrov/master
Added slashes to .pro file.
2021-05-27 17:34:47 +03:00
devbugless 172ce90ffd Added slashes to .pro file. When you uncomment static line the build will work correct. 2021-05-27 17:04:01 +03:00
Nikos Ftylitakis 6b2b5a4e05
Merge pull request #197 from ftylitak/ci-testing
Integration of code parts from #177 provided by @KangLin to fix CI
2021-05-06 13:44:53 +03:00
Nikolaos Ftylitakis 3431715632 Integration of code parts from #177 provided by @KangLin to fix CI 2021-05-06 13:35:57 +03:00
Nikolaos Ftylitakis d48a139d03 At Barcode Encode image provider support explicitSize option in cases where the Item that requests the image can not provide requested size. Such cae is at #191 where the image was requested through an HTML tag in a RichText instead being source to an Image. 2021-05-06 13:12:06 +03:00
Nikos Ftylitakis decf28bef4
Merge pull request #194 from BetsyMcPhail/msvc-path
fix(CMakeLists.txt): fix path to stdint.h
2021-04-20 14:49:26 +03:00
Betsy McPhail cfa5195835 fix(CMakeLists.txt): fix path to stdint.h 2021-03-28 17:30:10 -04:00
Nikos Ftylitakis ed51996739
Merge pull request #193 from spompelio/mac_scan_fix
apply fix for macOS
2021-03-16 11:01:26 +02:00
Stevyn Pompelio 2e7d14bfd6 clean up 2021-03-15 13:03:30 -04:00
Stevyn Pompelio a20d6b352e apply fix for macOS 2021-03-15 12:15:34 -04:00
Nikolaos Ftylitakis cfc728583b changed all QML versions from 2.3 to 3.1 2021-01-26 11:51:42 +02:00
Nikolaos Ftylitakis 71101ccf5d Replaced QtQuick.Dialogs with Qt.labs.platform 2021-01-26 11:48:11 +02:00
Nikolaos Ftylitakis 321d7f73ab Fix Qt 6 limitations link in REAME 2021-01-26 11:41:41 +02:00
Nikolaos Ftylitakis 9c80b90d7c Updated REAME files with Qt 6 limitations 2021-01-26 11:39:59 +02:00
Nikolaos Ftylitakis 08a75a8e32 Support Qt 6
changed QTimer to QElapsedTimer
used QStringDecoder instead of QTextCodec if building for Qt 6
2021-01-26 11:11:17 +02:00
Nikolaos Ftylitakis 63850d5f03 Update in README.md to include missing info on how to use Barcode Encoder feature. Also added warning (in debug mode) if trying to use Encoder feature through QML through feature is not enabled. 2020-11-10 10:20:38 +02:00
Nikolaos Ftylitakis f5cee9c639 reordering the command sequence in QZXing.pro to fix dynamic library creation #183. 2020-11-09 16:26:01 +02:00
Nikos Ftylitakis 058e737902 Merge branch 'master' of https://github.com/ftylitak/qzxing 2020-09-09 12:15:42 +03:00
Nikos Ftylitakis 14577acc92 Cancel video frame processor thread in when destructing QZXingFilterRunnable instead of QZXingFilter as the thread uses the instanse of QZXingFilterRunnable. Solution suggested by @ #176 2020-09-09 12:15:14 +03:00
Nikos Ftylitakis 4715b242cc
fix(CMakeLists.txt): remove error prone extra path (#175) 2020-07-20 10:42:42 +03:00
Sztergbaum Roman 3fceb2e00c
fix(CMakeLists.txt): adding missing files (#174) 2020-07-20 10:41:24 +03:00
Sztergbaum Roman efe7331e6c
fix(CMakeLists.txt): remove error prone extra path 2020-07-18 21:19:12 +02:00
Nikos Ftylitakis e444138924 further commented out debug messages 2020-06-23 07:05:23 +03:00
Nikos Ftylitakis 2b29eb9aab Fix bug in setSourceFilterType default value. 2020-06-23 07:02:31 +03:00
Nikos Ftylitakis 33415b1ccf updated README file with the optional settings (setSourceFilterType, setTryHarderBehaviour). 2020-06-23 06:10:31 +03:00
Nikos Ftylitakis 05e3532888 support configurable image source type (normal / inverted) and configrable tryHarder operations (TroroughScanning and Rotate) #171 2020-06-15 19:45:19 +03:00
Rodney d3ef688190
Revert cmake dep to be 3.2 (#168)
The new style Qt5 find_package usage does not require newer CMake, nor
do any of the other CMake commands for qzxing, so go back to only depending
on CMake 3.2, to allow building on Ubuntu 16.04.
2020-05-15 09:45:33 +03:00
nefyodovve 29d7e2e6b2
Fix names of headers files in !symbian scope (#162)
* Fix names of headers files in !symbian scope

* set PREFIX in !symbian scope

Co-authored-by: Vladimir Nefyodov <vn@aqsi.ru>
2020-04-09 09:28:24 +03:00
Nikos Ftylitakis cf3391027b add extra check in QRFinderPatternFinder to avoid segmentation. Must be investigated if it is work-around that hides issue or if it is a valid check. #164 2020-03-19 12:17:58 +02:00
Nikos Ftylitakis ee750faad0 Merge branch 'master' of https://github.com/ftylitak/qzxing 2020-03-18 10:40:20 +02:00
Nikos Ftylitakis d695f1ff12 updated travis config to remove some errors as indicated by travis 2020-03-18 10:34:52 +02:00
Oleksandr Omelchuk a5f37131c8
Updated CMake based build (#154)
* Updated  CMake based build

* Build QR codes support by default

* Added warnings

* Reverted changes related to warnings.
2020-03-16 10:19:13 +02:00
antonio-111 dac9480a65
Fixed crash when loading invalid image. (#160)
* Fixed crash when loading invalid image.

* Fixed crash when loading invalid image (part2).
2020-03-11 09:59:42 +02:00
Nikos Ftylitakis 29597353ec Replace all C++11 specific code to C++98. (will be re-evaluated when the project moves to c++11 only solution)
Changes:
 - auto -> to the corresponding explicit type
 - std::to_string -> zxing::common::StringUtils::intToStr
2020-03-06 14:04:08 +02:00
Dmitry Gerasimov 30c599079a Free allocated memory before throwing exceptions 2020-02-14 16:55:04 +03:00
Dmitry Gerasimov 74046dac7d Fix missing reference in range-for loops with non trivial type 2020-02-14 16:48:05 +03:00
Dmitry Gerasimov 4e76f6173a Drop unused static variables in UPCEANReader
clang-tidy reported following problems:

zxing/zxing/oned/UPCEANReader.cpp:51:13: warning: unused variable 'START_END_PATTERN_LEN' [clang-diagnostic-unused-const-variable]
  const int START_END_PATTERN_LEN = LEN(START_END_PATTERN_);
            ^
zxing/zxing/oned/UPCEANReader.cpp:57:13: warning: unused variable 'MIDDLE_PATTERN_LEN' [clang-diagnostic-unused-const-variable]
  const int MIDDLE_PATTERN_LEN = LEN(MIDDLE_PATTERN_);
            ^
zxing/zxing/oned/UPCEANReader.cpp:74:13: warning: unused variable 'L_PATTERNS_LEN' [clang-diagnostic-unused-const-variable]
  const int L_PATTERNS_LEN = LEN(L_PATTERNS_);
            ^
zxing/zxing/oned/UPCEANReader.cpp:101:13: warning: unused variable 'L_AND_G_PATTERNS_LEN' [clang-diagnostic-unused-const-variable]
  const int L_AND_G_PATTERNS_LEN = LEN(L_AND_G_PATTERNS_);
            ^
2020-02-14 16:48:05 +03:00
Dmitry Gerasimov 2356e5b3e5 Fix invalid contruction of exception message
clang-tidy reported following problem:

zxing/zxing/oned/rss/expanded/decoders/GeneralAppIdDecoder.cpp:397:77: warning: adding 'int' to a string does not append to the string [clang-diagnostic-string-plus-int]
        throw IllegalStateException("Decoding invalid alphanumeric value: " + sixBitValue);
                                                                            ^
zxing/zxing/oned/rss/expanded/decoders/GeneralAppIdDecoder.cpp:397:77: note: use array indexing to silence this warning
        throw IllegalStateException("Decoding invalid alphanumeric value: " + sixBitValue);
                                                                            ^
                                    &                                       [            ]
2020-02-14 16:48:05 +03:00
Nikos Ftylitakis ee50acba1f Add 'using zxing::Ref' in QRMode.cpp as it is essential of MSVC 2020-02-12 12:36:04 +02:00
Nikos Ftylitakis 82fcb99cf1 trying to fix failing compilation on MSVC as reported by appveyor. 2020-02-12 12:27:21 +02:00
Nikos Ftylitakis 9d70b9a33b Change all Version* usages to Ref<Version> to avoid valrgind of reporting memory leak on static Version objects. #155 2020-02-12 11:37:14 +02:00
Nikos Ftylitakis f0a78867d6 code cleanup in QZXing.cpp to properly respect 'tryHarder' operation and avoid executing extra decoding operations unless instacted. #151 2020-02-03 11:15:42 +02:00
Nikos Ftylitakis 6e14a1167f Update implementation of FinderPatternFinder::selectBestPatterns from latest zxing code.
- In special cases, the previous code was unable to select the correct alignment centers on the qr code even though the centers were properly detected.
#152
2020-02-03 10:52:27 +02:00
Nikos Ftylitakis 2a58c5032b Move the conversion of Barcode Encode data from the QZXing:encodeData to QZXingImageProvider. The URL-formatted input is provided by the QML code so the conversion must be executed only then. If a user executes QZXing::encodeData directly, it must encode the data as is. 2020-01-13 11:32:58 +02:00
Nikos Ftylitakis c1f4379ec7 @BarcodeEncoder: translate the URL persentage encoded special character to the corresponding UTF8 code before encoding to QR Code. #134 2020-01-13 11:27:31 +02:00
Leroy.H.Y 1082c3b9e5 [fix] Fixed several warnings and use QElapsedTimer (#150)
* [fix] Fixed several warnings and use QElapsedTimer

* [fix] Now using explicit type for c++98
2019-12-21 20:35:05 +02:00
Nikos Ftylitakis bad0b6551c Added information in README for the updated method of using the test resources for unit testing. This should held on #149 2019-12-20 13:06:59 +02:00
Nikos Ftylitakis 7494bb0ddf Merge branch 'master' of https://github.com/ftylitak/qzxing 2019-12-20 12:53:48 +02:00
Nikos Ftylitakis e74778d92b Add the test resources as a submodule to qzxing-test-resources resository that has been created
Adapted unit tests to utilize the new path.
2019-12-20 12:53:12 +02:00
Nikos Ftylitakis 82c8ff217f deleting all test resources as they will be pulled on demand as a submodule. 2019-12-20 12:32:23 +02:00