Skip to content

Commit 1315802

Browse files
claire-chanclaire-chan
authored
Merge branch 'master' into james-branch
2 parents 34859f6 + a405636 commit 1315802

16 files changed

+67
-39
lines changed

‎_data/product_version.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ version_info_list_algorithm:
44
- value: latest version
55
- value: 10.x
66
child:
7+
- 10.2.0
78
- 10.0.21
89
- 10.0.20
910
- 10.0.10

‎_includes/sidelist-development.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<li class="category">DEVELOPMENT</li>
22
<li>
3-
<a target="_blank" href="{{ site.js }}?ver=10.0.21" class="otherLinkColour refreshLink">Web (Client Side)</a></li>
3+
<a target="_blank" href="{{ site.js }}" class="otherLinkColour refreshLink">Web (Client Side)</a></li>
44
<li>
55
<a class="otherLinkColour">Mobile</a>
66
<ul>
@@ -15,10 +15,10 @@
1515
<li>
1616
<a class="otherLinkColour">Server / Desktop</a>
1717
<ul>
18-
<li><a target="_blank" href="{{ site.python }}?ver=9.6.30" class="otherLinkColour refreshLink">Python</a></li>
19-
<li><a target="_blank" href="{{ site.java }}?ver=9.6.30" class="otherLinkColour refreshLink">Java</a></li>
20-
<li><a target="_blank" href="{{ site.dotnet }}?ver=9.6.30" class="otherLinkColour refreshLink">.NET</a></li>
18+
<li><a target="_blank" href="{{ site.python }}" class="otherLinkColour refreshLink">Python</a></li>
19+
<li><a target="_blank" href="{{ site.java }}" class="otherLinkColour refreshLink">Java</a></li>
20+
<li><a target="_blank" href="{{ site.dotnet }}" class="otherLinkColour refreshLink">.NET</a></li>
2121
<li><a target="_blank" href="{{ site.cpp }}" class="otherLinkColour refreshLink">C++</a></li>
22-
<li><a target="_blank" href="{{ site.c }}?ver=9.6.30" class="otherLinkColour refreshLink">C</a></li>
22+
<li><a target="_blank" href="{{ site.c }}" class="otherLinkColour refreshLink">C</a></li>
2323
</ul>
2424
</li>

‎_includes/sidelist-faq.html‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -205,8 +205,7 @@
205205
license buffer?</a>
206206
</li>
207207
<li>
208-
<a href="{{ site.faq_general }}error-10022-the-PDF-DLL-is-missing.html">How to resolve error message "-10022
209-
The PDF DLL is missing" on Linux?</a>
208+
<a href="{{ site.faq_general }}error-10022-the-PDF-DLL-is-missing.html">How to resolve the error message "-10022 The PDF DLL is missing"?</a>
210209
</li>
211210
</ul>
212-
</li>
211+
</li>

‎_includes/sidelist-parameter-reference-v10.0.0.html‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,6 @@
5656
class="otherLinkColour">BaseImageParameterName</a></li>
5757
<li><a href="{{ site.dcv_parameters_reference }}image-parameter/binarization-modes.html"
5858
class="otherLinkColour">BinarizationModes</a></li>
59-
<li><a href="{{ site.dcv_parameters_reference }}image-parameter/colour-channel-usage-type.html"
60-
class="otherLinkColour">ColourChannelUsageType</a></li>
6159
<li><a href="{{ site.dcv_parameters_reference }}image-parameter/colour-conversion-modes.html"
6260
class="otherLinkColour">ColourConversionModes</a></li>
6361
<li><a href="{{ site.dcv_parameters_reference }}image-parameter/grayscale-enhancement-modes.html"

‎_includes/sidelist-parameter-reference-v10.0.10.html‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,6 @@
7070
class="otherLinkColour">BaseImageParameterName</a></li>
7171
<li><a href="{{ site.dcv_parameters_reference }}image-parameter/binarization-modes.html"
7272
class="otherLinkColour">BinarizationModes</a></li>
73-
<li><a href="{{ site.dcv_parameters_reference }}image-parameter/colour-channel-usage-type.html"
74-
class="otherLinkColour">ColourChannelUsageType</a></li>
7573
<li><a href="{{ site.dcv_parameters_reference }}image-parameter/colour-conversion-modes.html"
7674
class="otherLinkColour">ColourConversionModes</a></li>
7775
<li><a href="{{ site.dcv_parameters_reference }}image-parameter/grayscale-enhancement-modes.html"

‎_includes/sidelist-parameter-reference.html‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,6 @@
7272
class="otherLinkColour">BaseImageParameterName</a></li>
7373
<li><a href="{{ site.dcv_parameters_reference }}image-parameter/binarization-modes.html"
7474
class="otherLinkColour">BinarizationModes</a></li>
75-
<li><a href="{{ site.dcv_parameters_reference }}image-parameter/colour-channel-usage-type.html"
76-
class="otherLinkColour">ColourChannelUsageType</a></li>
7775
<li><a href="{{ site.dcv_parameters_reference }}image-parameter/colour-conversion-modes.html"
7876
class="otherLinkColour">ColourConversionModes</a></li>
7977
<li><a href="{{ site.dcv_parameters_reference }}image-parameter/grayscale-enhancement-modes.html"

‎assets/js/dbrCoreVersionSearch.json‎

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,33 @@
11
[
2+
{
3+
"version": "10.2.10",
4+
"matchList": {
5+
"dcvRepoCore": [
6+
{
7+
"path": "/parameters/reference/capture-vision-template",
8+
"version": "2.2.10"
9+
},{
10+
"path": "/parameters/reference/target-roi-def",
11+
"version": "2.2.10"
12+
},{
13+
"path": "/parameters/reference/barcode-reader-task-settings",
14+
"version": "10.2.10"
15+
},{
16+
"path": "/parameters/reference/image-parameter",
17+
"version": "2.2.10"
18+
},{
19+
"path": "/parameters/reference/barcode-format-specification",
20+
"version": "10.2.10"
21+
},{
22+
"path": "/parameters/reference/image-source-options",
23+
"version": "2.2.10"
24+
},{
25+
"path": "/parameters/reference/global-parameter",
26+
"version": "2.2.10"
27+
}
28+
]
29+
}
30+
},
231
{
332
"version": "10.2.0",
433
"matchList": {
@@ -20,7 +49,7 @@
2049
"version": "10.2.0"
2150
},{
2251
"path": "/parameters/reference/image-source-options",
23-
"version": "3.2.0"
52+
"version": "2.2.0"
2453
},{
2554
"path": "/parameters/reference/global-parameter",
2655
"version": "2.2.0"

‎faq/general/error-10022-the-PDF-DLL-is-missing.md‎

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ needAutoGenerateSidebar: false
1010

1111
[<< Back to FAQ index](index.md)
1212

13+
1314
The error message `-10022 The PDF DLL is missing` indicates that the Dynamsoft Barcode Reader is looking for a PDF DLL file, which is typically used in Windows environments. However, this error message may also appear in Linux environments, as both cases point to the same issue due to a shared error message library.
1415

1516
This error occurs when the necessary PDF library files required for handling PDF files are either missing or the required dependencies are not in the correct path.
@@ -18,15 +19,21 @@ This error occurs when the necessary PDF library files required for handling PDF
1819

1920
Please check if the PDF library files are located in the same directory as the Dynamsoft Barcode Reader library (e.g. DynamsoftBarcodeReaderx64.dll). If they are not, kindly copy the PDF library files to that location and try again.
2021

21-
**For Windows:**
22+
**For Windows x86:**
2223

23-
- `DynamicPdf.dll` // for Windows x86
24+
- `DynamicPdf.dll`
2425

25-
- `DynamicPdfCore.dll` // for Windows x86
26+
- `DynamicPdfCore.dll`
27+
28+
- `DynamicImage.dll`
29+
30+
**For Windows x64:**
2631

27-
- `DynamicPdfx64.dll` // for Windows x64
32+
- `DynamicPdfx64.dll`
2833

29-
- `DynamicPdfCorex64.dll` // for Windows x64
34+
- `DynamicPdfCorex64.dll`
35+
36+
- `DynamicImagex64.dll`
3037

3138
**For Linux:**
3239

@@ -42,13 +49,13 @@ Use `dumpbin` command line tool to check dependency.
4249
```
4350
dumpbin/dependents your_ddl_file.ddl
4451
```
45-
46-
**For Linux:**
47-
Run the following command on the console to check if all dependencies are installed.
48-
49-
```
50-
ldd /lib/libDynamicPdf.so
51-
```
52-
53-
> Tips:
54-
> Generally, libatomic1 is not installed on ARM64, while it does appear to exist on the AMD64 image. If you are using ARM64, you could test if libatomic1 is installed.
52+
53+
**For Linux:**
54+
Run the following command on the console to check if all dependencies are installed.
55+
56+
```
57+
ldd /lib/libDynamicPdf.so
58+
```
59+
60+
> Tips:
61+
> Generally, libatomic1 is not installed on ARM64, while it does appear to exist on the AMD64 image. If you are using ARM64, you could test if libatomic1 is installed.

‎faq/general/index.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,3 +114,4 @@ permalink: /faq/general/index.html
114114
1. [The error message "-10022 The PDF DLL is missing" on Linux?](error-10022-the-PDF-DLL-is-missing.html)
115115

116116
2. [How to resolve error failed to read or write license buffer?](error-license-buffer.html)
117+

‎license-activation/index.md‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,7 @@ The following shows how to set the license in the code.
4242
>
4343
>
4444
```javascript
45-
Dynamsoft.DBR.BarcodeScanner.license = "YOUR-LICENSE-KEY";
46-
let scanner = await Dynamsoft.DBR.BarcodeScanner.createInstance();
45+
Dynamsoft.License.LicenseManager.initLicense("YOUR-LICENSE-KEY");
4746
```
4847
>
4948
```c
@@ -85,7 +84,7 @@ LicenseManager.initLicense("YOUR-LICENSE-KEY", this, (isSuccess, error) -> {
8584
```
8685
>
8786
```objc
88-
[DSLicenseManager initLicense:@"DLS2eyJvcmdhbml6YXRpb25JRCI6IjIwMDAwMSJ9" verificationDelegate:self];
87+
[DSLicenseManager initLicense:@"YOUR-LICENSE-KEY" verificationDelegate:self];
8988
- (void)onLicenseVerified:(BOOL)isSuccess error:(nullable NSError *)error {
9089
if (!isSuccess && error != nil) {
9190
NSLog(@"error: %@", error);
@@ -94,7 +93,7 @@ LicenseManager.initLicense("YOUR-LICENSE-KEY", this, (isSuccess, error) -> {
9493
```
9594
>
9695
```swift
97-
LicenseManager.initLicense("DLS2eyJvcmdhbml6YXRpb25JRCI6IjIwMDAwMSJ9", verificationDelegate: self)
96+
LicenseManager.initLicense("YOUR-LICENSE-KEY", verificationDelegate: self)
9897
func onLicenseVerified(_ isSuccess: Bool, error: Error?) {
9998
if !isSuccess {
10099
if let error = error {

0 commit comments

Comments
 (0)