Skip to content

Commit 49669e9

Browse files
committed
copyright: fixed copyright attribution
* Updated attribution in README.md * Fixed headers in files ported from zxing-cpp * updated internal copright documents with correct dates and owners.
1 parent d3d562e commit 49669e9

13 files changed

Lines changed: 74 additions & 13 deletions

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@
186186
same "printed page" as the copyright notice for easier
187187
identification within third-party archives.
188188

189-
Copyright [yyyy] [name of copyright owner]
189+
Copyright [2019-2026] [rxing developers]
190190

191191
Licensed under the Apache License, Version 2.0 (the "License");
192192
you may not use this file except in compliance with the License.

README.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# rxing - cRustacean Crossing
22

3-
This is a port of the ZXing (https://github.com/zxing/zxing) java barcode library to pure rust. Conversion was done by hand. Original license resides with the authors of zxing.
3+
This is a port of the [ZXing](https://github.com/zxing/zxing) Java barcode library to pure Rust, converted by hand. ZXing is licensed under the Apache License 2.0; copyright remains with the original ZXing authors.
4+
5+
Additional features were ported from [zxing-cpp](https://github.com/zxing-cpp/zxing-cpp), specifically enhancements to the QR Code, Datamatrix, and DX Film reader components. zxing-cpp is also licensed under the Apache License 2.0; copyright remains with the zxing-cpp contributors.
46

57
Porting of the testing library is incomplete. Currently all positive tests are implemented. Negative verfication tests are not implemented.
68

@@ -209,4 +211,6 @@ fn main() {
209211
Currently tracking zxing 3.5.1
210212

211213
## Copyright notes
212-
The original license / copyright remains with the zxing developers. The license / copyright for the ported components of the c++ port remain with the developers of that port, where applicable.
214+
rxing is licensed under the Apache License 2.0.
215+
216+
The ZXing library is licensed under the Apache License 2.0; copyright remains with the ZXing authors. Portions of this crate are ported from zxing-cpp, which is also licensed under the Apache License 2.0; copyright remains with the zxing-cpp contributors.

src/common/cpp_essentials/base_extentions/qr_ec_level.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
/*
2+
* Copyright 2016 Nu-book Inc.
3+
* Copyright 2016 ZXing authors
4+
*/
5+
// SPDX-License-Identifier: Apache-2.0
6+
17
use crate::qrcode::common::ErrorCorrectionLevel;
28

39
impl ErrorCorrectionLevel {

src/common/cpp_essentials/base_extentions/qr_formatinformation.rs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
/*
2+
* Copyright 2016 Nu-book Inc.
3+
* Copyright 2016 ZXing authors
4+
* Copyright 2023 Axel Waggershauser
5+
* Copyright 2023 gitlost
6+
*/
7+
// SPDX-License-Identifier: Apache-2.0
8+
19
use crate::qrcode::{
210
common::{
311
ErrorCorrectionLevel, FORMAT_INFO_MASK_MODEL2, FORMAT_INFO_MASK_QR, FormatInformation,

src/common/cpp_essentials/concentric_finder.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
/*
2+
* Copyright 2020 Axel Waggershauser
3+
*/
4+
// SPDX-License-Identifier: Apache-2.0
15
use crate::{
26
Point,
37
common::{

src/common/cpp_essentials/dm_regression_line.rs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
/*
2+
* Copyright 2016 Nu-book Inc.
3+
* Copyright 2016 ZXing authors
4+
* Copyright 2017 Axel Waggershauser
5+
*/
6+
// SPDX-License-Identifier: Apache-2.0
7+
18
use crate::common::Result;
29
use crate::{Exceptions, Point};
310

src/common/cpp_essentials/edge_tracer.rs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
/*
2+
* Copyright 2016 Nu-book Inc.
3+
* Copyright 2016 ZXing authors
4+
* Copyright 2017 Axel Waggershauser
5+
*/
6+
// SPDX-License-Identifier: Apache-2.0
7+
18
use std::sync::{Arc, RwLock};
29

310
use crate::{

src/common/cpp_essentials/fast_edge_to_edge_counter.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/*
2+
* Copyright 2020 Axel Waggershauser
3+
*/
4+
// SPDX-License-Identifier: Apache-2.0
5+
16
use crate::common::BitMatrix;
27

38
use super::BitMatrixCursorTrait;

src/common/cpp_essentials/regression_line.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/*
2+
* Copyright 2020 Axel Waggershauser
3+
*/
4+
// SPDX-License-Identifier: Apache-2.0
5+
16
use crate::common::Result;
27
use crate::{Exceptions, Point};
38

src/qrcode/cpp_port/bitmatrix_parser.rs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
// /*
2-
// * Copyright 2016 Nu-book Inc.
3-
// * Copyright 2016 ZXing authors
4-
// */
5-
// // SPDX-License-Identifier: Apache-2.0
1+
/*
2+
* Copyright 2016 Nu-book Inc.
3+
* Copyright 2016 ZXing authors
4+
* Copyright 2023 gitlost
5+
*/
6+
// SPDX-License-Identifier: Apache-2.0
67

78
use crate::{
89
Exceptions,

0 commit comments

Comments
 (0)