Skip to content

Commit de86622

Browse files
philip-lambphilip-lamb
authored
Merge pull request #2 from artoolkitx/removeDuplicateFunction
Remove duplicate function
2 parents 59a8727 + 37b6ff7 commit de86622

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+181
-988
lines changed

‎ARToolKit5.xcodeproj/project.pbxproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -664,6 +664,7 @@
664664
78BBCE3408E4AC9B00AEE575 /* video.c in Sources */ = {isa = PBXBuildFile; fileRef = 78BB3E7408E482F400D7CA2D /* video.c */; };
665665
78BBCE3508E4AC9B00AEE575 /* video2.c in Sources */ = {isa = PBXBuildFile; fileRef = 78BB3E7608E482F400D7CA2D /* video2.c */; };
666666
78BBCE7108E4AFF700AEE575 /* simpleTest.c in Sources */ = {isa = PBXBuildFile; fileRef = 78BB3F0708E4837000D7CA2D /* simpleTest.c */; };
667+
F2BB865520041EBB00E46EB4 /* paramGL.c in Sources */ = {isa = PBXBuildFile; fileRef = F2BB865420041E1000E46EB4 /* paramGL.c */; };
667668
/* End PBXBuildFile section */
668669

669670
/* Begin PBXContainerItemProxy section */
@@ -2523,6 +2524,7 @@
25232524
A1774E5C1CD6C2E100E1A17E /* libopencv_imgcodecs.3.1.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; path = libopencv_imgcodecs.3.1.0.dylib; sourceTree = "<group>"; };
25242525
A1774E5D1CD6C2E100E1A17E /* libopencv_ml.3.1.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; path = libopencv_ml.3.1.0.dylib; sourceTree = "<group>"; };
25252526
A1774E5E1CD6C2E100E1A17E /* libopencv_videoio.3.1.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; path = libopencv_videoio.3.1.0.dylib; sourceTree = "<group>"; };
2527+
F2BB865420041E1000E46EB4 /* paramGL.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = paramGL.c; sourceTree = "<group>"; };
25262528
/* End PBXFileReference section */
25272529

25282530
/* Begin PBXFrameworksBuildPhase section */
@@ -4715,6 +4717,7 @@
47154717
78BB3DE108E482F400D7CA2D /* AR */ = {
47164718
isa = PBXGroup;
47174719
children = (
4720+
F2BB865420041E1000E46EB4 /* paramGL.c */,
47184721
78BB3DE408E482F400D7CA2D /* ar3DCreateHandle.c */,
47194722
78BB3DE508E482F400D7CA2D /* ar3DUtil.c */,
47204723
78BB3DE708E482F400D7CA2D /* arCreateHandle.c */,
@@ -6261,6 +6264,7 @@
62616264
isa = PBXSourcesBuildPhase;
62626265
buildActionMask = 2147483647;
62636266
files = (
6267+
F2BB865520041EBB00E46EB4 /* paramGL.c in Sources */,
62646268
78BB3FE708E4884700D7CA2D /* paramChangeSize.c in Sources */,
62656269
78BB3FE808E4884700D7CA2D /* paramClear.c in Sources */,
62666270
78BB3FE908E4884700D7CA2D /* paramDecomp.c in Sources */,

‎ARToolKit5iOS.xcodeproj/project.pbxproj‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -753,6 +753,7 @@
753753
4ACEFC47130AEC7E009D1DA0 /* libjpeg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4ACEFC30130AEC6C009D1DA0 /* libjpeg.a */; };
754754
4ACEFC48130AEC9A009D1DA0 /* libjpeg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4ACEFC30130AEC6C009D1DA0 /* libjpeg.a */; };
755755
4AD1D4C9133D34BA00941170 /* Data2 in Resources */ = {isa = PBXBuildFile; fileRef = 4AD1D4B6133D34BA00941170 /* Data2 */; };
756+
4AD2331120043ECE008145CB /* paramGL.c in Sources */ = {isa = PBXBuildFile; fileRef = 4AD2331020043EB7008145CB /* paramGL.c */; };
756757
4AEAEBD317A744AA00F61E33 /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A8393B5152163C000D8FE60 /* Accelerate.framework */; settings = {ATTRIBUTES = (Required, ); }; };
757758
4AEAEBD417A744AA00F61E33 /* libjpeg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4ACEFC30130AEC6C009D1DA0 /* libjpeg.a */; };
758759
4AEAEBD517A744AA00F61E33 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A1822E30DC97C2700B73A53 /* QuartzCore.framework */; };
@@ -2702,6 +2703,7 @@
27022703
4ACEFEF5130AF497009D1DA0 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
27032704
4ACEFEF6130AF497009D1DA0 /* MainWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MainWindow.xib; sourceTree = "<group>"; };
27042705
4AD1D4B6133D34BA00941170 /* Data2 */ = {isa = PBXFileReference; lastKnownFileType = folder; path = Data2; sourceTree = "<group>"; };
2706+
4AD2331020043EB7008145CB /* paramGL.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = paramGL.c; sourceTree = "<group>"; };
27052707
4AD26CBB13B37EEB00F5E037 /* libARgsub_es.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libARgsub_es.a; sourceTree = BUILT_PRODUCTS_DIR; };
27062708
4AD26CBC13B37EEB00F5E037 /* libARMulti.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libARMulti.a; sourceTree = BUILT_PRODUCTS_DIR; };
27072709
4AD26CBF13B37EEB00F5E037 /* libARosg.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libARosg.a; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -5510,6 +5512,7 @@
55105512
4AEB261B1804A330002290C5 /* paramDistortion.c */,
55115513
4AEB261C1804A330002290C5 /* paramFile.c */,
55125514
4AEB261D1804A330002290C5 /* paramGetPerspective.c */,
5515+
4AD2331020043EB7008145CB /* paramGL.c */,
55135516
4AEB261E1804A330002290C5 /* paramLT.c */,
55145517
4AEB261F1804A330002290C5 /* vAlloc.c */,
55155518
4AEB26201804A330002290C5 /* vDisp.c */,
@@ -7843,6 +7846,7 @@
78437846
4AF101BA180BFC9100A922DE /* arLabeling.c in Sources */,
78447847
4AF101C3180BFC9100A922DE /* mAllocInv.c in Sources */,
78457848
4AF101DB180BFC9100A922DE /* vFree.c in Sources */,
7849+
4AD2331120043ECE008145CB /* paramGL.c in Sources */,
78467850
4AF101B3180BFC9100A922DE /* arDetectMarker2.c in Sources */,
78477851
4AF101BB180BFC9100A922DE /* arPattAttach.c in Sources */,
78487852
4AF101D1180BFC9100A922DE /* paramChangeSize.c in Sources */,
@@ -9141,7 +9145,6 @@
91419145
CLANG_CXX_LIBRARY = "libc++";
91429146
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
91439147
CLANG_WARN_BOOL_CONVERSION = YES;
9144-
CLANG_WARN_COMMA = YES;
91459148
CLANG_WARN_CONSTANT_CONVERSION = YES;
91469149
CLANG_WARN_EMPTY_BODY = YES;
91479150
CLANG_WARN_ENUM_CONVERSION = YES;
@@ -9561,7 +9564,6 @@
95619564
CLANG_CXX_LIBRARY = "libc++";
95629565
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
95639566
CLANG_WARN_BOOL_CONVERSION = YES;
9564-
CLANG_WARN_COMMA = YES;
95659567
CLANG_WARN_CONSTANT_CONVERSION = YES;
95669568
CLANG_WARN_EMPTY_BODY = YES;
95679569
CLANG_WARN_ENUM_CONVERSION = YES;
@@ -9626,7 +9628,6 @@
96269628
CLANG_CXX_LIBRARY = "libc++";
96279629
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
96289630
CLANG_WARN_BOOL_CONVERSION = YES;
9629-
CLANG_WARN_COMMA = YES;
96309631
CLANG_WARN_CONSTANT_CONVERSION = YES;
96319632
CLANG_WARN_EMPTY_BODY = YES;
96329633
CLANG_WARN_ENUM_CONVERSION = YES;

‎VisualStudio/vs2017/AR.vcxproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,7 @@
196196
<ClCompile Include="..\..\lib\SRC\AR\paramDistortion.c" />
197197
<ClCompile Include="..\..\lib\SRC\AR\paramFile.c" />
198198
<ClCompile Include="..\..\lib\SRC\AR\paramGetPerspective.c" />
199+
<ClCompile Include="..\..\lib\SRC\AR\paramGL.c" />
199200
<ClCompile Include="..\..\lib\SRC\AR\paramLT.c" />
200201
<ClCompile Include="..\..\lib\SRC\AR\vAlloc.c" />
201202
<ClCompile Include="..\..\lib\SRC\AR\vDisp.c" />

‎examples/ARApp/ARViewController.m‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848

4949
#import "ARViewController.h"
5050
#import "ARView.h"
51+
#import <AR/paramGL.h>
5152
#import <AR/gsub_es2.h>
5253
#import <ARUtil/time.h>
5354
#import <AudioToolbox/AudioToolbox.h> // SystemSoundID, AudioServicesCreateSystemSoundID()

‎examples/ARApp/MainWindow-iPad.xib‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
1-
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none">
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" colorMatched="YES">
3+
<device id="ipad9_7" orientation="portrait">
4+
<adaptation id="fullscreen"/>
5+
</device>
36
<dependencies>
4-
<deployment version="1792" identifier="iOS"/>
5-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9530"/>
7+
<deployment identifier="iOS"/>
8+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
9+
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
610
</dependencies>
711
<objects>
812
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="UIApplication">
@@ -20,7 +24,7 @@
2024
<window clearsContextBeforeDrawing="NO" contentMode="scaleAspectFit" visibleAtLaunch="YES" id="2" userLabel="Main Window">
2125
<rect key="frame" x="0.0" y="0.0" width="320" height="480"/>
2226
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
23-
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
27+
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
2428
<nil key="simulatedStatusBarMetrics"/>
2529
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
2630
</window>

‎examples/ARApp/MainWindow.xib‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
1-
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" colorMatched="YES">
3+
<device id="retina4_7" orientation="portrait">
4+
<adaptation id="fullscreen"/>
5+
</device>
36
<dependencies>
4-
<deployment version="1792" identifier="iOS"/>
5-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9530"/>
7+
<deployment identifier="iOS"/>
8+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
9+
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
610
</dependencies>
711
<objects>
812
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="UIApplication">
@@ -20,7 +24,7 @@
2024
<window clearsContextBeforeDrawing="NO" contentMode="scaleAspectFit" visibleAtLaunch="YES" id="2" userLabel="Main Window">
2125
<rect key="frame" x="0.0" y="0.0" width="320" height="480"/>
2226
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
23-
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
27+
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
2428
<nil key="simulatedStatusBarMetrics"/>
2529
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
2630
</window>

‎examples/ARApp2/ARViewController.m‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
//
4848

4949
#import "ARViewController.h"
50+
#import <AR/paramGL.h>
5051
#import <AR/gsub_es.h>
5152
#import <ARUtil/time.h>
5253
#import "../ARAppCore/ARMarkerSquare.h"

‎examples/ARApp2/MainWindow-iPad.xib‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
1-
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none">
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" colorMatched="YES">
3+
<device id="ipad9_7" orientation="portrait">
4+
<adaptation id="fullscreen"/>
5+
</device>
36
<dependencies>
4-
<deployment version="1792" identifier="iOS"/>
5-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9530"/>
7+
<deployment identifier="iOS"/>
8+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
9+
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
610
</dependencies>
711
<objects>
812
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="UIApplication">
@@ -20,7 +24,7 @@
2024
<window clearsContextBeforeDrawing="NO" contentMode="scaleAspectFit" visibleAtLaunch="YES" id="2" userLabel="Main Window">
2125
<rect key="frame" x="0.0" y="0.0" width="320" height="480"/>
2226
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
23-
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
27+
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
2428
<nil key="simulatedStatusBarMetrics"/>
2529
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
2630
</window>

‎examples/ARApp2/MainWindow.xib‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
1-
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" colorMatched="YES">
3+
<device id="retina4_7" orientation="portrait">
4+
<adaptation id="fullscreen"/>
5+
</device>
36
<dependencies>
4-
<deployment version="1792" identifier="iOS"/>
5-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9530"/>
7+
<deployment identifier="iOS"/>
8+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
9+
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
610
</dependencies>
711
<objects>
812
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="UIApplication">
@@ -20,7 +24,7 @@
2024
<window clearsContextBeforeDrawing="NO" contentMode="scaleAspectFit" visibleAtLaunch="YES" id="2" userLabel="Main Window">
2125
<rect key="frame" x="0.0" y="0.0" width="320" height="480"/>
2226
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
23-
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
27+
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
2428
<nil key="simulatedStatusBarMetrics"/>
2529
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
2630
</window>

‎examples/ARAppCameraTest/MainWindow-iPad.xib‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
1-
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none">
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" colorMatched="YES">
3+
<device id="ipad9_7" orientation="portrait">
4+
<adaptation id="fullscreen"/>
5+
</device>
36
<dependencies>
4-
<deployment version="1792" identifier="iOS"/>
5-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9530"/>
7+
<deployment identifier="iOS"/>
8+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
9+
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
610
</dependencies>
711
<objects>
812
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="UIApplication">
@@ -20,7 +24,7 @@
2024
<window clearsContextBeforeDrawing="NO" contentMode="scaleAspectFit" visibleAtLaunch="YES" id="2" userLabel="Main Window">
2125
<rect key="frame" x="0.0" y="0.0" width="320" height="480"/>
2226
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
23-
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
27+
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
2428
<nil key="simulatedStatusBarMetrics"/>
2529
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
2630
</window>

0 commit comments

Comments
 (0)