Skip to content

O
opencv
Commit 943ac965 authored by Sean McBride's avatar Sean McBride
Browse files
Options

Eliminated use of obsolete 'register' keyword 

Fixes clang warnings about uses of this obsolete keyword.
parent 7793299e
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 139 additions and 139 deletions
modules/calib3d/src/rho.cpp
View file @ 943ac965
......@@ -2370,7 +2370,7 @@ static inline float sacLMGain(const float* dH,
static inline int sacChol8x8Damped(const float (*A)[8],
float lambda,
float (*L)[8]){
const register int N = 8;
const int N = 8;
int i, j, k;
float lambdap1 = lambda + 1.0f;
float x;
......
modules/features2d/doc/agast.txt
View file @ 943ac965
This diff is collapsed.
modules/features2d/doc/agast_score.txt
View file @ 943ac965
......@@ -97,27 +97,27 @@ int agast_cornerScore<AgastFeatureDetector::OAST_9_16>(const uchar* ptr, const i
int bmax = 255;
int b_test = (bmax + bmin) / 2;
register short offset0 = (short) pixel[0];
register short offset1 = (short) pixel[1];
register short offset2 = (short) pixel[2];
register short offset3 = (short) pixel[3];
register short offset4 = (short) pixel[4];
register short offset5 = (short) pixel[5];
register short offset6 = (short) pixel[6];
register short offset7 = (short) pixel[7];
register short offset8 = (short) pixel[8];
register short offset9 = (short) pixel[9];
register short offset10 = (short) pixel[10];
register short offset11 = (short) pixel[11];
register short offset12 = (short) pixel[12];
register short offset13 = (short) pixel[13];
register short offset14 = (short) pixel[14];
register short offset15 = (short) pixel[15];
short offset0 = (short) pixel[0];
short offset1 = (short) pixel[1];
short offset2 = (short) pixel[2];
short offset3 = (short) pixel[3];
short offset4 = (short) pixel[4];
short offset5 = (short) pixel[5];
short offset6 = (short) pixel[6];
short offset7 = (short) pixel[7];
short offset8 = (short) pixel[8];
short offset9 = (short) pixel[9];
short offset10 = (short) pixel[10];
short offset11 = (short) pixel[11];
short offset12 = (short) pixel[12];
short offset13 = (short) pixel[13];
short offset14 = (short) pixel[14];
short offset15 = (short) pixel[15];
while(true)
{
register const int cb = *ptr + b_test;
register const int c_b = *ptr - b_test;
const int cb = *ptr + b_test;
const int c_b = *ptr - b_test;
if(ptr[offset0] > cb)
if(ptr[offset2] > cb)
if(ptr[offset4] > cb)
......@@ -2196,23 +2196,23 @@ int agast_cornerScore<AgastFeatureDetector::AGAST_7_12d>(const uchar* ptr, const
int bmax = 255;
int b_test = (bmax + bmin)/2;
register short offset0 = (short) pixel[0];
register short offset1 = (short) pixel[1];
register short offset2 = (short) pixel[2];
register short offset3 = (short) pixel[3];
register short offset4 = (short) pixel[4];
register short offset5 = (short) pixel[5];
register short offset6 = (short) pixel[6];
register short offset7 = (short) pixel[7];
register short offset8 = (short) pixel[8];
register short offset9 = (short) pixel[9];
register short offset10 = (short) pixel[10];
register short offset11 = (short) pixel[11];
short offset0 = (short) pixel[0];
short offset1 = (short) pixel[1];
short offset2 = (short) pixel[2];
short offset3 = (short) pixel[3];
short offset4 = (short) pixel[4];
short offset5 = (short) pixel[5];
short offset6 = (short) pixel[6];
short offset7 = (short) pixel[7];
short offset8 = (short) pixel[8];
short offset9 = (short) pixel[9];
short offset10 = (short) pixel[10];
short offset11 = (short) pixel[11];
while(true)
{
register const int cb = *ptr + b_test;
register const int c_b = *ptr - b_test;
const int cb = *ptr + b_test;
const int c_b = *ptr - b_test;
if(ptr[offset0] > cb)
if(ptr[offset5] > cb)
if(ptr[offset2] > cb)
......@@ -3409,23 +3409,23 @@ int agast_cornerScore<AgastFeatureDetector::AGAST_7_12s>(const uchar* ptr, const
int bmax = 255;
int b_test = (bmax + bmin)/2;
register short offset0 = (short) pixel[0];
register short offset1 = (short) pixel[1];
register short offset2 = (short) pixel[2];
register short offset3 = (short) pixel[3];
register short offset4 = (short) pixel[4];
register short offset5 = (short) pixel[5];
register short offset6 = (short) pixel[6];
register short offset7 = (short) pixel[7];
register short offset8 = (short) pixel[8];
register short offset9 = (short) pixel[9];
register short offset10 = (short) pixel[10];
register short offset11 = (short) pixel[11];
short offset0 = (short) pixel[0];
short offset1 = (short) pixel[1];
short offset2 = (short) pixel[2];
short offset3 = (short) pixel[3];
short offset4 = (short) pixel[4];
short offset5 = (short) pixel[5];
short offset6 = (short) pixel[6];
short offset7 = (short) pixel[7];
short offset8 = (short) pixel[8];
short offset9 = (short) pixel[9];
short offset10 = (short) pixel[10];
short offset11 = (short) pixel[11];
while(true)
{
register const int cb = *ptr + b_test;
register const int c_b = *ptr - b_test;
const int cb = *ptr + b_test;
const int c_b = *ptr - b_test;
if(ptr[offset0] > cb)
if(ptr[offset5] > cb)
if(ptr[offset2] < c_b)
......@@ -9044,19 +9044,19 @@ int agast_cornerScore<AgastFeatureDetector::AGAST_5_8>(const uchar* ptr, const i
int bmax = 255;
int b_test = (bmax + bmin)/2;
register short offset0 = (short) pixel[0];
register short offset1 = (short) pixel[1];
register short offset2 = (short) pixel[2];
register short offset3 = (short) pixel[3];
register short offset4 = (short) pixel[4];
register short offset5 = (short) pixel[5];
register short offset6 = (short) pixel[6];
register short offset7 = (short) pixel[7];
short offset0 = (short) pixel[0];
short offset1 = (short) pixel[1];
short offset2 = (short) pixel[2];
short offset3 = (short) pixel[3];
short offset4 = (short) pixel[4];
short offset5 = (short) pixel[5];
short offset6 = (short) pixel[6];
short offset7 = (short) pixel[7];
while(true)
{
register const int cb = *ptr + b_test;
register const int c_b = *ptr - b_test;
const int cb = *ptr + b_test;
const int c_b = *ptr - b_test;
if(ptr[offset0] > cb)
if(ptr[offset2] > cb)
if(ptr[offset3] > cb)
......
modules/features2d/src/agast.cpp
View file @ 943ac965
This diff is collapsed.
modules/features2d/src/agast_score.cpp
View file @ 943ac965
......@@ -98,27 +98,27 @@ int agast_cornerScore<AgastFeatureDetector::OAST_9_16>(const uchar* ptr, const i
int bmax = 255;
int b_test = (bmax + bmin) / 2;
register short offset0 = (short) pixel[0];
register short offset1 = (short) pixel[1];
register short offset2 = (short) pixel[2];
register short offset3 = (short) pixel[3];
register short offset4 = (short) pixel[4];
register short offset5 = (short) pixel[5];
register short offset6 = (short) pixel[6];
register short offset7 = (short) pixel[7];
register short offset8 = (short) pixel[8];
register short offset9 = (short) pixel[9];
register short offset10 = (short) pixel[10];
register short offset11 = (short) pixel[11];
register short offset12 = (short) pixel[12];
register short offset13 = (short) pixel[13];
register short offset14 = (short) pixel[14];
register short offset15 = (short) pixel[15];
short offset0 = (short) pixel[0];
short offset1 = (short) pixel[1];
short offset2 = (short) pixel[2];
short offset3 = (short) pixel[3];
short offset4 = (short) pixel[4];
short offset5 = (short) pixel[5];
short offset6 = (short) pixel[6];
short offset7 = (short) pixel[7];
short offset8 = (short) pixel[8];
short offset9 = (short) pixel[9];
short offset10 = (short) pixel[10];
short offset11 = (short) pixel[11];
short offset12 = (short) pixel[12];
short offset13 = (short) pixel[13];
short offset14 = (short) pixel[14];
short offset15 = (short) pixel[15];
while(true)
{
register const int cb = *ptr + b_test;
register const int c_b = *ptr - b_test;
const int cb = *ptr + b_test;
const int c_b = *ptr - b_test;
if(ptr[offset0] > cb)
if(ptr[offset2] > cb)
if(ptr[offset4] > cb)
......@@ -2173,23 +2173,23 @@ int agast_cornerScore<AgastFeatureDetector::AGAST_7_12d>(const uchar* ptr, const
int bmax = 255;
int b_test = (bmax + bmin)/2;
register short offset0 = (short) pixel[0];
register short offset1 = (short) pixel[1];
register short offset2 = (short) pixel[2];
register short offset3 = (short) pixel[3];
register short offset4 = (short) pixel[4];
register short offset5 = (short) pixel[5];
register short offset6 = (short) pixel[6];
register short offset7 = (short) pixel[7];
register short offset8 = (short) pixel[8];
register short offset9 = (short) pixel[9];
register short offset10 = (short) pixel[10];
register short offset11 = (short) pixel[11];
short offset0 = (short) pixel[0];
short offset1 = (short) pixel[1];
short offset2 = (short) pixel[2];
short offset3 = (short) pixel[3];
short offset4 = (short) pixel[4];
short offset5 = (short) pixel[5];
short offset6 = (short) pixel[6];
short offset7 = (short) pixel[7];
short offset8 = (short) pixel[8];
short offset9 = (short) pixel[9];
short offset10 = (short) pixel[10];
short offset11 = (short) pixel[11];
while(true)
{
register const int cb = *ptr + b_test;
register const int c_b = *ptr - b_test;
const int cb = *ptr + b_test;
const int c_b = *ptr - b_test;
if(ptr[offset0] > cb)
if(ptr[offset5] > cb)
if(ptr[offset2] > cb)
......@@ -3385,23 +3385,23 @@ int agast_cornerScore<AgastFeatureDetector::AGAST_7_12s>(const uchar* ptr, const
int bmax = 255;
int b_test = (bmax + bmin)/2;
register short offset0 = (short) pixel[0];
register short offset1 = (short) pixel[1];
register short offset2 = (short) pixel[2];
register short offset3 = (short) pixel[3];
register short offset4 = (short) pixel[4];
register short offset5 = (short) pixel[5];
register short offset6 = (short) pixel[6];
register short offset7 = (short) pixel[7];
register short offset8 = (short) pixel[8];
register short offset9 = (short) pixel[9];
register short offset10 = (short) pixel[10];
register short offset11 = (short) pixel[11];
short offset0 = (short) pixel[0];
short offset1 = (short) pixel[1];
short offset2 = (short) pixel[2];
short offset3 = (short) pixel[3];
short offset4 = (short) pixel[4];
short offset5 = (short) pixel[5];
short offset6 = (short) pixel[6];
short offset7 = (short) pixel[7];
short offset8 = (short) pixel[8];
short offset9 = (short) pixel[9];
short offset10 = (short) pixel[10];
short offset11 = (short) pixel[11];
while(true)
{
register const int cb = *ptr + b_test;
register const int c_b = *ptr - b_test;
const int cb = *ptr + b_test;
const int c_b = *ptr - b_test;
if(ptr[offset0] > cb)
if(ptr[offset5] > cb)
if(ptr[offset2] < c_b)
......@@ -9019,19 +9019,19 @@ int agast_cornerScore<AgastFeatureDetector::AGAST_5_8>(const uchar* ptr, const i
int bmax = 255;
int b_test = (bmax + bmin)/2;
register short offset0 = (short) pixel[0];
register short offset1 = (short) pixel[1];
register short offset2 = (short) pixel[2];
register short offset3 = (short) pixel[3];
register short offset4 = (short) pixel[4];
register short offset5 = (short) pixel[5];
register short offset6 = (short) pixel[6];
register short offset7 = (short) pixel[7];
short offset0 = (short) pixel[0];
short offset1 = (short) pixel[1];
short offset2 = (short) pixel[2];
short offset3 = (short) pixel[3];
short offset4 = (short) pixel[4];
short offset5 = (short) pixel[5];
short offset6 = (short) pixel[6];
short offset7 = (short) pixel[7];
while(true)
{
register const int cb = *ptr + b_test;
register const int c_b = *ptr - b_test;
const int cb = *ptr + b_test;
const int c_b = *ptr - b_test;
if(ptr[offset0] > cb)
if(ptr[offset2] > cb)
if(ptr[offset3] > cb)
......@@ -9377,11 +9377,11 @@ int agast_cornerScore<AgastFeatureDetector::AGAST_5_8>(const uchar* ptr, const i
int agast_tree_search(const uint32_t table_struct32[], int pixel_[], const unsigned char* const ptr, int threshold)
{
register const int cb = *ptr + threshold;
register const int c_b = *ptr - threshold;
register int index;
register int offset;
register int cmpresult;
const int cb = *ptr + threshold;
const int c_b = *ptr - threshold;
int index;
int offset;
int cmpresult;
index = 0;
while ((table_struct32[index]>>16)!=0)
{
......
modules/videoio/src/cap_dc1394.cpp
View file @ 943ac965
......@@ -907,10 +907,10 @@ b = b > 255 ? 255 : b
uyv2bgr(const unsigned char *src, unsigned char *dest,
unsigned long long int NumPixels)
{
register int i = NumPixels + (NumPixels << 1) - 1;
register int j = NumPixels + (NumPixels << 1) - 1;
register int y, u, v;
register int r, g, b;
int i = NumPixels + (NumPixels << 1) - 1;
int j = NumPixels + (NumPixels << 1) - 1;
int y, u, v;
int r, g, b;
while (i > 0) {
v = src[i--] - 128;
......@@ -927,10 +927,10 @@ uyv2bgr(const unsigned char *src, unsigned char *dest,
uyvy2bgr(const unsigned char *src, unsigned char *dest,
unsigned long long int NumPixels)
{
register int i = (NumPixels << 1) - 1;
register int j = NumPixels + (NumPixels << 1) - 1;
register int y0, y1, u, v;
register int r, g, b;
int i = (NumPixels << 1) - 1;
int j = NumPixels + (NumPixels << 1) - 1;
int y0, y1, u, v;
int r, g, b;
while (i > 0) {
y1 = src[i--];
......@@ -953,10 +953,10 @@ uyvy2bgr(const unsigned char *src, unsigned char *dest,
uyyvyy2bgr(const unsigned char *src, unsigned char *dest,
unsigned long long int NumPixels)
{
register int i = NumPixels + (NumPixels >> 1) - 1;
register int j = NumPixels + (NumPixels << 1) - 1;
register int y0, y1, y2, y3, u, v;
register int r, g, b;
int i = NumPixels + (NumPixels >> 1) - 1;
int j = NumPixels + (NumPixels << 1) - 1;
int y0, y1, y2, y3, u, v;
int r, g, b;
while (i > 0) {
y3 = src[i--];
......@@ -988,9 +988,9 @@ uyyvyy2bgr(const unsigned char *src, unsigned char *dest,
y2bgr(const unsigned char *src, unsigned char *dest,
unsigned long long int NumPixels)
{
register int i = NumPixels - 1;
register int j = NumPixels + (NumPixels << 1) - 1;
register int y;
int i = NumPixels - 1;
int j = NumPixels + (NumPixels << 1) - 1;
int y;
while (i > 0) {
y = src[i--];
......@@ -1004,9 +1004,9 @@ y2bgr(const unsigned char *src, unsigned char *dest,
y162bgr(const unsigned char *src, unsigned char *dest,
unsigned long long int NumPixels, int bits)
{
register int i = (NumPixels << 1) - 1;
register int j = NumPixels + (NumPixels << 1) - 1;
register int y;
int i = (NumPixels << 1) - 1;
int j = NumPixels + (NumPixels << 1) - 1;
int y;
while (i > 0) {
y = src[i--];
......@@ -1022,9 +1022,9 @@ y162bgr(const unsigned char *src, unsigned char *dest,
rgb482bgr(const unsigned char *src, unsigned char *dest,
unsigned long long int NumPixels, int bits)
{
register int i = (NumPixels << 1) - 1;
register int j = NumPixels + (NumPixels << 1) - 1;
register int y;
int i = (NumPixels << 1) - 1;
int j = NumPixels + (NumPixels << 1) - 1;
int y;
while (i > 0) {
y = src[i--];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment