Merge pull request #3363 from asmorkalov:qnx_support

This commit is contained in:
Vadim Pisarevsky
2014-10-26 17:42:24 +00:00
10 changed files with 190 additions and 19 deletions
+7 -3
View File
@@ -45,9 +45,16 @@
(see otherlibs/_graphics/readme.txt for copyright notice)
\****************************************************************************************/
#include <stdarg.h>
#include "precomp.hpp"
#include "grfmt_tiff.hpp"
#ifdef HAVE_TIFF
# include "tiff.h"
# include "tiffio.h"
#endif
namespace cv
{
static const char fmtSignTiffII[] = "II\x2a\x00";
@@ -55,9 +62,6 @@ static const char fmtSignTiffMM[] = "MM\x00\x2a";
#ifdef HAVE_TIFF
#include "tiff.h"
#include "tiffio.h"
static int grfmt_tiff_err_handler_init = 0;
static void GrFmtSilentTIFFErrorHandler( const char*, const char*, va_list ) {}