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

1) detail source group for stitching

Browse Source 
2) warnings
This commit is contained in:
Anatoly Baksheev 2011-09-29 13:44:27 +00:00
parent 5d363e67a0
commit f838db92c7
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
OpenCVModule.cmake
View File

@ -144,7 +144,8 @@ macro(define_opencv_module name)
file(GLOB lib_srcs "src/*.cpp")
file(GLOB lib_int_hdrs "src/*.h*")
file(GLOB lib_hdrs "include/opencv2/${name}/*.h*" "include/opencv2/${name}/detail/*.h*")
file(GLOB lib_hdrs "include/opencv2/${name}/*.h*")
file(GLOB lib_hdrs_detail "include/opencv2/${name}/detail/*.h*")
if(COMMAND get_module_external_sources)
get_module_external_sources(${name})
@ -152,6 +153,8 @@ macro(define_opencv_module name)
source_group("Src" FILES ${lib_srcs} ${lib_int_hdrs})
source_group("Include" FILES ${lib_hdrs})
source_group("Include\\detail" FILES ${lib_hdrs_detail})
list(APPEND lib_hdrs ${lib_hdrs_detail})
set(the_target "opencv_${name}")
if (${name} MATCHES "ts" AND MINGW)

6
modules/imgproc/src/phasecorr.cpp
View File

@ -83,8 +83,8 @@ static void magSpectrums( InputArray _src, OutputArray _dst)
for( j = 1; j <= rows - 2; j += 2 )
{
dataDst[j*stepDst] = (double)dataSrc[j*stepSrc]*dataSrc[j*stepSrc] +
(double)dataSrc[(j+1)*stepSrc]*dataSrc[(j+1)*stepSrc];
dataDst[j*stepDst] = (float)((double)dataSrc[j*stepSrc]*dataSrc[j*stepSrc] +
(double)dataSrc[(j+1)*stepSrc]*dataSrc[(j+1)*stepSrc]);
}
if( k == 1 )
@ -103,7 +103,7 @@ static void magSpectrums( InputArray _src, OutputArray _dst)
for( j = j0; j < j1; j += 2 )
{
dataDst[j] = (double)dataSrc[j]*dataSrc[j] + (double)dataSrc[j+1]*dataSrc[j+1];
dataDst[j] = (float)((double)dataSrc[j]*dataSrc[j] + (double)dataSrc[j+1]*dataSrc[j+1]);
}
}
}