potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 07:43:03 +04:00
Code Packages Releases Wiki Activity

Merge pull request #1110 from SpecLad:config-cleanup

Browse Source
This commit is contained in:
Andrey Pavlenko
2013-07-30 17:39:35 +04:00
committed by OpenCV Buildbot
parent c43b896541 0b4d0a8171
commit f7ce70f70a
40 changed files with 233 additions and 426 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/highgui/src/grfmt_jpeg2000.cpp
-6
View File
@@ -53,12 +53,6 @@
#endif
#endif
#undef PACKAGE
#undef PACKAGE_BUGREPORT
#undef PACKAGE_NAME
#undef PACKAGE_STRING
#undef PACKAGE_TARNAME
#undef PACKAGE_VERSION
#undef VERSION
#include <jasper/jasper.h>
modules/highgui/src/grfmt_png.cpp
-1
View File
@@ -51,7 +51,6 @@
and png2bmp sample from libpng distribution (Copyright (C) 1999-2001 MIYASAKA Masaru)
\****************************************************************************************/
#undef HAVE_UNISTD_H //to avoid redefinition
#ifndef _LFS64_LARGEFILE
# define _LFS64_LARGEFILE 0
#endif