OLD | NEW |
---|---|
(Empty) | |
1 diff --git OpenCV_v2.4.7/XCompile-nacl.txt OpenCV_v2.4.7/XCompile-nacl.txt | |
2 new file mode 100644 | |
3 index 0000000..c651a2a | |
4 --- /dev/null | |
5 +++ Box2D_v2.2.1/XCompile-nacl.txt | |
6 @@ -0,0 +1,17 @@ | |
7 +# the name of the target operating system | |
8 +SET(CMAKE_SYSTEM_NAME Linux) | |
9 + | |
10 +SET(NACL_CROSS_PREFIX pnacl) | |
11 + | |
12 +# which compilers to use for C and C++ | |
13 +SET(CMAKE_C_COMPILER "${NACLCC}") | |
14 +SET(CMAKE_CXX_COMPILER "${NACLCXX}") | |
15 +set(CMAKE_AR ${NACLAR} CACHE FILEPATH "Archiver") | |
16 +SET(CMAKE_LINKER "${NACLLD}") | |
17 +SET(_CMAKE_TOOLCHAIN_PREFIX ${NACL_CROSS_PREFIX}) | |
18 + | |
19 +# here is the target environment located | |
20 +SET(CMAKE_FIND_ROOT_PATH ${NACL_TOOLCHAIN_ROOT}) | |
21 + | |
22 +# pnacl abi says 32bits little endian | |
23 +set(CMAKE_SIZEOF_VOID_P 4) | |
24 diff -Naur opencv-2.4.7/modules/contrib/src/inputoutput.cpp opencv-2.4.7.nacl/mo dules/contrib/src/inputoutput.cpp | |
25 --- opencv-2.4.7/modules/contrib/src/inputoutput.cpp 2013-11-06 15:26:39.0000 00000 +0100 | |
26 +++ opencv-2.4.7.nacl/modules/contrib/src/inputoutput.cpp 2013-11-19 10:36 :46.000000000 +0100 | |
27 @@ -76,18 +76,6 @@ | |
28 { | |
29 return list; | |
30 } | |
31 - | |
32 - while ((dirp = readdir(dp)) != NULL) | |
33 - { | |
34 - if (dirp->d_type == DT_REG) | |
35 - { | |
36 - if (exten.compare("*") == 0) | |
37 - list.push_back(static_cast<std::string>(dirp->d_name)); | |
38 - else | |
39 - if (std::string(dirp->d_name).find(exten) != std::strin g::npos) | |
40 - list.push_back(static_cast<std::string>(dirp->d_nam e)); | |
41 - } | |
42 - } | |
Sam Clegg
2013/11/19 17:03:27
Can you instead wrap these chunks in #ifndef __nat
| |
43 closedir(dp); | |
44 #endif | |
45 | |
46 @@ -166,20 +154,6 @@ | |
47 { | |
48 return list; | |
49 } | |
50 - | |
51 - while ((dirp = readdir(dp)) != NULL) | |
52 - { | |
53 - if (dirp->d_type == DT_DIR && | |
54 - strcmp(dirp->d_name, ".") != 0 && | |
55 - strcmp(dirp->d_name, "..") != 0 ) | |
56 - { | |
57 - if (exten.compare("*") == 0) | |
58 - list.push_back(static_cast<std::string>(dirp->d_name)); | |
59 - else | |
60 - if (std::string(dirp->d_name).find(exten) != std::strin g::npos) | |
61 - list.push_back(static_cast<std::string>(dirp->d_nam e)); | |
62 - } | |
63 - } | |
64 closedir(dp); | |
65 #endif | |
66 | |
67 diff -Naur opencv-2.4.7/modules/core/include/opencv2/core/operations.hpp opencv- 2.4.7.nacl/modules/core/include/opencv2/core/operations.hpp | |
68 --- opencv-2.4.7/modules/core/include/opencv2/core/operations.hpp 2013-11- 06 15:26:39.000000000 +0100 | |
69 +++ opencv-2.4.7.nacl/modules/core/include/opencv2/core/operations.hpp 2013-11- 19 10:39:15.000000000 +0100 | |
70 @@ -58,7 +58,7 @@ | |
71 | |
72 #if defined __clang__ && __clang_major__ >= 3 && !defined __ANDROID__ | |
73 #ifdef __ATOMIC_SEQ_CST | |
74 - #define CV_XADD(addr, delta) __c11_atomic_fetch_add((_Atomic(int)*)(add r), (delta), __ATOMIC_SEQ_CST) | |
75 + int CV_XADD(int* addr, int delta) { int tmp = *addr; *addr += delta; re turn tmp; } | |
76 #else | |
77 #define CV_XADD(addr, delta) __atomic_fetch_add((_Atomic(int)*)(addr), (delta), 5) | |
78 #endif | |
79 diff -Naur opencv-2.4.7/modules/flann/include/opencv2/flann/allocator.h opencv-2 .4.7.nacl/modules/flann/include/opencv2/flann/allocator.h | |
80 --- opencv-2.4.7/modules/flann/include/opencv2/flann/allocator.h 2013-11- 06 15:26:39.000000000 +0100 | |
81 +++ opencv-2.4.7.nacl/modules/flann/include/opencv2/flann/allocator.h 2013-11- 19 10:40:38.000000000 +0100 | |
82 @@ -68,7 +68,7 @@ | |
83 * | |
84 */ | |
85 | |
86 -const size_t WORDSIZE=16; | |
87 +//const size_t WORDSIZE=16; | |
88 const size_t BLOCKSIZE=8192; | |
89 | |
90 class PooledAllocator | |
91 diff -Naur opencv-2.4.7/modules/legacy/src/calibfilter.cpp opencv-2.4.7.nacl/mod ules/legacy/src/calibfilter.cpp | |
92 --- opencv-2.4.7/modules/legacy/src/calibfilter.cpp 2013-11-06 15:26:39.0000 00000 +0100 | |
93 +++ opencv-2.4.7.nacl/modules/legacy/src/calibfilter.cpp 2013-11-19 10:44 :15.000000000 +0100 | |
94 @@ -42,7 +42,7 @@ | |
95 #include "precomp.hpp" | |
96 #include <stdio.h> | |
97 | |
98 -#undef quad | |
99 +//#undef quad | |
100 | |
101 CvCalibFilter::CvCalibFilter() | |
102 { | |
103 diff -Naur opencv-2.4.7/modules/legacy/src/epilines.cpp opencv-2.4.7.nacl/module s/legacy/src/epilines.cpp | |
104 --- opencv-2.4.7/modules/legacy/src/epilines.cpp 2013-11-06 15:26:39.0000 00000 +0100 | |
105 +++ opencv-2.4.7.nacl/modules/legacy/src/epilines.cpp 2013-11-19 10:44:23.0000 00000 +0100 | |
106 @@ -46,7 +46,7 @@ | |
107 | |
108 /* Valery Mosyagin */ | |
109 | |
110 -#undef quad | |
111 +//#undef quad | |
112 | |
113 #define EPS64D 1e-9 | |
114 | |
OLD | NEW |