Merge pull request #532 from alalek:fix_opencv_6016

pull/537/head
Alexander Alekhin 9 years ago
commit cf92b8b8e7
  1. 6
      modules/hdf/include/opencv2/hdf/hdf5.hpp
  2. 2
      modules/hdf/src/hdf5.cpp

@ -37,16 +37,12 @@
#include <vector> #include <vector>
#include <hdf5.h>
using namespace std;
namespace cv namespace cv
{ {
namespace hdf namespace hdf
{ {
using namespace std;
//! @addtogroup hdf5 //! @addtogroup hdf5
//! @{ //! @{

@ -34,7 +34,7 @@
#include "precomp.hpp" #include "precomp.hpp"
#include <hdf5.h>
using namespace std; using namespace std;

Loading…
Cancel
Save