status-im
/
qzxing
mirror of https://github.com/status-im/qzxing.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
455 Commits 3 Branches 0 Tags 146 MiB
Commit Graph

455 Commits

Author SHA1 Message Date
Nikos Ftylitakis 2bf62bcf3f update from master 2019-10-03 17:11:12 +03:00
Nikos Ftylitakis b55e749b5a update UI to be able to play around with background colors and transparency 2019-10-03 17:08:23 +03:00
Nikolaos Ftylitakis 6070e98f38
Add conditional builds in pro (#141) 
* first refactoring on QZXing.pri to group sources based on type of barcode and operation

* Moved the newly created source code groups of functionalities to separate pri file (QZXing-components.pri).

* In QZXing.pri include QZXing-components.pri having previously added as configuration all the available modules to preserve the backward compatibility.

* Deactivate parts of code based on the configuration of the pro file. (Work in Progress).

* fix compilation error

* Fix include issue when only "enable_encoder_qr_code" config is used through QZXing-components.pri

Update example projects to use QZXing-components.pri
 2019-10-03 15:56:14 +03:00
João Barbosa a919f7dc37 Add transparent option to image provider 2019-09-29 21:16:25 +01:00
Nikolaos Ftylitakis 1d1fd56d7e
Removed forgotten markings from previous conflict in README.md 2019-09-29 20:28:48 +03:00
Nikos Ftylitakis 703667de30 Merge branch 'promag-2019-08-add-border-feature' from #126 which adds support to 
boarder option during Qr encoding.
 2019-09-29 20:20:39 +03:00
Nikos Ftylitakis c077e8e760 Created QZXingEncoderConfig struct to hold the configuration of the encode operation. It has been extracted to a struct since the parameters are increasing. 
Created overloaded function for encodeData to use the QZXingEncoderConfig. The old implementation of encodeData now translates its arguments into a QZXingEncoderConfig and calls the overloaded function.

Updated regex in QZXingImageProvider to be aware of the new configuration of border.

Updated BarcodeEncoder example UI to allow the control of the border option.
 2019-09-29 20:18:04 +03:00
Nikos Ftylitakis a5cb500a74 merging promag:2019-08-add-border-feature to support the optional drawing of white border around the generated qr code. 2019-09-29 19:20:47 +03:00
Nikos Ftylitakis 7f48e0b542 fix bug in the regex of #140. the slash character needed to be escaped. 2019-09-29 18:15:26 +03:00
Nikos Ftylitakis 98c2479ca3 fix typo at the configuration parameters of Encoder. Old value: "corretionLevel" -> new value "correctionLevel" 2019-09-29 01:43:03 +03:00
Nikolaos Ftylitakis 7678becbb9
Merge pull request #135 from Barto-Paja/Cmake 
add Cmake support for building the library.
 2019-09-29 00:46:34 +03:00
Nikos Ftylitakis 8c296ec32e enhance #140 with an even stricter regex expression to minimize possibility of conflict between actual data and encoding options. Fixes #139 2019-09-29 00:24:54 +03:00
Nikolaos Ftylitakis 993ef49fe6
Merge pull request #140 from vasvlad/master 
Fixed problem with symbol '?' in string for encoding
 2019-09-29 00:14:58 +03:00
Uladzislau Vasilyeu e112b315fb Fixed problem with symbol '?' in string for encoding 2019-09-21 21:08:47 +03:00
Nikolaos Ftylitakis 9711217258
Merge pull request #136 from MKozimirov/fixes 
Dereference null pointer - fix
 2019-09-17 16:00:09 +03:00
Michael Kozimirov eb246be44a Dereference null pointer - fix 2019-09-16 15:04:15 +02:00
Bartosz Pajewski 19f4df96b3 Win32 update 
Add defines used in WIN32 and MSVC
 2019-09-15 15:39:51 +02:00
Bartosz Pajewski 62d6c61bf4 Merge remote-tracking branch 'upstream/master' into Cmake 2019-09-15 14:00:44 +02:00
Nikolaos Ftylitakis 12a269687f
Merge pull request #133 from Eism/rss_expanded_fix_upstream 
RSS Expanded fix bug
 2019-09-03 16:45:45 +03:00
Eism 7b2e69421c fix bug 2019-09-03 14:42:24 +02:00
Nikolaos Ftylitakis 98318bc6a2
Merge pull request #128 from StefanoD/master 
Memory Leak Fix
 2019-08-14 12:18:02 +03:00
Nikolaos Ftylitakis 8b7528143d
Merge pull request #130 from spompelio/downcast_revert 
fixed an issue preventing QR codes from being scanned
 2019-08-14 12:05:41 +03:00
Stevyn Pompelio bbde505d8c fixed an issue preventing QR codes from being scanned 2019-08-13 12:50:31 -04:00
Stefano Di Martino 65085a7bb1 Move constructor implemenation to cpp 2019-08-09 07:55:45 +02:00
Stefano Di Martino 52626c6125 This fixes the compiler warning: "'Counted' has no out-of-line virtual 
method definitions; its vtable will be emitted in every translation
unit"
This fixes especially memory leaks which we had with a certain gcc
version in release mode. This fixes potential #61 and #88
 2019-08-08 22:26:48 +02:00
Stefano Di Martino 129caae5df Fixing compiler warning: "Counted has no out-of-line virtual method 
definitions; its vtable will be emitted in every translation unit"
This fixed especially a memory leak with a certain gcc version compiled
in release mode (no problems in debug mode and with older gcc versions).
This could potentially fix #88 and #61.
 2019-08-08 22:23:53 +02:00
João Barbosa a8f8f56983 Add border option to image provider 2019-08-05 23:52:13 +01:00
Nikolaos Ftylitakis 897526702f
Merge pull request #125 from promag/2019-08-fix-optional-format 
Fix optional format in image provider
 2019-08-05 16:31:54 +03:00
João Barbosa 5d9668b23b Fix optional format in image provider 2019-08-05 14:03:53 +01:00
Nikolaos Ftylitakis 299fb6e02d
Merge pull request #121 from Eism/databar_support 
RSS support
 2019-08-02 15:24:07 +03:00
Nikos Ftylitakis b213f9fab3 Added support to ABGR32 introduced at Qt 5.13. Should fix #122 2019-07-24 07:34:58 +03:00
Bartosz Pajewski 8eefa1d653 CMake update 
- update required cmake version
- included sources by new style
 2019-07-22 19:19:14 +02:00
Eism 7132bc96ea remove copy constructor 2019-07-18 15:02:48 +02:00
Eism fad963c854 fixed some warnings 2019-07-18 14:57:34 +02:00
Eism 702b45d4e2 VS compilation fix 2019-07-18 14:54:30 +02:00
Eism dcb75f7210 reultpoints fix 2019-07-18 14:10:06 +02:00
Eism 10b4dbbb51 connect rss to the recognition module 2019-07-17 19:19:15 +02:00
Eism 0cd99217df added missing methods 2019-07-17 19:17:18 +02:00
Eism 635cfab83c rss expanded add recognition 2019-07-17 19:11:11 +02:00
Eism ef0588198f rss add recognition 2019-07-17 19:08:37 +02:00
Nikolaos Ftylitakis 024d1e26b7
Update travis to use ubuntu 16.04 (xenial) (#119) 
* Update travis to use ubuntu 16.04 (xenial)

Update travis to use ubuntu 16.04 (xenial) instead of 14.04 (trusty)

* add xvfb as a service to xenial distribution

* removed explicit start of xvfb

after adding the xvfb as a service, there is no reason to explicitly start it at "before_install"

* install libGL during before_install

* install libgl1-mesa-dev during "before_install"
 2019-07-11 18:04:47 +03:00
Eism 8bf0bd08b1 Revert "rss verssion 0.1" 
This reverts commit a177fe97d1.
 2019-07-08 18:01:11 +02:00
EIsmailzada 8b5d48aa54 Merge remote-tracking branch 'origin/master' 2019-07-08 17:57:52 +02:00
Nikolaos Ftylitakis 8ec5464e78
Merge pull request #116 from stefandunca/master 
Fix usage of boolean due to definition conflicting with Windows SDK's
 2019-07-08 10:37:09 +03:00
Stefan Dunca c6e1a9def0 Merge branch 'master' of github.com:ftylitak/qzxing 2019-07-07 22:45:07 +02:00
Eism 5fd213d890 Merge remote-tracking branch 'origin/master' 2019-07-07 12:05:18 +02:00
Eism a177fe97d1 rss verssion 0.1 2019-07-07 12:04:37 +02:00
Nikolaos Ftylitakis 191f636d3d
Deactivate Android build checks from Travis 
After some changes from the Qt installers (? maybe), all Travis Android builds are not able to be configured in order to run. 
Deactivating thier build till it get fixed.
 2019-07-03 15:21:13 +03:00
Nikolaos Ftylitakis d91f80528d
Added LGTM badges 
Added LGTM badges. Their actual value is calculated once a day, so upon making changes roughly a day must pass to see results.
 2019-07-03 15:18:45 +03:00
Nikos Ftylitakis a9744f9b89 fix compilation error due to a missing return statement 2019-07-03 14:17:37 +03:00