From 8bc3053cb58086dae66ed08a5e188fdbe80c7ad8 Mon Sep 17 00:00:00 2001 From: Mariotaku Lee Date: Wed, 5 Apr 2017 11:54:20 +0800 Subject: [PATCH] fixed demo compile error --- java/android/src/io/nayuki/qrcodegen/QrCodeAndroid.java | 2 +- java/demo/build.gradle | 1 + java/demo/src/io/nayuki/qrcodegen/QrCodeGeneratorDemo.java | 2 +- java/svg/src/io/nayuki/qrcodegen/QrCodeJavaSVG.java | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/java/android/src/io/nayuki/qrcodegen/QrCodeAndroid.java b/java/android/src/io/nayuki/qrcodegen/QrCodeAndroid.java index a6ea001..ea56dd5 100644 --- a/java/android/src/io/nayuki/qrcodegen/QrCodeAndroid.java +++ b/java/android/src/io/nayuki/qrcodegen/QrCodeAndroid.java @@ -16,7 +16,7 @@ public class QrCodeAndroid { * @return a bitmap representing this QR Code, with padding and scaling * @throws IllegalArgumentException if the scale or border is out of range */ - public Bitmap toBitmap(QrCode qrCode, int scale, int border, Bitmap.Config config) { + public static Bitmap toBitmap(QrCode qrCode, int scale, int border, Bitmap.Config config) { if (scale <= 0 || border < 0) throw new IllegalArgumentException("Value out of range"); final int size = qrCode.size; diff --git a/java/demo/build.gradle b/java/demo/build.gradle index e2f0d2f..a98b6bc 100644 --- a/java/demo/build.gradle +++ b/java/demo/build.gradle @@ -1,4 +1,5 @@ dependencies { compile project(':core') compile project(':javase') + compile project(':svg') } \ No newline at end of file diff --git a/java/demo/src/io/nayuki/qrcodegen/QrCodeGeneratorDemo.java b/java/demo/src/io/nayuki/qrcodegen/QrCodeGeneratorDemo.java index aaff944..d800e33 100644 --- a/java/demo/src/io/nayuki/qrcodegen/QrCodeGeneratorDemo.java +++ b/java/demo/src/io/nayuki/qrcodegen/QrCodeGeneratorDemo.java @@ -56,7 +56,7 @@ public final class QrCodeGeneratorDemo { File imgFile = new File("hello-world-QR.png"); // File path for output ImageIO.write(img, "png", imgFile); // Write image to file - String svg = qr.toSvgString(4); // Convert to SVG XML code + String svg = QrCodeJavaSVG.toSvgString(qr, 4); // Convert to SVG XML code try (Writer out = new OutputStreamWriter( new FileOutputStream("hello-world-QR.svg"), StandardCharsets.UTF_8)) { diff --git a/java/svg/src/io/nayuki/qrcodegen/QrCodeJavaSVG.java b/java/svg/src/io/nayuki/qrcodegen/QrCodeJavaSVG.java index 0732aa5..7165651 100644 --- a/java/svg/src/io/nayuki/qrcodegen/QrCodeJavaSVG.java +++ b/java/svg/src/io/nayuki/qrcodegen/QrCodeJavaSVG.java @@ -12,7 +12,7 @@ public class QrCodeJavaSVG { * @param border the number of border modules to add, which must be non-negative * @return a string representing this QR Code as an SVG document */ - public String toSvgString(QrCode qr, int border) { + public static String toSvgString(QrCode qr, int border) { if (border < 0) throw new IllegalArgumentException("Border must be non-negative"); final int size = qr.size;