File tree
5 files changed
+30
-9
lines changed- Source
- Extras
- Package
- Packages
- ProjectSettings
5 files changed
+30
-9
lines changedSubmodule artoolkitx updated 21 files
- .gitattributes+13
- .gitignore+2-1
- Release Notes.md+7-1
- Source/ARX/ARTracker2d.cpp+1-1
- Source/ARX/ARUtil/CMakeLists.txt+2-2
- Source/ARX/OCVT/CMakeLists.txt+6-2
- Source/ARX/include/ARX/ARTrackableMultiSquare.h+78-78
- Source/ARXJ/ARXJProj/gradlew.bat+90-90
- Source/CMakeLists.txt+6-5
- Source/Utilities/check_image_2d_tracking/CMakeLists.txt+6-2
- Source/build.sh+4-4
- Source/cmake/FindOpenCV.cmake+27
- Source/depends/windows/include/jconfig.h+23-35
- Source/depends/windows/include/jmorecfg.h+160-149
- Source/depends/windows/include/jpeglib.h+459-487
- Source/depends/windows/include/jversion.h+45-5
- Source/depends/windows/lib/.gitignore+13
- Source/depends/windows/lib/x64/libjpeg.lib
- Source/depends/windows/lib/x64/zlib.lib
- Source/depends/windows/lib/x64/zlibd.lib
- Source/depends/windows/lib/x64/zlibstatic.lib
Lines changed: 0 additions & 1 deletion
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
4 | 4 |
| |
5 | 5 |
| |
6 | 6 |
| |
7 |
| - | |
8 | 7 |
| |
9 | 8 |
| |
10 | 9 |
| |
|
Lines changed: 2 additions & 2 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
17 | 17 |
| |
18 | 18 |
| |
19 | 19 |
| |
20 |
| - | |
| 20 | + | |
21 | 21 |
| |
22 | 22 |
| |
23 | 23 |
| |
| |||
40 | 40 |
| |
41 | 41 |
| |
42 | 42 |
| |
43 |
| - | |
| 43 | + | |
44 | 44 |
| |
45 | 45 |
| |
46 | 46 |
| |
|
Lines changed: 26 additions & 4 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
3 | 3 |
| |
4 | 4 |
| |
5 | 5 |
| |
6 |
| - | |
| 6 | + | |
7 | 7 |
| |
8 | 8 |
| |
9 | 9 |
| |
| |||
134 | 134 |
| |
135 | 135 |
| |
136 | 136 |
| |
137 |
| - | |
| 137 | + | |
138 | 138 |
| |
139 | 139 |
| |
140 | 140 |
| |
| |||
151 | 151 |
| |
152 | 152 |
| |
153 | 153 |
| |
| 154 | + | |
154 | 155 |
| |
155 | 156 |
| |
156 | 157 |
| |
| |||
460 | 461 |
| |
461 | 462 |
| |
462 | 463 |
| |
| 464 | + | |
463 | 465 |
| |
464 | 466 |
| |
465 | 467 |
| |
| |||
510 | 512 |
| |
511 | 513 |
| |
512 | 514 |
| |
| 515 | + | |
| 516 | + | |
513 | 517 |
| |
514 | 518 |
| |
515 | 519 |
| |
| |||
616 | 620 |
| |
617 | 621 |
| |
618 | 622 |
| |
619 |
| - | |
620 | 623 |
| |
621 | 624 |
| |
622 | 625 |
| |
| |||
658 | 661 |
| |
659 | 662 |
| |
660 | 663 |
| |
| 664 | + | |
661 | 665 |
| |
662 | 666 |
| |
663 | 667 |
| |
| |||
670 | 674 |
| |
671 | 675 |
| |
672 | 676 |
| |
| 677 | + | |
673 | 678 |
| |
674 | 679 |
| |
675 | 680 |
| |
| |||
744 | 749 |
| |
745 | 750 |
| |
746 | 751 |
| |
| 752 | + | |
747 | 753 |
| |
748 | 754 |
| |
749 | 755 |
| |
| |||
768 | 774 |
| |
769 | 775 |
| |
770 | 776 |
| |
| 777 | + | |
771 | 778 |
| |
772 | 779 |
| |
773 | 780 |
| |
774 | 781 |
| |
775 | 782 |
| |
776 |
| - | |
| 783 | + | |
| 784 | + | |
| 785 | + | |
| 786 | + | |
| 787 | + | |
| 788 | + | |
| 789 | + | |
| 790 | + | |
| 791 | + | |
| 792 | + | |
| 793 | + | |
| 794 | + | |
| 795 | + | |
| 796 | + | |
777 | 797 |
| |
778 | 798 |
| |
779 | 799 |
| |
780 | 800 |
| |
781 | 801 |
| |
| 802 | + | |
782 | 803 |
| |
783 | 804 |
| |
784 | 805 |
| |
| |||
857 | 878 |
| |
858 | 879 |
| |
859 | 880 |
| |
| 881 | + | |
860 | 882 |
| |
861 | 883 |
| |
862 | 884 |
| |
|
Lines changed: 1 addition & 1 deletion
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
1 |
| - | |
| 1 | + |
0 commit comments