projects
/
opencv
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update the trunk to the OpenCV's CVS (2008-07-14)
[opencv]
/
cvaux
/
src
/
cv3dtracker.cpp
diff --git
a/cvaux/src/cv3dtracker.cpp
b/cvaux/src/cv3dtracker.cpp
index
69005b5
..
aa8a0e3
100644
(file)
--- a/
cvaux/src/cv3dtracker.cpp
+++ b/
cvaux/src/cv3dtracker.cpp
@@
-141,7
+141,8
@@
CV_IMPL CvBool cv3dTrackerCalibrateCameras(int num_cameras,
if (samples[c]->nChannels == 3)
{
// convert to gray
if (samples[c]->nChannels == 3)
{
// convert to gray
- if (gray_img == NULL || !CV_ARE_SIZES_EQ(gray_img, samples[c]))
+ if (gray_img == NULL || gray_img->width != samples[c]->width ||
+ gray_img->height != samples[c]->height )
{
if (gray_img != NULL)
cvReleaseImage(&gray_img);
{
if (gray_img != NULL)
cvReleaseImage(&gray_img);
@@
-158,7
+159,8
@@
CV_IMPL CvBool cv3dTrackerCalibrateCameras(int num_cameras,
img = samples[c];
}
img = samples[c];
}
- if (tmp_img == NULL || !CV_ARE_SIZES_EQ(tmp_img, samples[c]))
+ if (tmp_img == NULL || tmp_img->width != samples[c]->width ||
+ tmp_img->height != samples[c]->height )
{
if (tmp_img != NULL)
cvReleaseImage(&tmp_img);
{
if (tmp_img != NULL)
cvReleaseImage(&tmp_img);