generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed warnigs from zlib defines

Browse Source
This commit is contained in:
Andrey Kamaev
2012-06-21 10:28:57 +00:00
parent 3af92a9d92
commit 25f70e691a
3 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
modules/core/src/persistence.cpp
View File

@@ -59,7 +59,14 @@ typedef void* gzFile;
#endif #endif
#if USE_ZLIB #if USE_ZLIB
#include <zlib.h> # undef HAVE_UNISTD_H //to avoid redefinition
# ifndef _LFS64_LARGEFILE
# define _LFS64_LARGEFILE 0
# endif
# ifndef _FILE_OFFSET_BITS
# define _FILE_OFFSET_BITS 0
# endif
# include <zlib.h>
#endif #endif
/****************************************************************************************\ /****************************************************************************************\

6
modules/core/src/precomp.hpp
View File

@@ -43,7 +43,7 @@
#ifndef __OPENCV_PRECOMP_H__ #ifndef __OPENCV_PRECOMP_H__
#define __OPENCV_PRECOMP_H__ #define __OPENCV_PRECOMP_H__
#ifdef HAVE_CVCONFIG_H #ifdef HAVE_CVCONFIG_H
#include "cvconfig.h" #include "cvconfig.h"
#endif #endif
@@ -196,9 +196,9 @@ inline bool checkScalar(const Mat& sc, int atype, int sckind, int akind)
return sc.size() == Size(1, 1) || sc.size() == Size(1, cn) || sc.size() == Size(cn, 1) || return sc.size() == Size(1, 1) || sc.size() == Size(1, cn) || sc.size() == Size(cn, 1) ||
(sc.size() == Size(1, 4) && sc.type() == CV_64F && cn <= 4); (sc.size() == Size(1, 4) && sc.type() == CV_64F && cn <= 4);
} }
void convertAndUnrollScalar( const Mat& sc, int buftype, uchar* scbuf, size_t blocksize ); void convertAndUnrollScalar( const Mat& sc, int buftype, uchar* scbuf, size_t blocksize );
} }
#endif /*_CXCORE_INTERNAL_H_*/ #endif /*_CXCORE_INTERNAL_H_*/

9
modules/highgui/src/grfmt_png.cpp
View File

@@ -51,12 +51,21 @@
and png2bmp sample from libpng distribution (Copyright (C) 1999-2001 MIYASAKA Masaru) 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
#ifndef _FILE_OFFSET_BITS
# define _FILE_OFFSET_BITS 0
#endif
#ifdef HAVE_LIBPNG_PNG_H #ifdef HAVE_LIBPNG_PNG_H
#include <libpng/png.h> #include <libpng/png.h>
#else #else
#include <png.h> #include <png.h>
#endif #endif
#include <zlib.h> #include <zlib.h>
#include "grfmt_png.hpp" #include "grfmt_png.hpp"
#if defined _MSC_VER && _MSC_VER >= 1200 #if defined _MSC_VER && _MSC_VER >= 1200