Skip to content

Bumped the version of zxing from 1.7 (8 June 2011) to 3.2.1 (20 Aug 2… #886

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hegjon wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Bumped the version of zxing from 1.7 (8 June 2011) to 3.2.1 (20 Aug 2… #886

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ed599f0
Bumped the version of zxing from 1.7 (8 June 2011) to 3.2.1 (20 Aug 2…
hegjon Apr 25, 2016
2354871
Updated the hash for zxing:core:3.2.1:jar
hegjon Apr 26, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions mbhd-swing/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
<urn>com.google.code.gson:gson:2.2.2:jar:null:compile:1f96456ca233dec780aa224bff076d8e8bca3908</urn>
<urn>com.google.guava:guava:16.0.1:jar:null:compile:5fa98cd1a63c99a44dd8d3b77e4762b066a5d0c5</urn>
<urn>com.google.protobuf:protobuf-java:2.5.0:jar:null:compile:a10732c76bfacdbd633a7eb0f7968b1059a65dfa</urn>
<urn>com.google.zxing:core:1.7:jar:null:compile:888814a387fc7570d50c4fbf4d20555d4fdd7646</urn>
<urn>com.google.zxing:core:3.2.1:jar:null:compile:2287494d4f5f9f3a9a2bb6980e3f32053721b315</urn>
<urn>com.googlecode.jcsv:jcsv:1.4.0:jar:null:compile:3b2dfd1ff251cdcf4745a7643a966f14d10e2532</urn>
<urn>com.lambdaworks:scrypt:1.4.0:jar:null:compile:906506b74f30c8c20bccd9ed4a11112d8941fe87</urn>
<urn>com.madgag.spongycastle:core:1.51.0.0:jar:null:compile:0f642963312ea0e615ad65f28adc5a5b3a2a0862</urn>
Expand Down Expand Up @@ -296,7 +296,7 @@
<dependency>
<groupId>com.google.zxing</groupId>
<artifactId>core</artifactId>
<version>1.7</version>
<version>3.2.1</version>
</dependency>

</dependencies>
Expand Down
7 changes: 3 additions & 4 deletions mbhd-swing/src/main/java/org/multibit/hd/ui/utils/QRCodes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,7 @@ public static Optional<BufferedImage> generateQRCode(String contents, int scaleF
final ByteMatrix matrix;
try {

QRCode code = new QRCode();
matrix = encode(contents, code);
matrix = encode(contents);

} catch (com.google.zxing.WriterException e) {
return Optional.absent();
Expand Down Expand Up @@ -80,11 +79,11 @@ public static Optional<BufferedImage> generateQRCode(String contents, int scaleF
*
* @return A QR Code as a ByteMatrix 2D array of greyscale values
*/
private static ByteMatrix encode(String contents, QRCode code) throws WriterException {
private static ByteMatrix encode(String contents) throws WriterException {

Preconditions.checkState(!Strings.isNullOrEmpty(contents), "'contents' must be present");

Encoder.encode(contents, ErrorCorrectionLevel.L, null, code);
QRCode code = Encoder.encode(contents, ErrorCorrectionLevel.L);

// Use a multiple of 2 for desktop screen
return renderResult(code, 2);
Expand Down