Attachment #503810 for bug #637254

View | Details | Raw Unified | Return to bug 637254
Collapse All | Expand All

Lines 59-65 Link Here

(-)a/modules/imgcodecs/src/grfmt_png.cpp (-1 / +1 lines)
59	#endif	59	#endif
60		60
61	#ifdef HAVE_LIBPNG_PNG_H	61	#ifdef HAVE_LIBPNG_PNG_H
62	#include <libpng/png.h>	62	#include <libpng16/png.h>
63	#else	63	#else
64	#include <png.h>	64	#include <png.h>
65	#endif	65	#endif

Lines 257-263 Link Here

(-)a/modules/videoio/src/cap_libv4l.cpp (-1 / +1 lines)
257	#include <sys/ioctl.h>	257	#include <sys/ioctl.h>
258		258
259	#ifdef HAVE_CAMV4L	259	#ifdef HAVE_CAMV4L
260	#include <linux/videodev.h>	260	#include <linux/videodev2.h>
261	#endif	261	#endif
262	#ifdef HAVE_CAMV4L2	262	#ifdef HAVE_CAMV4L2
263	#include <linux/videodev2.h>	263	#include <linux/videodev2.h>

Lines 230-239 Link Here

(-)a/modules/videoio/src/cap_v4l.cpp (-2 / +2 lines)
230	#include <linux/videodev2.h>	230	#include <linux/videodev2.h>
231	#endif	231	#endif
232		232
233	#ifdef HAVE_VIDEOIO	233	/*#ifdef HAVE_VIDEOIO
234	// NetBSD compability layer with V4L2	234	// NetBSD compability layer with V4L2
235	#include <sys/videoio.h>	235	#include <sys/videoio.h>
236	#endif	236	#endif*/
237		237
238	/* Defaults - If your board can do better, set it here. Set for the most common type inputs. */	238	/* Defaults - If your board can do better, set it here. Set for the most common type inputs. */
239	#define DEFAULT_V4L_WIDTH 640	239	#define DEFAULT_V4L_WIDTH 640

Lines 158-166 Link Here

(-)a/cmake/OpenCVFindLibsGrfmt.cmake (-2 / +2 lines)
158	include(FindPNG)	158	include(FindPNG)
159	if(PNG_FOUND)	159	if(PNG_FOUND)
160	include(CheckIncludeFile)	160	include(CheckIncludeFile)
161	check_include_file("${PNG_PNG_INCLUDE_DIR}/libpng/png.h" HAVE_LIBPNG_PNG_H)	161	check_include_file("${PNG_PNG_INCLUDE_DIR}/libpng16/png.h" HAVE_LIBPNG_PNG_H)
162	if(HAVE_LIBPNG_PNG_H)	162	if(HAVE_LIBPNG_PNG_H)
163	ocv_parse_header("${PNG_PNG_INCLUDE_DIR}/libpng/png.h" PNG_VERSION_LINES PNG_LIBPNG_VER_MAJOR PNG_LIBPNG_VER_MINOR PNG_LIBPNG_VER_RELEASE)	163	ocv_parse_header("${PNG_PNG_INCLUDE_DIR}/libpng16/png.h" PNG_VERSION_LINES PNG_LIBPNG_VER_MAJOR PNG_LIBPNG_VER_MINOR PNG_LIBPNG_VER_RELEASE)
164	else()	164	else()
165	ocv_parse_header("${PNG_PNG_INCLUDE_DIR}/png.h" PNG_VERSION_LINES PNG_LIBPNG_VER_MAJOR PNG_LIBPNG_VER_MINOR PNG_LIBPNG_VER_RELEASE)	165	ocv_parse_header("${PNG_PNG_INCLUDE_DIR}/png.h" PNG_VERSION_LINES PNG_LIBPNG_VER_MAJOR PNG_LIBPNG_VER_MINOR PNG_LIBPNG_VER_RELEASE)
166	endif()	166	endif()

Lines 192-200 Link Here

(-)a/cmake/OpenCVFindLibsVideo.cmake (-2 / +3 lines)
192	set(HAVE_LIBV4L NO)	192	set(HAVE_LIBV4L NO)
193	endif()	193	endif()
194	endif()	194	endif()
195	CHECK_INCLUDE_FILE(linux/videodev.h HAVE_CAMV4L)	195	CHECK_INCLUDE_FILE(linux/videodev2.h HAVE_CAMV4L)
196	CHECK_INCLUDE_FILE(linux/videodev2.h HAVE_CAMV4L2)	196	CHECK_INCLUDE_FILE(linux/videodev2.h HAVE_CAMV4L2)
197	CHECK_INCLUDE_FILE(sys/videoio.h HAVE_VIDEOIO)	197	# CHECK_INCLUDE_FILE(sys/videoio.h HAVE_VIDEOIO)
		198	set(HAVE_VIDEOIO NO)
198	endif(WITH_V4L)	199	endif(WITH_V4L)
199		200
200	# --- OpenNI ---	201	# --- OpenNI ---




  add_extra_compiler_option(-Wformat)
  add_extra_compiler_option(-Werror=format-security -Wformat)
  add_extra_compiler_option(-Wmissing-declarations)
#  add_extra_compiler_option(-Wmissing-prototypes)
#  add_extra_compiler_option(-Wstrict-prototypes)
  add_extra_compiler_option(-Wundef)
  add_extra_compiler_option(-Winit-self)
  add_extra_compiler_option(-Wpointer-arith)
  add_extra_compiler_option(-Wshadow)
#  add_extra_compiler_option(-Wsign-promo)
  add_extra_compiler_option(-Wuninitialized)
  add_extra_compiler_option(-Winit-self)
#  add_extra_compiler_option(-fvisibility-inlines-hidden)

  if(ENABLE_NOISY_WARNINGS)
    add_extra_compiler_option(-Wcast-align)
    add_extra_compiler_option(-Wstrict-aliasing=2)
  else()
    add_extra_compiler_option(-Wno-narrowing)
#    add_extra_compiler_option(-Wno-delete-non-virtual-dtor)
#    add_extra_compiler_option(-Wno-unnamed-type-template-args)
    add_extra_compiler_option(-Wno-comment)
  endif()
  add_extra_compiler_option(-fdiagnostics-show-option)

# set default visibility to hidden
if(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_OPENCV_GCC_VERSION_NUM GREATER 399)
  add_extra_compiler_option(-fvisibility=hidden)
#  add_extra_compiler_option(-fvisibility-inlines-hidden)
endif()

#combine all "extra" options

Lines 1400-1405 Link Here

(-)a/CMakeLists.txt (+4 lines)
1400	endif()	1400	endif()
1401		1401
1402	# ========================== python ==========================	1402	# ========================== python ==========================
		1403	set(PYTHON_INCLUDE_DIR "/usr/include/python2.7")
		1404	set(PYTHON_LIBRARY "/usr/lib/python2.7")
1403	status("")	1405	status("")
1404	status(" Python 2:")	1406	status(" Python 2:")
1405	status(" Interpreter:" PYTHON2INTERP_FOUND THEN "${PYTHON2_EXECUTABLE} (ver ${PYTHON2_VERSION_STRING})" ELSE NO)	1407	status(" Interpreter:" PYTHON2INTERP_FOUND THEN "${PYTHON2_EXECUTABLE} (ver ${PYTHON2_VERSION_STRING})" ELSE NO)
Lines 1413-1418 Link Here
1413	status(" packages path:" PYTHON2_EXECUTABLE THEN "${PYTHON2_PACKAGES_PATH}" ELSE "-")	1415	status(" packages path:" PYTHON2_EXECUTABLE THEN "${PYTHON2_PACKAGES_PATH}" ELSE "-")
1414	endif()	1416	endif()
1415		1417
		1418	set(PYTHON_INCLUDE_DIR "/usr/include/python3.4m")
		1419	set(PYTHON_LIBRARY "/usr/lib/python3.4")
1416	status("")	1420	status("")
1417	status(" Python 3:")	1421	status(" Python 3:")
1418	status(" Interpreter:" PYTHON3INTERP_FOUND THEN "${PYTHON3_EXECUTABLE} (ver ${PYTHON3_VERSION_STRING})" ELSE NO)	1422	status(" Interpreter:" PYTHON3INTERP_FOUND THEN "${PYTHON3_EXECUTABLE} (ver ${PYTHON3_VERSION_STRING})" ELSE NO)

Return to bug 637254

Lines 120-142 Link Here

(-)a/cmake/OpenCVCompilerOptions.cmake (-6 / +7 lines)
120	add_extra_compiler_option(-Wformat)	120	add_extra_compiler_option(-Wformat)
121	add_extra_compiler_option(-Werror=format-security -Wformat)	121	add_extra_compiler_option(-Werror=format-security -Wformat)
122	add_extra_compiler_option(-Wmissing-declarations)	122	add_extra_compiler_option(-Wmissing-declarations)
123	add_extra_compiler_option(-Wmissing-prototypes)	123	# add_extra_compiler_option(-Wmissing-prototypes)
124	add_extra_compiler_option(-Wstrict-prototypes)	124	# add_extra_compiler_option(-Wstrict-prototypes)
125	add_extra_compiler_option(-Wundef)	125	add_extra_compiler_option(-Wundef)
126	add_extra_compiler_option(-Winit-self)	126	add_extra_compiler_option(-Winit-self)
127	add_extra_compiler_option(-Wpointer-arith)	127	add_extra_compiler_option(-Wpointer-arith)
128	add_extra_compiler_option(-Wshadow)	128	add_extra_compiler_option(-Wshadow)
129	add_extra_compiler_option(-Wsign-promo)	129	# add_extra_compiler_option(-Wsign-promo)
130	add_extra_compiler_option(-Wuninitialized)	130	add_extra_compiler_option(-Wuninitialized)
131	add_extra_compiler_option(-Winit-self)	131	add_extra_compiler_option(-Winit-self)
		132	# add_extra_compiler_option(-fvisibility-inlines-hidden)
132		133
133	if(ENABLE_NOISY_WARNINGS)	134	if(ENABLE_NOISY_WARNINGS)
134	add_extra_compiler_option(-Wcast-align)	135	add_extra_compiler_option(-Wcast-align)
135	add_extra_compiler_option(-Wstrict-aliasing=2)	136	add_extra_compiler_option(-Wstrict-aliasing=2)
136	else()	137	else()
137	add_extra_compiler_option(-Wno-narrowing)	138	add_extra_compiler_option(-Wno-narrowing)
138	add_extra_compiler_option(-Wno-delete-non-virtual-dtor)	139	# add_extra_compiler_option(-Wno-delete-non-virtual-dtor)
139	add_extra_compiler_option(-Wno-unnamed-type-template-args)	140	# add_extra_compiler_option(-Wno-unnamed-type-template-args)
140	add_extra_compiler_option(-Wno-comment)	141	add_extra_compiler_option(-Wno-comment)
141	endif()	142	endif()
142	add_extra_compiler_option(-fdiagnostics-show-option)	143	add_extra_compiler_option(-fdiagnostics-show-option)
Lines 281-287 Link Here
281	# set default visibility to hidden	282	# set default visibility to hidden
282	if(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_OPENCV_GCC_VERSION_NUM GREATER 399)	283	if(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_OPENCV_GCC_VERSION_NUM GREATER 399)
283	add_extra_compiler_option(-fvisibility=hidden)	284	add_extra_compiler_option(-fvisibility=hidden)
284	add_extra_compiler_option(-fvisibility-inlines-hidden)	285	# add_extra_compiler_option(-fvisibility-inlines-hidden)
285	endif()	286	endif()
286		287
287	#combine all "extra" options	288	#combine all "extra" options