Merge pull request #3606 from jet47:warnings-fix

pull/3626/head
Vadim Pisarevsky 10 years ago
commit fe2a7d23a5
  1. 2
      modules/features2d/src/kaze/AKAZEFeatures.cpp
  2. 2
      modules/imgcodecs/test/test_grfmt.cpp

@ -818,7 +818,7 @@ void AKAZEFeatures::Compute_Main_Orientation(KeyPoint& kpt, const std::vector<TE
ang2 = (ang1 + (float)(CV_PI / 3.0) >(float)(2.0*CV_PI) ? ang1 - (float)(5.0*CV_PI / 3.0) : ang1 + (float)(CV_PI / 3.0));
sumX = sumY = 0.f;
for (size_t k = 0; k < ang_size; ++k) {
for (int k = 0; k < ang_size; ++k) {
// Get angle from the x-axis of the sample point
const float & ang = Ang[k];

@ -664,7 +664,7 @@ private:
vector<Mat> pages;
bool res = imreadmulti(folder + "multipage.tif", pages, flags);
ASSERT_TRUE(res == true);
ASSERT_TRUE(pages.size() == page_count);
ASSERT_EQ(static_cast<size_t>(page_count), pages.size());
for (int i = 0; i < page_count; i++)
{

Loading…
Cancel
Save