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
/
include
/
cvaux.hpp
diff --git
a/cvaux/include/cvaux.hpp
b/cvaux/include/cvaux.hpp
index
6de0605
..
37ae897
100644
(file)
--- a/
cvaux/include/cvaux.hpp
+++ b/
cvaux/include/cvaux.hpp
@@
-112,7
+112,7
@@
public:
{ return m_back_project; }
float query( int* bin ) const
- { return m_hist ? cvGetRealND(m_hist->bins, bin) : 0.f; }
+ { return m_hist ? (float)cvGetRealND(m_hist->bins, bin) : 0.f; }
protected: