Skip to content

Commit cc09f5a

Browse files
alalekalalek
authored
Merge pull request opencv#7854 from alalek:backports_2016
(2.4) Backports from master branch (opencv#7854)
1 parent 49e6bb2 commit cc09f5a

Some content is hidden

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

61 files changed

+1568
-988
lines changed

‎3rdparty/libjasper/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ set_target_properties(${JASPER_LIBRARY}
3838
PROPERTIES
3939
OUTPUT_NAME ${JASPER_LIBRARY}
4040
DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
41+
COMPILE_PDB_NAME ${JASPER_LIBRARY}
42+
COMPILE_PDB_NAME_DEBUG "${JASPER_LIBRARY}${OPENCV_DEBUG_POSTFIX}"
4143
ARCHIVE_OUTPUT_DIRECTORY ${3P_LIBRARY_OUTPUT_PATH}
4244
)
4345

‎3rdparty/libjasper/jas_cm.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -842,7 +842,6 @@ static int jas_cmshapmat_apply(jas_cmpxform_t *pxform, jas_cmreal_t *in,
842842
*dst++ = a2;
843843
}
844844
} else {
845-
assert(0);
846845
while (--cnt >= 0) {
847846
a0 = *src++;
848847
src++;

‎3rdparty/libjasper/jas_stream.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -345,6 +345,7 @@ jas_stream_t *jas_stream_tmpfile()
345345
{
346346
jas_stream_t *stream;
347347
jas_stream_fileobj_t *obj;
348+
char *tmpname;
348349

349350
if (!(stream = jas_stream_create())) {
350351
return 0;
@@ -365,10 +366,12 @@ jas_stream_t *jas_stream_tmpfile()
365366

366367
#ifdef _WIN32
367368
/* Choose a file name. */
368-
tmpnam(obj->pathname);
369+
tmpname = tempnam(NULL, NULL);
370+
strcpy(obj->pathname, tmpname);
371+
free(tmpname);
369372

370373
/* Open the underlying file. */
371-
if ((obj->fd = open(obj->pathname, O_CREAT | O_EXCL | O_RDWR | O_TRUNC | O_BINARY,
374+
if ((obj->fd = open(obj->pathname, O_CREAT | O_EXCL | O_RDWR | O_TRUNC | O_BINARY | O_TEMPORARY | _O_SHORT_LIVED,
372375
JAS_STREAM_PERMS)) < 0) {
373376
jas_stream_destroy(stream);
374377
return 0;

‎3rdparty/libjpeg/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ ocv_warnings_disable(CMAKE_C_FLAGS -Wunused-parameter -Wshift-negative-value) #
3131
set_target_properties(${JPEG_LIBRARY}
3232
PROPERTIES OUTPUT_NAME ${JPEG_LIBRARY}
3333
DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
34+
COMPILE_PDB_NAME ${JPEG_LIBRARY}
35+
COMPILE_PDB_NAME_DEBUG "${JPEG_LIBRARY}${OPENCV_DEBUG_POSTFIX}"
3436
ARCHIVE_OUTPUT_DIRECTORY ${3P_LIBRARY_OUTPUT_PATH}
3537
)
3638

‎3rdparty/libpng/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ ocv_warnings_disable(CMAKE_C_FLAGS -Wcast-align)
4949
set_target_properties(${PNG_LIBRARY}
5050
PROPERTIES OUTPUT_NAME ${PNG_LIBRARY}
5151
DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
52+
COMPILE_PDB_NAME ${PNG_LIBRARY}
53+
COMPILE_PDB_NAME_DEBUG "${PNG_LIBRARY}${OPENCV_DEBUG_POSTFIX}"
5254
ARCHIVE_OUTPUT_DIRECTORY ${3P_LIBRARY_OUTPUT_PATH}
5355
)
5456

‎3rdparty/libtiff/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,8 @@ set_target_properties(${TIFF_LIBRARY}
108108
PROPERTIES
109109
OUTPUT_NAME "${TIFF_LIBRARY}"
110110
DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
111+
COMPILE_PDB_NAME ${TIFF_LIBRARY}
112+
COMPILE_PDB_NAME_DEBUG "${TIFF_LIBRARY}${OPENCV_DEBUG_POSTFIX}"
111113
ARCHIVE_OUTPUT_DIRECTORY ${3P_LIBRARY_OUTPUT_PATH}
112114
)
113115

‎3rdparty/openexr/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,8 @@ set_target_properties(IlmImf
6161
PROPERTIES
6262
OUTPUT_NAME "IlmImf"
6363
DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
64+
COMPILE_PDB_NAME "IlmImf"
65+
COMPILE_PDB_NAME_DEBUG "IlmImf${OPENCV_DEBUG_POSTFIX}"
6466
ARCHIVE_OUTPUT_DIRECTORY ${3P_LIBRARY_OUTPUT_PATH}
6567
)
6668

‎3rdparty/tbb/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,8 @@ endif()
245245
set_target_properties(tbb
246246
PROPERTIES OUTPUT_NAME tbb
247247
DEBUG_POSTFIX "${tbb_debug_postfix}"
248+
COMPILE_PDB_NAME tbb
249+
COMPILE_PDB_NAME_DEBUG "tbb${OPENCV_DEBUG_POSTFIX}"
248250
ARCHIVE_OUTPUT_DIRECTORY ${3P_LIBRARY_OUTPUT_PATH}
249251
RUNTIME_OUTPUT_DIRECTORY ${EXECUTABLE_OUTPUT_PATH}
250252
)

‎3rdparty/zlib/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,8 @@ ocv_warnings_disable(CMAKE_C_FLAGS -Wshorten-64-to-32 -Wattributes -Wstrict-prot
8787
set_target_properties(${ZLIB_LIBRARY} PROPERTIES
8888
OUTPUT_NAME ${ZLIB_LIBRARY}
8989
DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
90+
COMPILE_PDB_NAME ${ZLIB_LIBRARY}
91+
COMPILE_PDB_NAME_DEBUG "${ZLIB_LIBRARY}${OPENCV_DEBUG_POSTFIX}"
9092
ARCHIVE_OUTPUT_DIRECTORY ${3P_LIBRARY_OUTPUT_PATH}
9193
)
9294

‎apps/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ add_subdirectory(haartraining)
44
add_subdirectory(traincascade)
55
add_subdirectory(annotation)
66
add_subdirectory(visualisation)
7+
add_subdirectory(version)

0 commit comments

Comments
 (0)