potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 23:33:05 +04:00
Code Packages Releases Wiki Activity

Merge pull request #17818 from komakai:documentation-improvements

Browse Source 
Documentation fixes/improvements

* Documentation fixes/improvements

* Remove HASH_UTILS defines
This commit is contained in:
Giles Payne
2020-07-16 03:42:05 +09:00
committed by GitHub
parent cb2e276bff
commit af9ee90091
17 changed files with 64 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/core/misc/objc/common/CVObjcUtil.h
-6
View File
@@ -6,12 +6,6 @@
#pragma once
typedef union { double d; int64_t l; } V64;
typedef union { float f; int32_t i; } V32;
#define DOUBLE_TO_BITS(x) ((V64){ .d = x }).l
#define FLOAT_TO_BITS(x) ((V32){ .f = x }).i
#ifndef CV_EXPORTS
#ifdef __cplusplus
#define CV_EXPORTS __attribute__ ((visibility ("default")))
modules/core/misc/objc/common/DMatch.mm
+2 -1
View File
@@ -5,7 +5,6 @@
//
#import "DMatch.h"
#import "CVObjcUtil.h"
@implementation DMatch {
cv::DMatch native;
@@ -90,6 +89,8 @@
}
}
#define FLOAT_TO_BITS(x) ((Cv32suf){ .f = x }).i
- (NSUInteger)hash {
int prime = 31;
uint32_t result = 1;
modules/core/misc/objc/common/KeyPoint.mm
+2 -1
View File
@@ -6,7 +6,6 @@
#import "KeyPoint.h"
#import "Point2f.h"
#import "CVObjcUtil.h"
@implementation KeyPoint {
cv::KeyPoint native;
@@ -75,6 +74,8 @@
}
}
#define FLOAT_TO_BITS(x) ((Cv32suf){ .f = x }).i
- (NSUInteger)hash {
int prime = 31;
uint32_t result = 1;
modules/core/misc/objc/common/Point2d.mm
+2 -1
View File
@@ -6,7 +6,6 @@
#import "Point2d.h"
#import "Rect2d.h"
#import "CVObjcUtil.h"
@implementation Point2d {
cv::Point2d native;
@@ -90,6 +89,8 @@
return [rect contains:self];
}
#define DOUBLE_TO_BITS(x) ((Cv64suf){ .f = x }).i
- (NSUInteger)hash {
int prime = 31;
uint32_t result = 1;
modules/core/misc/objc/common/Point2f.mm
+2 -1
View File
@@ -6,7 +6,6 @@
#import "Point2f.h"
#import "Rect2f.h"
#import "CVObjcUtil.h"
@implementation Point2f {
cv::Point2f native;
@@ -90,6 +89,8 @@
return [rect contains:self];
}
#define FLOAT_TO_BITS(x) ((Cv32suf){ .f = x }).i
- (NSUInteger)hash {
int prime = 31;
uint32_t result = 1;
modules/core/misc/objc/common/Point3d.mm
+2 -1
View File
@@ -6,7 +6,6 @@
#import "Point3d.h"
#import "Point2d.h"
#import "CVObjcUtil.h"
@implementation Point3d {
cv::Point3d native;
@@ -95,6 +94,8 @@
}
}
#define DOUBLE_TO_BITS(x) ((Cv64suf){ .f = x }).i
- (NSUInteger)hash {
int prime = 31;
uint32_t result = 1;
modules/core/misc/objc/common/Point3f.mm
+2 -1
View File
@@ -6,7 +6,6 @@
#import "Point3f.h"
#import "Point2f.h"
#import "CVObjcUtil.h"
@implementation Point3f {
cv::Point3f native;
@@ -95,6 +94,8 @@
}
}
#define FLOAT_TO_BITS(x) ((Cv32suf){ .f = x }).i
- (NSUInteger)hash {
int prime = 31;
uint32_t result = 1;
modules/core/misc/objc/common/Rect2d.mm
+2 -1
View File
@@ -7,7 +7,6 @@
#import "Rect2d.h"
#import "Point2d.h"
#import "Size2d.h"
#import "CVObjcUtil.h"
@implementation Rect2d {
cv::Rect2d native;
@@ -134,6 +133,8 @@
}
}
#define DOUBLE_TO_BITS(x) ((Cv64suf){ .f = x }).i
- (NSUInteger)hash {
int prime = 31;
uint32_t result = 1;
modules/core/misc/objc/common/Rect2f.mm
+2 -1
View File
@@ -7,7 +7,6 @@
#import "Rect2f.h"
#import "Point2f.h"
#import "Size2f.h"
#import "CVObjcUtil.h"
@implementation Rect2f {
cv::Rect2f native;
@@ -134,6 +133,8 @@
}
}
#define FLOAT_TO_BITS(x) ((Cv32suf){ .f = x }).i
- (NSUInteger)hash {
int prime = 31;
uint32_t result = 1;
modules/core/misc/objc/common/RotatedRect.mm
+3 -1
View File
@@ -8,7 +8,6 @@
#import "Point2f.h"
#import "Size2f.h"
#import "Rect2f.h"
#import "CVObjcUtil.h"
#include <math.h>
@@ -94,6 +93,9 @@
}
}
#define FLOAT_TO_BITS(x) ((Cv32suf){ .f = x }).i
#define DOUBLE_TO_BITS(x) ((Cv64suf){ .f = x }).i
- (NSUInteger)hash {
int prime = 31;
uint32_t result = 1;
modules/core/misc/objc/common/Scalar.mm
+2 -1
View File
@@ -5,7 +5,6 @@
//
#import "Scalar.h"
#import "CVObjcUtil.h"
double getVal(NSArray<NSNumber*>* vals, int index) {
return [vals count] > index ? vals[index].doubleValue : 0;
@@ -94,6 +93,8 @@ double getVal(NSArray<NSNumber*>* vals, int index) {
}
}
#define DOUBLE_TO_BITS(x) ((Cv64suf){ .f = x }).i
- (NSUInteger)hash
{
int prime = 31;
modules/core/misc/objc/common/Size2d.mm
+2 -1
View File
@@ -6,7 +6,6 @@
#import "Size2d.h"
#import "Point2d.h"
#import "CVObjcUtil.h"
@implementation Size2d {
cv::Size2d native;
@@ -93,6 +92,8 @@
}
}
#define DOUBLE_TO_BITS(x) ((Cv64suf){ .f = x }).i
- (NSUInteger)hash {
int prime = 31;
uint32_t result = 1;
modules/core/misc/objc/common/Size2f.mm
+2 -1
View File
@@ -6,7 +6,6 @@
#import "Size2f.h"
#import "Point2f.h"
#import "CVObjcUtil.h"
@implementation Size2f {
cv::Size2f native;
@@ -93,6 +92,8 @@
}
}
#define FLOAT_TO_BITS(x) ((Cv32suf){ .f = x }).i
- (NSUInteger)hash {
int prime = 31;
uint32_t result = 1;
modules/core/misc/objc/common/TermCriteria.mm
+2 -1
View File
@@ -5,7 +5,6 @@
//
#import "TermCriteria.h"
#import "CVObjcUtil.h"
@implementation TermCriteria {
cv::TermCriteria native;
@@ -102,6 +101,8 @@
}
}
#define DOUBLE_TO_BITS(x) ((Cv64suf){ .f = x }).i
- (NSUInteger)hash {
int prime = 31;
uint32_t result = 1;