Merge pull request #146 from Dikay900/fix_vs2010_and_pre_compilation_line_descriptor_module

fix issue for vs versions which aren't standarized for the c99 standard
pull/229/head
Vadim Pisarevsky 10 years ago
commit c82b06f232
  1. 6
      modules/line_descriptor/include/opencv2/line_descriptor/descriptor.hpp
  2. 4
      modules/line_descriptor/src/types.hpp

@ -45,7 +45,13 @@
#include <map>
#include <vector>
#include <list>
#if defined _MSC_VER && _MSC_VER <= 1700
#include <stdint.h>
#else
#include <inttypes.h>
#endif
#include <stdio.h>
#include <iostream>

@ -40,7 +40,11 @@
//
//M*/
#if defined _MSC_VER && _MSC_VER <= 1700
#include <stdint.h>
#else
#include <inttypes.h>
#endif
#ifndef __OPENCV_TYPES_HPP
#define __OPENCV_TYPES_HPP

Loading…
Cancel
Save