17 lines
837 B
Text
17 lines
837 B
Text
Index: cmake/OpenCVFindLibsGrfmt.cmake
|
|
--- cmake/OpenCVFindLibsGrfmt.cmake.orig
|
|
+++ cmake/OpenCVFindLibsGrfmt.cmake
|
|
@@ -253,12 +253,7 @@ if(NOT HAVE_SPNG AND WITH_PNG)
|
|
include(FindPNG)
|
|
if(PNG_FOUND)
|
|
include(CheckIncludeFile)
|
|
- check_include_file("${PNG_PNG_INCLUDE_DIR}/libpng/png.h" HAVE_LIBPNG_PNG_H)
|
|
- if(HAVE_LIBPNG_PNG_H)
|
|
- 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)
|
|
- else()
|
|
- ocv_parse_header("${PNG_PNG_INCLUDE_DIR}/png.h" PNG_VERSION_LINES PNG_LIBPNG_VER_MAJOR PNG_LIBPNG_VER_MINOR PNG_LIBPNG_VER_RELEASE)
|
|
- endif()
|
|
+ ocv_parse_header("${PNG_PNG_INCLUDE_DIR}/png.h" PNG_VERSION_LINES PNG_LIBPNG_VER_MAJOR PNG_LIBPNG_VER_MINOR PNG_LIBPNG_VER_RELEASE)
|
|
endif()
|
|
endif()
|
|
|