|
|
|
@ -40,7 +40,7 @@ |
|
|
|
|
//M*/
|
|
|
|
|
|
|
|
|
|
//
|
|
|
|
|
// Loading and saving IPL images.
|
|
|
|
|
// Loading and saving images.
|
|
|
|
|
//
|
|
|
|
|
|
|
|
|
|
#include "precomp.hpp" |
|
|
|
@ -391,7 +391,6 @@ static void ApplyExifOrientation(const Mat& buf, Mat& img) |
|
|
|
|
* LOAD_MAT=2 |
|
|
|
|
* } |
|
|
|
|
* @param[in] mat Reference to C++ Mat object (If LOAD_MAT) |
|
|
|
|
* @param[in] scale_denom Scale value |
|
|
|
|
* |
|
|
|
|
*/ |
|
|
|
|
static void* |
|
|
|
@ -463,11 +462,11 @@ imread_( const String& filename, int flags, int hdrtype, Mat* mat=0 ) |
|
|
|
|
int type = decoder->type(); |
|
|
|
|
if( (flags & IMREAD_LOAD_GDAL) != IMREAD_LOAD_GDAL && flags != IMREAD_UNCHANGED ) |
|
|
|
|
{ |
|
|
|
|
if( (flags & CV_LOAD_IMAGE_ANYDEPTH) == 0 ) |
|
|
|
|
if( (flags & IMREAD_ANYDEPTH) == 0 ) |
|
|
|
|
type = CV_MAKETYPE(CV_8U, CV_MAT_CN(type)); |
|
|
|
|
|
|
|
|
|
if( (flags & CV_LOAD_IMAGE_COLOR) != 0 || |
|
|
|
|
((flags & CV_LOAD_IMAGE_ANYCOLOR) != 0 && CV_MAT_CN(type) > 1) ) |
|
|
|
|
if( (flags & IMREAD_COLOR) != 0 || |
|
|
|
|
((flags & IMREAD_ANYCOLOR) != 0 && CV_MAT_CN(type) > 1) ) |
|
|
|
|
type = CV_MAKETYPE(CV_MAT_DEPTH(type), 3); |
|
|
|
|
else |
|
|
|
|
type = CV_MAKETYPE(CV_MAT_DEPTH(type), 1); |
|
|
|
@ -583,11 +582,11 @@ imreadmulti_(const String& filename, int flags, std::vector<Mat>& mats) |
|
|
|
|
int type = decoder->type(); |
|
|
|
|
if( (flags & IMREAD_LOAD_GDAL) != IMREAD_LOAD_GDAL && flags != IMREAD_UNCHANGED ) |
|
|
|
|
{ |
|
|
|
|
if ((flags & CV_LOAD_IMAGE_ANYDEPTH) == 0) |
|
|
|
|
if ((flags & IMREAD_ANYDEPTH) == 0) |
|
|
|
|
type = CV_MAKETYPE(CV_8U, CV_MAT_CN(type)); |
|
|
|
|
|
|
|
|
|
if ((flags & CV_LOAD_IMAGE_COLOR) != 0 || |
|
|
|
|
((flags & CV_LOAD_IMAGE_ANYCOLOR) != 0 && CV_MAT_CN(type) > 1)) |
|
|
|
|
((flags & IMREAD_ANYCOLOR) != 0 && CV_MAT_CN(type) > 1)) |
|
|
|
|
type = CV_MAKETYPE(CV_MAT_DEPTH(type), 3); |
|
|
|
|
else |
|
|
|
|
type = CV_MAKETYPE(CV_MAT_DEPTH(type), 1); |
|
|
|
@ -819,11 +818,11 @@ imdecode_( const Mat& buf, int flags, int hdrtype, Mat* mat=0 ) |
|
|
|
|
int type = decoder->type(); |
|
|
|
|
if( (flags & IMREAD_LOAD_GDAL) != IMREAD_LOAD_GDAL && flags != IMREAD_UNCHANGED ) |
|
|
|
|
{ |
|
|
|
|
if( (flags & CV_LOAD_IMAGE_ANYDEPTH) == 0 ) |
|
|
|
|
if( (flags & IMREAD_ANYDEPTH) == 0 ) |
|
|
|
|
type = CV_MAKETYPE(CV_8U, CV_MAT_CN(type)); |
|
|
|
|
|
|
|
|
|
if( (flags & CV_LOAD_IMAGE_COLOR) != 0 || |
|
|
|
|
((flags & CV_LOAD_IMAGE_ANYCOLOR) != 0 && CV_MAT_CN(type) > 1) ) |
|
|
|
|
if( (flags & IMREAD_COLOR) != 0 || |
|
|
|
|
((flags & IMREAD_ANYCOLOR) != 0 && CV_MAT_CN(type) > 1) ) |
|
|
|
|
type = CV_MAKETYPE(CV_MAT_DEPTH(type), 3); |
|
|
|
|
else |
|
|
|
|
type = CV_MAKETYPE(CV_MAT_DEPTH(type), 1); |
|
|
|
|