Commit f05aabff authored by Jiang Zhiping's avatar Jiang Zhiping

fix duplicated defines

parent b6496813
......@@ -13,6 +13,10 @@
644C1F421F78A91F00784259 /* Rpoly.h in Headers */ = {isa = PBXBuildFile; fileRef = 644C1F411F78A90600784259 /* Rpoly.h */; settings = {ATTRIBUTES = (Public, ); }; };
644C1F431F78A91F00784259 /* RPP.h in Headers */ = {isa = PBXBuildFile; fileRef = 644C1F3F1F78A90500784259 /* RPP.h */; settings = {ATTRIBUTES = (Public, ); }; };
644C1F461F78A95900784259 /* KalmanFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = 644C1F451F78A95100784259 /* KalmanFilter.h */; settings = {ATTRIBUTES = (Public, ); }; };
644C1F5B1F78B87800784259 /* PoseSolverWrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 644C1F3B1F78A8DC00784259 /* PoseSolverWrapper.cpp */; };
644C1F5C1F78B88A00784259 /* Rpoly.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 644C1F3E1F78A90400784259 /* Rpoly.cpp */; };
644C1F5D1F78B88A00784259 /* RPP.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 644C1F401F78A90500784259 /* RPP.cpp */; };
644C1F6E1F78BC9E00784259 /* KalmanFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 644C1F441F78A95100784259 /* KalmanFilter.cpp */; };
64EED18D1E44590A00DA99CE /* jzplib_camera.h in Headers */ = {isa = PBXBuildFile; fileRef = 64EED18A1E44590A00DA99CE /* jzplib_camera.h */; };
64EED18E1E44590A00DA99CE /* jzplib_camera.h in Headers */ = {isa = PBXBuildFile; fileRef = 64EED18A1E44590A00DA99CE /* jzplib_camera.h */; settings = {ATTRIBUTES = (Public, ); }; };
64EED18F1E44590A00DA99CE /* jzplib_draw.h in Headers */ = {isa = PBXBuildFile; fileRef = 64EED18B1E44590A00DA99CE /* jzplib_draw.h */; };
......@@ -629,6 +633,10 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
644C1F6E1F78BC9E00784259 /* KalmanFilter.cpp in Sources */,
644C1F5C1F78B88A00784259 /* Rpoly.cpp in Sources */,
644C1F5D1F78B88A00784259 /* RPP.cpp in Sources */,
644C1F5B1F78B87800784259 /* PoseSolverWrapper.cpp in Sources */,
D4A78C091E3F54F200DAA3D8 /* jzplib_analysis.cpp in Sources */,
D47413851D9D021A002C99E7 /* jzplib_camera.cpp in Sources */,
D41B5C5A1E4A1737008EB5E9 /* ScreenCameraInfo_Mac.cpp in Sources */,
......
......@@ -11,6 +11,9 @@
#include <stdio.h>
#include <opencv2/opencv.hpp>
#ifndef __COCOA_XTENSIONS_HEADERBASE__
#ifndef INCH_TO_MM
#define INCH_TO_MM 25.4
#endif
......@@ -18,7 +21,6 @@
#define MM_TO_INCH 1.0/25.4
#endif
#ifndef __COCOA_XTENSIONS_HEADERBASE__
typedef enum {
UIDeviceOrientationUnknown,
UIDeviceOrientationPortrait, // Device oriented vertically, home button on the bottom
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment