Commit graph

925 commits

Author SHA1 Message Date
gitlost
3bda3b6213 DOTCODE: score_array Rev 4; initial HT/FS/GS/RS, macro fixes; CR/LF; #191 clang-tidy warnings; gs1 DEL 2020-05-02 00:38:35 +01:00
gitlost
0aa55f8945 composite.c: #191 suppress clang-tidy warnings 2020-04-28 22:41:05 +01:00
gitlost
2189201e95 raster.c: #191 suppress clang-tidy warnings 2020-04-28 22:19:32 +01:00
gitlost
74beb5c50a QRCODE: #191 suppress clang-tidy warnings 2020-04-28 21:10:54 +01:00
gitlost
344ec06723 ULTRA: #191 suppress clang-tidy 11.0.0 warning 2020-04-28 21:00:43 +01:00
gitlost
107d64b5de ULTRA: #191 suppress clang-tidy warnings 2020-04-28 14:11:49 +01:00
gitlost
194a30e6c5 AZTEC #190 count only B-1 bits; #191 suppress valgrind, clang-tidy warnings 2020-04-28 13:45:36 +01:00
Robin Stuart
737ffd4ce0 Improved method for avoiding illegal codewords in Aztec
Fixes #190 reported by Milton Neal
2020-04-26 14:39:44 +01:00
gitlost
27e211f9d3 ULTRA: C43 latch, shift; double digit; ECI; tests, refresh EMFs 2020-04-20 19:17:15 +01:00
Robin Stuart
99cd6a3391 Set font only once in EMF
Correct fault which led to wrong bytecount - multiple declarations of font not needed
Also included HeaderExtension1 and HeaderExtension2 objects for better compatability with GDI
As suggested by Alex Roy in #185
2020-04-19 18:46:14 +01:00
gitlost
bd654647c0 ULTRA: include secondary vertical clock track in DCC; ECC count, maxsize adjustment 2020-04-16 01:35:37 +01:00
gitlost
9e2b6716f4 ULTRA: fix tests (update expected, remove duplicate, some mode comments) 2020-04-11 10:37:39 +01:00
Harald Oehlmann
ff8d8d3fb1 Call to "debug_test_codeword_dump_init" does not resolve without ZINT_TEST defined 2020-04-10 11:28:45 +02:00
gitlost
e04f662dc0 ULTRA: enable compression for GS1_MODE; compression changes; fixes; tests 2020-04-09 22:08:54 +01:00
gitlost
e01d73a2ee Tests: fix README (Robin); refresh print GIFs after palette optimize 2020-04-08 21:19:30 +01:00
Robin Stuart
752b1511b6 Allow user to select bgcolour in Ultracode 2020-04-08 20:53:58 +01:00
Harald Oehlmann
d99bda9385 GIF palette optimization added. 2020-04-08 21:36:22 +02:00
gitlost
22570f6c73 Tests: add extra examples #189 aztec; refresh gifs print test 2020-04-08 11:22:01 +01:00
gitlost
9795ffe641 Ultracode missing parens around alloca length * sizeof 2020-04-08 10:42:05 +01:00
Harald Oehlmann
327d6ec88b Add 10 colours plus transparency ("T") to gif export. 2020-04-07 20:36:49 +02:00
Harald Oehlmann
6d9c8e2b04 Merge branch 'master' of ssh://git.code.sf.net/p/zint/code 2020-04-07 18:44:00 +02:00
Robin Stuart
92cfd65b56 Allow GS1 mode in Ultracode symbols 2020-04-07 17:41:21 +01:00
Harald Oehlmann
15eb21944c Merge branch 'master' of ssh://git.code.sf.net/p/zint/code 2020-04-07 18:39:45 +02:00
Harald Oehlmann
f23e13b09d Add error message when PNG is called but disabled on compile time. 2020-04-07 18:39:02 +02:00
Robin Stuart
0628e3ee4d Update version 2.7.1 > 2.8.0 2020-04-07 17:27:45 +01:00
Harald Oehlmann
fe517a7a58 Make ultra.c compile on MS-VC 6 2020-04-07 17:54:21 +02:00
gitlost
111c819e43 ULTRA_COMPRESSION option_1 -> option_3 typo 2020-04-07 12:48:29 +01:00
gitlost
129fa81c41 Fix PCX issue with odd bitmap width; tests; comment GRIDMATRIX byte count 2020-04-06 21:26:13 +01:00
Robin Stuart
0d26948baa Merge branch Ultra 2020-04-06 17:05:22 +01:00
Git Lost
6205878b1f Merge /u/gitlost/zint/ branch full_multibyte into master
https://sourceforge.net/p/zint/code/merge-requests/48/
2020-04-05 22:38:08 +00:00
gitlost
9199a51a75 #189 AZTEC gs1 FLG(0) missing after FLG(n) fix from Milton Neal; tests 2020-04-05 23:32:08 +01:00
gitlost
5d60d67a84 emf free malloc bufs; tif don't free alloca bufs (Win); -Wextra; tests 2020-04-04 16:53:29 +01:00
gitlost
2d0b966de6 CODABLOCKF inter-row bindings too short fix; -Wextra; tests 2020-04-03 19:40:59 +01:00
gitlost
dc56c5ed0f CODE128 Fix/suppress -Wextra warnings (signedness); tests 2020-04-02 21:55:58 +01:00
gitlost
61cd413fe4 Full multibyte option_3 for QR, HANXIN, GRIDMATRIX 2020-04-02 14:41:13 +01:00
Robin Stuart
94fe73ebfd Adjust size of Maxicode symbols when output as EMF
Size and position of elements in EMF files is stored as an integer, therefore Maxicode does not render properly
Increasing scale for these images ensures proper rendering
Fixes #185 reported by Alex Roy
2020-04-01 20:01:02 +01:00
Robin Stuart
b4182cbc19 Remove unneccessary length checks in Code1
Revokes commit #024490 and re-establishes commit #0c00ec
Relating to #184 thanks to Milton Neal and Git Lost
2020-04-01 19:27:49 +01:00
gitlost
f5149990eb #181 OSS-Fuzz DOTCODE codeword_array buffer overrun fix 2020-03-31 13:02:53 +01:00
gitlost
22354a81f1 HANXIN fix wrong func call gb2312_utf8tosb() -> gb18030_utf8tosb() 2020-03-30 11:59:16 +01:00
gitlost
9b771dba3a Make zint-static build optional 2020-03-30 10:54:21 +01:00
Robin Stuart
c23b4b9ef1 Ultra: typos-- 2020-03-29 22:35:25 +01:00
Robin Stuart
b572bb513d Ultra: Disable code compression by default
Ensures symbols are valid until better version of specification is available
2020-03-29 22:23:07 +01:00
gitlost
e2cd96924d Test for #183 Databar Stacked separator 2020-03-29 20:04:47 +01:00
gitlost
afe0c96476 OSS-Fuzz add zint-static rule to backend/CMakeLists.txt 2020-03-29 15:51:56 +01:00
Robin Stuart
0244904c1f Prevent buffer overrun in Code One
Fixes #184 reported by Milton Neal
2020-03-29 14:23:31 +01:00
Robin Stuart
52214c5a1c Change bitmap signedness to allow conversion to other data types
Buffered bitmap array should have been type unsigned char not type char
Includes change to manual
In response to (and hopefully fixing) #182 reported by Marcelo Antunes
2020-03-29 13:42:33 +01:00
gitlost
e8b56faa11 #181 OSS-Fuzz DOTCODE test for correct encoding of HT/FS/GS/RS 2020-03-29 12:34:56 +01:00
gitlost
56f0616747 #181 OSS-Fuzz AZTEC fix, check binary_string buffer not full using az_binary_append() func 2020-03-28 22:50:55 +00:00
Robin Stuart
20d5dcc50f Update GS-1 DataBar Stacked seperator
Expected behaviour found to slightly differ from what was implemented
Discovered and documented by Daniel Gredler. Fixes #183
2020-03-28 16:09:24 +00:00
Robin Stuart
53d5187853 Dotcode: correct encoding of HT/FS/GS/RS when shifting to code set B
Also updated references to specification annex to match latest version
Bug reported by Nico Gunkel as part of #181
2020-03-28 15:28:11 +00:00
Git Lost
8565c14437 Merge /u/gitlost/zint/ branch oss_fuzz_pdf417 into master
https://sourceforge.net/p/zint/code/merge-requests/39/
2020-03-28 15:19:13 +00:00
gitlost
7f8e3c4ea1 #181 OSS-Fuzz PDF417 fix, increase buffers to 2710 (max possible input length) 2020-03-28 15:10:53 +00:00
Robin Stuart
f82dd73dd7 Free memory when quitting Aztec (#181)
Malloc'd memory should be freed as identified by Nico Gunkel in #181
2020-03-28 12:12:46 +00:00
gitlost
0c00ece9f5 #181 OSS-Fuzz CODEONE fix, double indexing typo 2020-03-28 10:13:06 +00:00
gitlost
d56c7915b7 #181 OSS-Fuzz MAXICODE fix, prevent index overrun on numeric compaction 2020-03-28 02:50:15 +00:00
gitlost
0f5deccfb6 #181 OSS-Fuzz ZBarcode_Encode_File fix, allow for zero-length file, free buffer on error 2020-03-26 22:17:37 +00:00
gitlost
027e8a775d #181 OSS-Fuzz TELEPEN fix, allow for 16 char nul encodings in buffer 2020-03-26 14:22:27 +00:00
gitlost
62995f18d2 #181 OSS-Fuzz UPC/EAN fix, allow max 6 chars add-on in ean_leading_zeroes() 2020-03-26 09:35:04 +00:00
gitlost
bee8794cda #181 OSS-Fuzz DOTCODE fix, check length before accessing in binary() 2020-03-25 22:31:59 +00:00
gitlost
54bd024266 Add missing test file 2020-03-25 19:33:20 +00:00
gitlost
556dea1f88 #181 OSS-Fuzz CODABLOCKF fix, allow for full control chars range in GetPossibleCharacterSet 2020-03-25 19:27:34 +00:00
gitlost
c245a11da2 #181 auspost fix, check input immediately; test for EANX double + fix 2020-03-25 15:40:13 +00:00
Robin Stuart
ee291e45d6 UPCEAN: Check for multiple + characters in input
Fixes #181 reported by Christian Hartlage
2020-02-15 21:28:40 +00:00
Harald Oehlmann
0c5dc4d030 Set version to 2.7.1 2020-02-01 19:36:50 +01:00
Robin Stuart
c57b74a7e6 Ultra: add colour output to EMF 2020-01-13 19:24:01 +00:00
Robin Stuart
6d945ca2a1 Remove obsolete function declaration
Fixes #178 reported by Christian Wolf
2020-01-13 14:47:55 +00:00
gitlost
d513a68222 #147 Datamatrix buffer test from Opaki; encode examples from ISO 16022 2020-01-07 18:23:26 +00:00
Robin Stuart
5861ad3c3b Ultra: Extend colour support to PNG PCX BMP and TIF
Implementation needs improvement, but colour output is now achieved in most formats
2020-01-06 20:01:48 +00:00
Robin Stuart
6181885e2e Ultra: Add colour rectangle output to EPS 2020-01-06 18:00:43 +00:00
Robin Stuart
257da3fff5 Prevent Data Matrix buffer overflow bug
Fixes #176 reported by Daniel Gredler at OkapiBarcode
2020-01-05 12:35:16 +00:00
Robin Stuart
6954497fc1 Correct postscript plotting error
Report and fix by Matthieu LARIGALDIE
2020-01-05 11:27:24 +00:00
Robin Stuart
2faff4e76f Correct ECI but in DotCode
Avoid creating codewords > 112
Fixes #174 reported by Milton Neal
2019-12-26 17:57:29 +00:00
gitlost
b00b227b4f PDF417 no longer uses option_3 for no. codewords so set default 0 & remove from Studio 2019-12-19 20:29:11 +00:00
gitlost
fa9af12fc6 raster.c: check bounds on calculating block width for UPCA 2019-12-19 00:59:51 +00:00
gitlost
bca82ecc0d libzint.so: suppress exporting INTERNAL functions to the shared library; ZINT_TEST 2019-12-19 00:37:55 +00:00
gitlost
c524d32227 GRIDMATRIX: suppress maybe-uninitialized warning by initializing nondigit_posn 2019-12-18 20:04:05 +00:00
Robin Stuart
d370f3c0c7 Ultra: Correct clock pattern generation, add work around to avoid negative UCC and output to colour SVG 2019-12-18 18:33:18 +00:00
Robin Stuart
e6ab17086c Ultra: Add UCC, Correct ECC calculation for EC0, Expand ECI support to all values 2019-12-17 20:22:16 +00:00
gitlost
3209b32087 QR optimize encoding mode: remove extraneous newlines 2019-12-16 17:50:58 +00:00
gitlost
e331fd1e90 QR optimize encoding modes 2019-12-16 17:31:52 +00:00
Robin Stuart
ea6902c817 Ultra: Convert codewords to tiles and place in grid 2019-12-15 22:26:57 +00:00
Robin Stuart
cfdc7cc262 Ultra: Adjusted to allow 79-82 codeword range in 3-row symbols 2019-12-15 13:48:45 +00:00
Robin Stuart
77c8e76bfa Ultracode: Add error correction 2019-12-15 12:58:59 +00:00
Robin Stuart
7216202f06 Ultracode: Add FNC1 and 06 Macro support and calculate ECC capacity 2019-12-11 21:10:07 +00:00
Robin Stuart
edf7f9248e Ultracode codeword generation
Supports Reader Init, ECI, GS1 and handles switching between 8-bit, ASCII and C43 modes with C43 macros
2019-12-10 21:15:23 +00:00
gitlost
64c078605e HANXIN minor code changes (cm_row -> cm_i), avoid divide in in_numeric() 2019-12-08 20:22:10 +00:00
gitlost
889e786d95 HANXIN ECI conversion, GB 18030 LIBICONV port; some codeword fixes; optimized encoding modes 2019-12-08 16:15:34 +00:00
Harald Oehlmann
ce8aa92846 Include malloc.h only for MS_VC. Other platforms have it in stdlib.h 2019-12-06 14:09:39 +01:00
Harald Oehlmann
e03d03c877 Update version to 2.7.0 2019-12-05 20:16:39 +01:00
Harald Oehlmann
34c33b45b5 Correct mistake of last commit: restore order of blocks 2019-12-05 19:36:00 +01:00
Harald Oehlmann
045a9e3b00 Make zint compile on MS-VC6. Adopt makefiles to new file list. 2019-12-05 19:19:37 +01:00
gitlost
5fe97772cb GRIDMATRIX optimization wasn't adding in cost of double-byte properly 2019-12-04 14:07:55 +00:00
gitlost
b1f4a12c78 GRIDMATRIX codeword fixes, Project Nayuki optimized encoding modes 2019-12-04 13:45:01 +00:00
Robin Stuart
8295883987 Merge rMQR support in to master 2019-12-01 15:17:08 +00:00
Robin Stuart
f9d969cdd6 Remove depreciated gLabels render code 2019-12-01 14:09:46 +00:00
gitlost
8be13283db ECI conversion for GRIDMATRIX; GB 2312 LIBICONV port 2019-11-28 19:15:29 +00:00
Robin Stuart
ade31c41fb rMQR bugfix - cater for data lengths which are not multiples of 8 when calculating symbol size 2019-11-27 19:32:40 +00:00
gitlost
fed7378675 Handle UNICODE_MODE ECI conversion for reduced charset barcodes and QRCODE/MICROQR 2019-11-27 16:16:14 +00:00
Robin Stuart
ac00e381a6 Add rMQR to Barcode Studio
and perform some code beautifying at the same time
2019-11-25 21:20:21 +00:00
Robin Stuart
ad28de1819 Initial implementation of rMQR
According to draft dated June 2018
2019-11-25 19:08:25 +00:00
Harald Oehlmann
23ec0d48fc Make compile with ms-vc6 (zint, tcl) and VS2015 (qzint) 2019-11-17 19:30:55 +01:00
Robin Stuart
1fa7f2b804 Correct Chinese char encoding in Han Xin
Testing revealed a couple of bugs with encoding Chinese characters, also added more useful debug info
2019-11-17 14:56:43 +00:00
gitlost
793a990c01 EANX/UPCA/UPCE_CHK handling + various raster/vector fixes; ISBNX add-ons 2019-11-11 21:38:21 +00:00
gitlost
42587c2d21 gs1_verify: additional AIs 7240, 235, 417, 7040, 8026; updated checks 7007, 8008 2019-11-10 00:27:24 +00:00
gitlost
3b87cd4ec6 EAN128_CC ecc, cc_width, rows and alignment adjustments 2019-11-05 14:16:48 +00:00
Robin Stuart
fac9b94f1b Further refinement to SVG
More research revealed frasl entity should not be implemented, but apos should
Thanks to Ian Jeffray
2019-11-03 11:51:12 +00:00
Robin Stuart
1a5eb573cf Minor Dotcode tweaks
Slight modification brings code inline with latest version of draft standard.
Thanks to input from Terry Burton at BWIPP
2019-10-31 13:27:36 +00:00
gitlost
c87c86e30a Remove redundant numeric mode check in last digit processing 2019-10-31 02:31:55 +00:00
gitlost
1dd4b08986 Uses general_field_encode in rss_binary_string; min 4 chars; bottom separator 2019-10-31 02:01:42 +00:00
Robin Stuart
0fe9051324 Improved HTML entity handling
Now handles quot and frasl as suggested by Ian Jeffray and also allocates memory properly, preventing SIGSEGV for Code 128 full of ampersands.
2019-10-30 08:40:26 +00:00
Robin Stuart
7bcc0252a9 Supress malloc warning using gcc 8
Explicitly prevents malloc with negative number to supress -Walloc-size-larger-than
Fixes #168 reported by Ian Jeffray
2019-10-30 07:46:36 +00:00
gitlost
03d99ceb23 Composite changes encodation 10, 11, general field, CC-A/B shift 2019-10-29 22:54:18 +00:00
gitlost
739793a215 Always parse input as GS1 for EAN128 and RSS_EXP 2019-10-17 10:06:21 +01:00
Robin Stuart
b1113db942 Make text elements compatable with HTML in SVG
Correctly encodes less-than, greater-than and ampersand.
Fixes #167 reported by Ian Jeffray
2019-10-16 18:42:22 +01:00
gitlost
d8b576164f Use zero-padded field to determine EANX type for composites 2019-10-14 22:20:16 +01:00
gitlost
433046abbf KOREAPOST missing from is_linear; tests update 2019-10-14 09:49:15 +01:00
Harald Oehlmann
6e1283ccd8 2019-10-07 2.6.7 HaO Set version to 2.6.7, documentation, readme 2019-10-07 11:57:35 +02:00
Robin Stuart
15ae99ee11 Allow explicit ECI 3
Setting ECI to 3 now causes Zint to include ECI 3 in symbol, and allows entry of data formatted in ISO 8859_1
Fixes #127 requested by Harald Oehlmann
2019-10-06 17:39:54 +01:00
Robin Stuart
ff2ceea361 Allow selection of GS1 mode on GS1 symbols
Because some symbols require GS1 data, selecting GS1 mode for them would result in GS1 parsing being done twice, corrupting the data.
Fixes #165 reported by Gregory Van Vooren
2019-10-06 11:30:21 +01:00
Robin Stuart
eb3a004ace Always latch to non-numeric in general-purpose field
Would not include latch to alphanumeric or ISO/IEC mode if required at the beginning of a general-purpose compaction field.
Fixes #146 reported by Gregory Van Vooren
2019-10-05 12:48:55 +01:00
Robin Stuart
ae737ea019 Don't include LeftRAP with CC-A
Implement missed rule from ISO 24723 section 8.2 - 3-column CC-A components have the left Row Address Pattern omitted.
Partially resolves #146 reported by Gregory Van Vooren
2019-10-05 11:08:58 +01:00
Harald Oehlmann
6751a816a6 2019-09-19 HaO Set Version to 2.6.6 2019-09-18 11:58:57 +02:00
Harald Oehlmann
5c9d127ad1 2019-09-19 HaO DM: when encoding ECI, data scrambled when base256 encoding was chosen. The ECI codeword 241 was missing in the binary marker array and thus, the binrary length was inserted before the latch to binary resulting in very corrupt data. 2019-09-18 10:51:01 +02:00
Harald Oehlmann
2fbbbeec12 2019-09-11 HaO Document svg_plot vector= null crash has ticket number #164
Start Version release notes.
2019-09-11 10:14:42 +02:00
Harald Oehlmann
4dfc090416 2019-09-11 HaO E-Mail Christian Schmitz 2019-09-10: svg_plot: check for null symbol->vector.
Reason is unknown.
2019-09-11 09:51:05 +02:00
Robin Stuart
faeb20dcd7 Don't stretch PDF unless expressly requested by user
Now default height is 50 only for linear symbols and those with linear component (such as GS1 composite)
Restores default behaviour changed by commit [f2262f]
2019-09-04 21:57:54 +01:00
Robin Stuart
be9e2fd87a Allow PDF to latch into numeric compaction
Logic error prevented numeric compaction in PDF417 and MicroPDF417
Fixes #155 reported by Michelle Dupuis
2019-09-04 21:34:20 +01:00
Robin Stuart
f2262f2616 Reinstate height adjustment for PDF
Allows height adjustment of PDF417 and MicroPDF417 symbols.
Fixes #161 reported by 'DigitalResident'
2019-09-03 19:53:01 +01:00
Robin Stuart
833877fb2f Remove Maxicode segfault bug
Missing punctuation causes Maxicode plotting in raster image to segfault
2019-09-02 20:25:17 +01:00
Harald Oehlmann
5c5bf9f635 Merge /u/gitlost/zint/ branch microqr_version_option into master
https://sourceforge.net/p/zint/code/merge-requests/10/
2019-09-02 12:20:00 +00:00
gitlost
c5b03f665a Fix microqr version option out-by-one 2019-09-02 11:43:14 +01:00
Harald Oehlmann
40aab7908b 2018-08-30 2.6.5 HaO Set version to 2.6.5 2019-09-02 12:37:01 +02:00
Harald Oehlmann
b5aaf308a3 2019-09-01 Codemonkey82 Draw Maxicode bullseye for scale = 0.5 Ticket #119 (Commit correction) 2019-09-02 12:05:08 +02:00
Harald Oehlmann
b86a7e6560 2019-09-01 Codemonkey82 Draw Maxicode bullseye for scale = 0.5 Ticket #119 2019-09-02 11:26:30 +02:00
gitlost
251a7d99c4 New files 2019-09-01 21:09:47 +01:00
gitlost
d76cdd615b Fixes for eci, binary div, upce, other 2019-09-01 20:23:15 +01:00
Harald Oehlmann
89c2ee6f1d 2019-09-01 HaO maxicode sizeof issue fixed by Christian Schmitz 2019-09-01 18:14:21 +02:00
Harald Oehlmann
6949143419 2018-08-30 2.6.4 HaO Set version to 2.6.4 2019-08-30 19:18:14 +02:00
Harald Oehlmann
0a55f5839e 2018-08-30 HaO Change DMRE from AIM standard to ISO/EC29158 DMRE (not backward compatible) 2019-08-30 18:41:58 +02:00
Harald Oehlmann
efa4a8f435 2018-08-30 HaO Maxicode "input to long" error. Backport from okapi by Remi. Ticket #148 2019-08-30 16:40:44 +02:00
Harald Oehlmann
cb3eea2ba0 2018-08-30 HaO Implemented GS separator for Datamatrix (--gssep option). Ticket #139 2019-08-30 16:14:17 +02:00
Robin Stuart
ca24105ca0 Add placeholder for Ultracode 2019-03-21 09:14:24 +00:00
Harald Oehlmann
7239d2249c Merge /u/schnider/zint/ branch master into master
https://sourceforge.net/p/zint/code/merge-requests/8/
2019-03-20 16:28:33 +00:00
Robin Stuart
1debb132af Revert last change
This functionality already exists - note to self: read code thoroughly before committing
2019-03-18 19:36:03 +00:00
Robin Stuart
b531abf9b4 Try to protect from malformed colours 2019-03-18 17:36:36 +00:00
Roman Schnider
dcf0cbef97 Enhanced data length checks for GS1 data
Brought up to date with revision 19 of the GS1 General Specifications
2019-03-18 17:24:07 +01:00
Robin Stuart
32b6bbaf0e Plot hexagons in Maxicode even when scale < 1.0
Fixes #119 reported by codemonkey82
2019-03-16 15:47:08 +00:00
Robin Stuart
a6c93f1989 Recognise spaces as valid mode 2 character
Fixes #116 reported by Grzegorz Krukar
2019-03-15 19:15:47 +00:00
Robin Stuart
0738c3fa2f Fix format info grid initialization typo
Fixes #108 reported by Daniel Gredler
2019-03-15 17:54:12 +00:00
Robin Stuart
b3c03b4769 Fix EOF bug in EMF output
Bug reported by 与 忘 <ly_xy@outlook.com>
2019-03-14 11:02:17 +00:00