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

removed ddepth from matrix (after Vadim's commit, it generates problem with core and ml tests)

Browse Source 
returned the new floating-point number formatting
This commit is contained in:
Alexander Shishkov 2011-05-31 21:14:42 +00:00
parent 035fd0019b
commit 80dfdf8ff7
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/core/src/matrix.cpp
View File

@ -1873,7 +1873,7 @@ void cv::reduce(const InputArray& _src, OutputArray _dst, int dim, int op, int d
op = CV_REDUCE_SUM; op = CV_REDUCE_SUM;
if( sdepth < CV_32S && ddepth < CV_32S ) if( sdepth < CV_32S && ddepth < CV_32S )
temp.create(dst.rows, dst.cols, CV_32SC(cn)); temp.create(dst.rows, dst.cols, CV_32SC(cn));
ddepth = CV_32S; //ddepth = CV_32S;
} }
ReduceFunc func = 0; ReduceFunc func = 0;

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

@ -775,7 +775,7 @@ icvDoubleToString( char* buf, double value )
sprintf( buf, "%d.", ivalue ); sprintf( buf, "%d.", ivalue );
else else
{ {
static const char* fmt = "%.16e"; static const char* fmt = "%.17g";
char* ptr = buf; char* ptr = buf;
sprintf( buf, fmt, value ); sprintf( buf, fmt, value );
if( *ptr == '+' || *ptr == '-' ) if( *ptr == '+' || *ptr == '-' )
@ -814,7 +814,7 @@ icvFloatToString( char* buf, float value )
sprintf( buf, "%d.", ivalue ); sprintf( buf, "%d.", ivalue );
else else
{ {
static const char* fmt = "%.8e"; static const char* fmt = "%.9g";
char* ptr = buf; char* ptr = buf;
sprintf( buf, fmt, value ); sprintf( buf, fmt, value );
if( *ptr == '+' || *ptr == '-' ) if( *ptr == '+' || *ptr == '-' )