Skip to content

Commit fd91072

Browse files
CartuchoCartucho
authored
Merge branch 'master' into compiling_java_code
2 parents 3611396 + ef2e5a9 commit fd91072

File tree

603 files changed

+283071
-16672
lines changed

Some content is hidden

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

603 files changed

+283071
-16672
lines changed

‎.gitattributes

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@
3131
*.py text
3232
*.qrc text
3333
*.qss text
34+
*.rc text
35+
*.rc.in text
3436
*.S text
3537
*.sbt text
3638
*.scala text

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,4 @@ bin/
2121
*.log
2222
*.tlog
2323
build
24+
.cache

‎3rdparty/carotene/hal/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ function(compile_carotene)
6767
endif()
6868
check_cxx_compiler_flag("-mfpu=neon" CXX_HAS_MFPU_NEON)
6969
check_c_compiler_flag("-mfpu=neon" C_HAS_MFPU_NEON)
70-
if(${CXX_HAS_MFPU_NEON} AND ${C_HAS_MFPU_NEON})
70+
if(${CXX_HAS_MFPU_NEON} AND ${C_HAS_MFPU_NEON} AND NOT "${CMAKE_CXX_FLAGS} " MATCHES "-mfpu=neon[^ ]*")
7171
get_target_property(old_flags "carotene_objs" COMPILE_FLAGS)
7272
if(old_flags)
7373
set_target_properties("carotene_objs" PROPERTIES COMPILE_FLAGS "${old_flags} -mfpu=neon")

‎3rdparty/carotene/src/channel_extract.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ void extract4(const Size2D &size,
231231
srcStride == dst2Stride && \
232232
srcStride == dst3Stride &&
233233

234-
#if __GNUC__ == 4 && __GNUC_MINOR__ < 7
234+
#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7
235235

236236
#define SPLIT_ASM2(sgn, bits) __asm__ ( \
237237
"vld2." #bits " {d0, d2}, [%[in0]] \n\t" \
@@ -280,7 +280,7 @@ void extract4(const Size2D &size,
280280
FILL_LINES##n(VST1Q, sgn##bits) \
281281
}
282282

283-
#endif // __GNUC__ == 4 && __GNUC_MINOR__ < 7
283+
#endif
284284

285285
#define SPLIT(sgn,bits,n) void split##n(const Size2D &_size, \
286286
const sgn##bits * srcBase, ptrdiff_t srcStride \
@@ -351,7 +351,7 @@ void extract4(const Size2D &size,
351351
} \
352352
}
353353

354-
#if __GNUC__ == 4 && __GNUC_MINOR__ < 7
354+
#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7
355355

356356
#define ALPHA_QUAD(sgn, bits) { \
357357
internal::prefetch(src + sj); \
@@ -378,7 +378,7 @@ void extract4(const Size2D &size,
378378
vst1q_##sgn##bits(dst1 + d1j, vals.v4.val[3]); \
379379
}
380380

381-
#endif // __GNUC__ == 4 && __GNUC_MINOR__ < 7
381+
#endif
382382

383383
#define SPLIT4ALPHA(sgn,bits) void split4(const Size2D &_size, \
384384
const sgn##bits * srcBase, ptrdiff_t srcStride, \

‎3rdparty/carotene/src/channels_combine.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ namespace CAROTENE_NS {
7777
dstStride == src2Stride && \
7878
dstStride == src3Stride &&
7979

80-
#if __GNUC__ == 4 && __GNUC_MINOR__ < 7
80+
#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 7
8181

8282
#define MERGE_ASM2(sgn, bits) __asm__ ( \
8383
"vld1." #bits " {d0-d1}, [%[in0]] \n\t" \
@@ -128,7 +128,7 @@ namespace CAROTENE_NS {
128128
vst##n##q_##sgn##bits(dst + dj, v_dst); \
129129
}
130130

131-
#endif // __GNUC__ == 4 && __GNUC_MINOR__ < 7
131+
#endif
132132

133133
#define COMBINE(sgn,bits,n) void combine##n(const Size2D &_size \
134134
FILL_LINES##n(FARG, sgn##bits), \

0 commit comments

Comments
 (0)