Chiebot-Mirror
/
opencv
mirror of https://github.com/opencv/opencv.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #13072 from gineshidalgo99:Pendantic_warning

Browse Source
pull/13106/head
Alexander Alekhin 6 years ago
parent 75a6eaf147 b5248da826
commit be9b676db3
3 changed files with 17 additions and 17 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 22
      modules/core/include/opencv2/core/cvdef.h
  2. 10
      modules/core/include/opencv2/core/mat.hpp
  3. 2
      modules/features2d/include/opencv2/features2d.hpp

22
modules/core/include/opencv2/core/cvdef.h
Unescape View File

@ -425,7 +425,7 @@ as well as exposing the C++11 enum class members for backwards compatibility
@code @code
// Provides operators required for flag enums // Provides operators required for flag enums
CV_ENUM_FLAGS(AccessFlag); CV_ENUM_FLAGS(AccessFlag)
// Exposes the listed members of the enum class AccessFlag to the current namespace // Exposes the listed members of the enum class AccessFlag to the current namespace
CV_ENUM_CLASS_EXPOSE(AccessFlag, ACCESS_READ [, ACCESS_WRITE [, ...] ]); CV_ENUM_CLASS_EXPOSE(AccessFlag, ACCESS_READ [, ACCESS_WRITE [, ...] ]);
@ -539,18 +539,18 @@ static inline EnumType& operator^=(EnumType& _this, const Arg1Type& val)
__CV_EXPAND(__CV_CAT(__CV_ENUM_CLASS_EXPOSE_, __CV_VA_NUM_ARGS(__VA_ARGS__))(EnumType, __VA_ARGS__)); \ __CV_EXPAND(__CV_CAT(__CV_ENUM_CLASS_EXPOSE_, __CV_VA_NUM_ARGS(__VA_ARGS__))(EnumType, __VA_ARGS__)); \
#define CV_ENUM_FLAGS(EnumType) \ #define CV_ENUM_FLAGS(EnumType) \
__CV_ENUM_FLAGS_LOGICAL_NOT (EnumType); \ __CV_ENUM_FLAGS_LOGICAL_NOT (EnumType) \
__CV_ENUM_FLAGS_LOGICAL_EQ (EnumType, int); \ __CV_ENUM_FLAGS_LOGICAL_EQ (EnumType, int) \
__CV_ENUM_FLAGS_LOGICAL_NOT_EQ (EnumType, int); \ __CV_ENUM_FLAGS_LOGICAL_NOT_EQ (EnumType, int) \
\ \
__CV_ENUM_FLAGS_BITWISE_NOT (EnumType); \ __CV_ENUM_FLAGS_BITWISE_NOT (EnumType) \
__CV_ENUM_FLAGS_BITWISE_OR (EnumType, EnumType, EnumType); \ __CV_ENUM_FLAGS_BITWISE_OR (EnumType, EnumType, EnumType) \
__CV_ENUM_FLAGS_BITWISE_AND (EnumType, EnumType, EnumType); \ __CV_ENUM_FLAGS_BITWISE_AND (EnumType, EnumType, EnumType) \
__CV_ENUM_FLAGS_BITWISE_XOR (EnumType, EnumType, EnumType); \ __CV_ENUM_FLAGS_BITWISE_XOR (EnumType, EnumType, EnumType) \
\ \
__CV_ENUM_FLAGS_BITWISE_OR_EQ (EnumType, EnumType); \ __CV_ENUM_FLAGS_BITWISE_OR_EQ (EnumType, EnumType) \
__CV_ENUM_FLAGS_BITWISE_AND_EQ (EnumType, EnumType); \ __CV_ENUM_FLAGS_BITWISE_AND_EQ (EnumType, EnumType) \
__CV_ENUM_FLAGS_BITWISE_XOR_EQ (EnumType, EnumType); \ __CV_ENUM_FLAGS_BITWISE_XOR_EQ (EnumType, EnumType) \
/****************************************************************************************\ /****************************************************************************************\
* static analysys * * static analysys *

10
modules/core/include/opencv2/core/mat.hpp
Unescape View File

@ -63,8 +63,8 @@ namespace cv
enum AccessFlag { ACCESS_READ=1<<24, ACCESS_WRITE=1<<25, enum AccessFlag { ACCESS_READ=1<<24, ACCESS_WRITE=1<<25,
ACCESS_RW=3<<24, ACCESS_MASK=ACCESS_RW, ACCESS_FAST=1<<26 }; ACCESS_RW=3<<24, ACCESS_MASK=ACCESS_RW, ACCESS_FAST=1<<26 };
CV_ENUM_FLAGS(AccessFlag); CV_ENUM_FLAGS(AccessFlag)
__CV_ENUM_FLAGS_BITWISE_AND(AccessFlag, int, AccessFlag); __CV_ENUM_FLAGS_BITWISE_AND(AccessFlag, int, AccessFlag)
CV__DEBUG_NS_BEGIN CV__DEBUG_NS_BEGIN
@ -259,8 +259,8 @@ protected:
void init(int _flags, const void* _obj); void init(int _flags, const void* _obj);
void init(int _flags, const void* _obj, Size _sz); void init(int _flags, const void* _obj, Size _sz);
}; };
CV_ENUM_FLAGS(_InputArray::KindFlag); CV_ENUM_FLAGS(_InputArray::KindFlag)
__CV_ENUM_FLAGS_BITWISE_AND(_InputArray::KindFlag, int, _InputArray::KindFlag); __CV_ENUM_FLAGS_BITWISE_AND(_InputArray::KindFlag, int, _InputArray::KindFlag)
/** @brief This type is very similar to InputArray except that it is used for input/output and output function /** @brief This type is very similar to InputArray except that it is used for input/output and output function
parameters. parameters.
@ -563,7 +563,7 @@ struct CV_EXPORTS UMatData
int mapcount; int mapcount;
UMatData* originalUMatData; UMatData* originalUMatData;
}; };
CV_ENUM_FLAGS(UMatData::MemoryFlag); CV_ENUM_FLAGS(UMatData::MemoryFlag)
struct CV_EXPORTS MatSize struct CV_EXPORTS MatSize

2
modules/features2d/include/opencv2/features2d.hpp
Unescape View File

@ -1199,7 +1199,7 @@ enum struct DrawMatchesFlags
DRAW_RICH_KEYPOINTS = 4 //!< For each keypoint the circle around keypoint with keypoint size and DRAW_RICH_KEYPOINTS = 4 //!< For each keypoint the circle around keypoint with keypoint size and
//!< orientation will be drawn. //!< orientation will be drawn.
}; };
CV_ENUM_FLAGS(DrawMatchesFlags); CV_ENUM_FLAGS(DrawMatchesFlags)
/** @brief Draws keypoints. /** @brief Draws keypoints.

Write Preview
Loading…
Cancel
Save