1
1
package io.github.g0dkar.qrcode
2
2
3
- import io.github.g0dkar.qrcode.QRCodeDataType.UPPER_ALPHA_NUM
4
3
import io.github.g0dkar.qrcode.QRCodeDataType.DEFAULT
5
4
import io.github.g0dkar.qrcode.QRCodeDataType.KANJI
6
5
import io.github.g0dkar.qrcode.QRCodeDataType.NUMBERS
6
+ import io.github.g0dkar.qrcode.QRCodeDataType.UPPER_ALPHA_NUM
7
7
import io.github.g0dkar.qrcode.internals.BitBuffer
8
- import io.github.g0dkar.qrcode.internals.Helper.saveState
9
8
import io.github.g0dkar.qrcode.internals.Polynomial
10
9
import io.github.g0dkar.qrcode.internals.QR8BitByte
11
10
import io.github.g0dkar.qrcode.internals.QRAlphaNum
@@ -16,7 +15,6 @@ import io.github.g0dkar.qrcode.internals.QRUtil
16
15
import io.github.g0dkar.qrcode.internals.RSBlock
17
16
import java.awt.Color
18
17
import java.awt.image.BufferedImage
19
- import java.util.StringJoiner
20
18
import java.util.function.Function
21
19
import javax.imageio.ImageIO
22
20
@@ -243,38 +241,25 @@ class QRCode @JvmOverloads constructor(
243
241
): Array <Array <Boolean ?>> {
244
242
val moduleCount = type * 4 + 17
245
243
val modules: Array <Array <Boolean ?>> = Array (moduleCount) { Array (moduleCount) { null } }
246
- saveState(" test-01A" , modules)
247
244
248
245
setupPositionProbePattern(0 , 0 , moduleCount, modules)
249
- saveState(" test-02A" , modules)
250
246
setupPositionProbePattern(moduleCount - 7 , 0 , moduleCount, modules)
251
- saveState(" test-03A" , modules)
252
247
setupPositionProbePattern(0 , moduleCount - 7 , moduleCount, modules)
253
- saveState(" test-04A" , modules)
254
248
255
249
setupPositionAdjustPattern(type, modules)
256
- saveState(" test-05A" , modules)
257
250
setupTimingPattern(moduleCount, modules)
258
- saveState(" test-06A" , modules)
259
251
setupTypeInfo(maskPattern, moduleCount, modules)
260
- saveState(" test-07A" , modules)
261
252
262
253
if (type >= 7 ) {
263
254
setupTypeNumber(type, moduleCount, modules)
264
255
}
265
- saveState(" test-08A" , modules)
266
256
267
257
val data = createData(type)
268
258
val data2 = data.copyOf()
269
259
val modules2 = modules.copyOf()
270
260
271
- saveState(" test-09A" , modules)
272
-
273
261
applyMaskPattern(data, maskPattern, moduleCount, modules)
274
- saveState(" test-10A" , modules)
275
-
276
262
mapData(data2, maskPattern, modules2)
277
- saveState(" test-10AA" , modules2)
278
263
279
264
return modules
280
265
}
@@ -378,7 +363,6 @@ class QRCode @JvmOverloads constructor(
378
363
buffer.put(qrCodeData.length(), qrCodeData.getLengthInBits(type))
379
364
qrCodeData.write(buffer)
380
365
381
-
382
366
val totalDataCount = rsBlocks.sumOf { it.dataCount } * 8
383
367
384
368
if (buffer.lengthInBits > totalDataCount) {
@@ -484,14 +468,12 @@ class QRCode @JvmOverloads constructor(
484
468
if (modules[row][col - c] == null ) {
485
469
modules[row][col - c] = if (byteIndex < data.size) {
486
470
(data[byteIndex] ushr bitIndex) and 1 == 1
487
- }
488
- else {
471
+ } else {
489
472
false
490
473
}.let {
491
474
if (QRUtil .getMask(maskPattern, row, col - c)) {
492
475
! it
493
- }
494
- else {
476
+ } else {
495
477
it
496
478
}
497
479
}
@@ -574,12 +556,4 @@ class QRCode @JvmOverloads constructor(
574
556
575
557
private fun isDark (row : Int , col : Int , modules : Array <Array <Boolean ?>>): Boolean =
576
558
modules[row][col] ? : false
577
-
578
- override fun toString (): String =
579
- StringJoiner (" , " , QRCode .javaClass.simpleName + " [" , " ]" )
580
- .add(" data=$data " )
581
- .add(" dataType=$dataType " )
582
- .add(" qrCodeData=$qrCodeData " )
583
- .add(" errorCorrectionLevel=$errorCorrectionLevel " )
584
- .toString()
585
559
}
0 commit comments