Administrator/opencv-MIRROR
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-09-13 05:42:51 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7370 from souch55:Fixxn

Browse Source
This commit is contained in:
Alexander Alekhin
2016-10-01 10:44:55 +00:00
parent 16b4ccb846 a34fbf7bb1
commit 1c18b1d245
273 changed files with 657 additions and 657 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/highgui/include/opencv2/highgui.hpp
View File

@@ -40,8 +40,8 @@
//
//M*/
#ifndef __OPENCV_HIGHGUI_HPP__
#define __OPENCV_HIGHGUI_HPP__
#ifndef OPENCV_HIGHGUI_HPP
#define OPENCV_HIGHGUI_HPP
#include "opencv2/core.hpp"
#ifdef HAVE_OPENCV_IMGCODECS

4
modules/highgui/include/opencv2/highgui/highgui_c.h
View File

@@ -39,8 +39,8 @@
//
//M*/
#ifndef __OPENCV_HIGHGUI_H__
#define __OPENCV_HIGHGUI_H__
#ifndef OPENCV_HIGHGUI_H
#define OPENCV_HIGHGUI_H
#include "opencv2/core/core_c.h"
#include "opencv2/imgproc/imgproc_c.h"