mirror of
https://github.com/opencv/opencv.git
synced 2026-07-30 15:53:03 +04:00
build: replace WIN32 => _WIN32
This commit is contained in:
@@ -57,14 +57,14 @@
|
||||
#define mingw_getsp(...) 0
|
||||
#define __builtin_frame_address(...) 0
|
||||
|
||||
#ifdef WIN32
|
||||
#ifdef _WIN32
|
||||
|
||||
#define XMD_H // prevent redefinition of INT32
|
||||
#undef FAR // prevent FAR redefinition
|
||||
|
||||
#endif
|
||||
|
||||
#if defined WIN32 && defined __GNUC__
|
||||
#if defined _WIN32 && defined __GNUC__
|
||||
typedef unsigned char boolean;
|
||||
#endif
|
||||
|
||||
|
||||
@@ -47,7 +47,7 @@
|
||||
#include "grfmt_jpeg2000.hpp"
|
||||
#include "opencv2/imgproc.hpp"
|
||||
|
||||
#ifdef WIN32
|
||||
#ifdef _WIN32
|
||||
#define JAS_WIN_MSVC_BUILD 1
|
||||
#ifdef __GNUC__
|
||||
#define HAVE_STDINT_H 1
|
||||
@@ -160,7 +160,7 @@ bool Jpeg2KDecoder::readData( Mat& img )
|
||||
jas_stream_t* stream = (jas_stream_t*)m_stream;
|
||||
jas_image_t* image = (jas_image_t*)m_image;
|
||||
|
||||
#ifndef WIN32
|
||||
#ifndef _WIN32
|
||||
// At least on some Linux instances the
|
||||
// system libjasper segfaults when
|
||||
// converting color to grey.
|
||||
@@ -272,7 +272,7 @@ bool Jpeg2KDecoder::readData( Mat& img )
|
||||
|
||||
close();
|
||||
|
||||
#ifndef WIN32
|
||||
#ifndef _WIN32
|
||||
if (!clr.empty())
|
||||
{
|
||||
cv::cvtColor(clr, img, COLOR_BGR2GRAY);
|
||||
|
||||
@@ -732,7 +732,7 @@ bool TiffEncoder::write( const Mat& img, const std::vector<int>& /*params*/)
|
||||
if( m_buf )
|
||||
m_buf->reserve( alignSize(stripCount*8 + fileStep*height + 256, 256) );
|
||||
|
||||
/*#if defined _DEBUG || !defined WIN32
|
||||
/*#if defined _DEBUG || !defined _WIN32
|
||||
int uncompressedRowSize = rowsPerStrip * fileStep;
|
||||
#endif*/
|
||||
int directoryOffset = 0;
|
||||
|
||||
@@ -58,7 +58,7 @@
|
||||
#include <ctype.h>
|
||||
#include <assert.h>
|
||||
|
||||
#if defined WIN32 || defined WINCE
|
||||
#if defined _WIN32 || defined WINCE
|
||||
#include <windows.h>
|
||||
#undef small
|
||||
#undef min
|
||||
|
||||
Reference in New Issue
Block a user