potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 07:43:03 +04:00
Code Packages Releases Wiki Activity

Eliminated use of obsolete 'register' keyword

Browse Source 
Fixes clang warnings about uses of this obsolete keyword.
This commit is contained in:
Sean McBride
2016-10-20 20:19:14 -04:00
parent 7793299e53
commit 943ac96526
6 changed files with 315 additions and 315 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/features2d/src/agast.cpp
+91 -91
View File
@@ -67,24 +67,24 @@ static void AGAST_5_8(InputArray _img, std::vector<KeyPoint>& keypoints, int thr
int xsize = img.cols;
int ysize = img.rows;
size_t nExpectedCorners = keypoints.capacity();
register int x, y;
register int xsizeB = xsize - 2;
register int ysizeB = ysize - 1;
register int width;
int x, y;
int xsizeB = xsize - 2;
int ysizeB = ysize - 1;
int width;
keypoints.resize(0);
int pixel_5_8_[16];
makeAgastOffsets(pixel_5_8_, (int)img.step, AgastFeatureDetector::AGAST_5_8);
register short offset0 = (short) pixel_5_8_[0];
register short offset1 = (short) pixel_5_8_[1];
register short offset2 = (short) pixel_5_8_[2];
register short offset3 = (short) pixel_5_8_[3];
register short offset4 = (short) pixel_5_8_[4];
register short offset5 = (short) pixel_5_8_[5];
register short offset6 = (short) pixel_5_8_[6];
register short offset7 = (short) pixel_5_8_[7];
short offset0 = (short) pixel_5_8_[0];
short offset1 = (short) pixel_5_8_[1];
short offset2 = (short) pixel_5_8_[2];
short offset3 = (short) pixel_5_8_[3];
short offset4 = (short) pixel_5_8_[4];
short offset5 = (short) pixel_5_8_[5];
short offset6 = (short) pixel_5_8_[6];
short offset7 = (short) pixel_5_8_[7];
width = xsize;
@@ -100,9 +100,9 @@ static void AGAST_5_8(InputArray _img, std::vector<KeyPoint>& keypoints, int thr
break;
else
{
register const unsigned char* const ptr = img.ptr() + y*width + x;
register const int cb = *ptr + threshold;
register const int c_b = *ptr - threshold;
const unsigned char* const ptr = img.ptr() + y*width + x;
const int cb = *ptr + threshold;
const int c_b = *ptr - threshold;
if(ptr[offset0] > cb)
if(ptr[offset2] > cb)
if(ptr[offset3] > cb)
@@ -437,9 +437,9 @@ static void AGAST_5_8(InputArray _img, std::vector<KeyPoint>& keypoints, int thr
break;
else
{
register const unsigned char* const ptr = img.ptr() + y*width + x;
register const int cb = *ptr + threshold;
register const int c_b = *ptr - threshold;
const unsigned char* const ptr = img.ptr() + y*width + x;
const int cb = *ptr + threshold;
const int c_b = *ptr - threshold;
if(ptr[offset0] > cb)
if(ptr[offset2] > cb)
if(ptr[offset3] > cb)
@@ -829,28 +829,28 @@ static void AGAST_7_12d(InputArray _img, std::vector<KeyPoint>& keypoints, int t
int xsize = img.cols;
int ysize = img.rows;
size_t nExpectedCorners = keypoints.capacity();
register int x, y;
register int xsizeB = xsize - 4;
register int ysizeB = ysize - 3;
register int width;
int x, y;
int xsizeB = xsize - 4;
int ysizeB = ysize - 3;
int width;
keypoints.resize(0);
int pixel_7_12d_[16];
makeAgastOffsets(pixel_7_12d_, (int)img.step, AgastFeatureDetector::AGAST_7_12d);
register short offset0 = (short) pixel_7_12d_[0];
register short offset1 = (short) pixel_7_12d_[1];
register short offset2 = (short) pixel_7_12d_[2];
register short offset3 = (short) pixel_7_12d_[3];
register short offset4 = (short) pixel_7_12d_[4];
register short offset5 = (short) pixel_7_12d_[5];
register short offset6 = (short) pixel_7_12d_[6];
register short offset7 = (short) pixel_7_12d_[7];
register short offset8 = (short) pixel_7_12d_[8];
register short offset9 = (short) pixel_7_12d_[9];
register short offset10 = (short) pixel_7_12d_[10];
register short offset11 = (short) pixel_7_12d_[11];
short offset0 = (short) pixel_7_12d_[0];
short offset1 = (short) pixel_7_12d_[1];
short offset2 = (short) pixel_7_12d_[2];
short offset3 = (short) pixel_7_12d_[3];
short offset4 = (short) pixel_7_12d_[4];
short offset5 = (short) pixel_7_12d_[5];
short offset6 = (short) pixel_7_12d_[6];
short offset7 = (short) pixel_7_12d_[7];
short offset8 = (short) pixel_7_12d_[8];
short offset9 = (short) pixel_7_12d_[9];
short offset10 = (short) pixel_7_12d_[10];
short offset11 = (short) pixel_7_12d_[11];
width = xsize;
@@ -866,9 +866,9 @@ static void AGAST_7_12d(InputArray _img, std::vector<KeyPoint>& keypoints, int t
break;
else
{
register const unsigned char* const ptr = img.ptr() + y*width + x;
register const int cb = *ptr + threshold;
register const int c_b = *ptr - threshold;
const unsigned char* const ptr = img.ptr() + y*width + x;
const int cb = *ptr + threshold;
const int c_b = *ptr - threshold;
if(ptr[offset0] > cb)
if(ptr[offset5] > cb)
if(ptr[offset2] > cb)
@@ -2048,9 +2048,9 @@ static void AGAST_7_12d(InputArray _img, std::vector<KeyPoint>& keypoints, int t
break;
else
{
register const unsigned char* const ptr = img.ptr() + y*width + x;
register const int cb = *ptr + threshold;
register const int c_b = *ptr - threshold;
const unsigned char* const ptr = img.ptr() + y*width + x;
const int cb = *ptr + threshold;
const int c_b = *ptr - threshold;
if(ptr[offset0] > cb)
if(ptr[offset5] > cb)
if(ptr[offset2] > cb)
@@ -3274,28 +3274,28 @@ static void AGAST_7_12s(InputArray _img, std::vector<KeyPoint>& keypoints, int t
int xsize = img.cols;
int ysize = img.rows;
size_t nExpectedCorners = keypoints.capacity();
register int x, y;
register int xsizeB=xsize - 3; //2, +1 due to faster test x>xsizeB
register int ysizeB=ysize - 2;
register int width;
int x, y;
int xsizeB=xsize - 3; //2, +1 due to faster test x>xsizeB
int ysizeB=ysize - 2;
int width;
keypoints.resize(0);
int pixel_7_12s_[16];
makeAgastOffsets(pixel_7_12s_, (int)img.step, AgastFeatureDetector::AGAST_7_12s);
register short offset0 = (short) pixel_7_12s_[0];
register short offset1 = (short) pixel_7_12s_[1];
register short offset2 = (short) pixel_7_12s_[2];
register short offset3 = (short) pixel_7_12s_[3];
register short offset4 = (short) pixel_7_12s_[4];
register short offset5 = (short) pixel_7_12s_[5];
register short offset6 = (short) pixel_7_12s_[6];
register short offset7 = (short) pixel_7_12s_[7];
register short offset8 = (short) pixel_7_12s_[8];
register short offset9 = (short) pixel_7_12s_[9];
register short offset10 = (short) pixel_7_12s_[10];
register short offset11 = (short) pixel_7_12s_[11];
short offset0 = (short) pixel_7_12s_[0];
short offset1 = (short) pixel_7_12s_[1];
short offset2 = (short) pixel_7_12s_[2];
short offset3 = (short) pixel_7_12s_[3];
short offset4 = (short) pixel_7_12s_[4];
short offset5 = (short) pixel_7_12s_[5];
short offset6 = (short) pixel_7_12s_[6];
short offset7 = (short) pixel_7_12s_[7];
short offset8 = (short) pixel_7_12s_[8];
short offset9 = (short) pixel_7_12s_[9];
short offset10 = (short) pixel_7_12s_[10];
short offset11 = (short) pixel_7_12s_[11];
width = xsize;
@@ -3311,9 +3311,9 @@ static void AGAST_7_12s(InputArray _img, std::vector<KeyPoint>& keypoints, int t
break;
else
{
register const unsigned char* const ptr = img.ptr() + y*width + x;
register const int cb = *ptr + threshold;
register const int c_b = *ptr - threshold;
const unsigned char* const ptr = img.ptr() + y*width + x;
const int cb = *ptr + threshold;
const int c_b = *ptr - threshold;
if(ptr[offset0] > cb)
if(ptr[offset2] > cb)
if(ptr[offset5] > cb)
@@ -4349,9 +4349,9 @@ static void AGAST_7_12s(InputArray _img, std::vector<KeyPoint>& keypoints, int t
break;
else
{
register const unsigned char* const ptr = img.ptr() + y*width + x;
register const int cb = *ptr + threshold;
register const int c_b = *ptr - threshold;
const unsigned char* const ptr = img.ptr() + y*width + x;
const int cb = *ptr + threshold;
const int c_b = *ptr - threshold;
if(ptr[offset0] > cb)
if(ptr[offset2] > cb)
if(ptr[offset5] > cb)
@@ -5355,32 +5355,32 @@ static void OAST_9_16(InputArray _img, std::vector<KeyPoint>& keypoints, int thr
int xsize = img.cols;
int ysize = img.rows;
size_t nExpectedCorners = keypoints.capacity();
register int x, y;
register int xsizeB=xsize - 4;
register int ysizeB=ysize - 3;
register int width;
int x, y;
int xsizeB=xsize - 4;
int ysizeB=ysize - 3;
int width;
keypoints.resize(0);
int pixel_9_16_[16];
makeAgastOffsets(pixel_9_16_, (int)img.step, AgastFeatureDetector::OAST_9_16);
register short offset0 = (short) pixel_9_16_[0];
register short offset1 = (short) pixel_9_16_[1];
register short offset2 = (short) pixel_9_16_[2];
register short offset3 = (short) pixel_9_16_[3];
register short offset4 = (short) pixel_9_16_[4];
register short offset5 = (short) pixel_9_16_[5];
register short offset6 = (short) pixel_9_16_[6];
register short offset7 = (short) pixel_9_16_[7];
register short offset8 = (short) pixel_9_16_[8];
register short offset9 = (short) pixel_9_16_[9];
register short offset10 = (short) pixel_9_16_[10];
register short offset11 = (short) pixel_9_16_[11];
register short offset12 = (short) pixel_9_16_[12];
register short offset13 = (short) pixel_9_16_[13];
register short offset14 = (short) pixel_9_16_[14];
register short offset15 = (short) pixel_9_16_[15];
short offset0 = (short) pixel_9_16_[0];
short offset1 = (short) pixel_9_16_[1];
short offset2 = (short) pixel_9_16_[2];
short offset3 = (short) pixel_9_16_[3];
short offset4 = (short) pixel_9_16_[4];
short offset5 = (short) pixel_9_16_[5];
short offset6 = (short) pixel_9_16_[6];
short offset7 = (short) pixel_9_16_[7];
short offset8 = (short) pixel_9_16_[8];
short offset9 = (short) pixel_9_16_[9];
short offset10 = (short) pixel_9_16_[10];
short offset11 = (short) pixel_9_16_[11];
short offset12 = (short) pixel_9_16_[12];
short offset13 = (short) pixel_9_16_[13];
short offset14 = (short) pixel_9_16_[14];
short offset15 = (short) pixel_9_16_[15];
width = xsize;
@@ -5394,9 +5394,9 @@ static void OAST_9_16(InputArray _img, std::vector<KeyPoint>& keypoints, int thr
break;
else
{
register const unsigned char* const ptr = img.ptr() + y*width + x;
register const int cb = *ptr + threshold;
register const int c_b = *ptr - threshold;
const unsigned char* const ptr = img.ptr() + y*width + x;
const int cb = *ptr + threshold;
const int c_b = *ptr - threshold;
if(ptr[offset0] > cb)
if(ptr[offset2] > cb)
if(ptr[offset4] > cb)
@@ -7817,10 +7817,10 @@ static void AGAST_ALL(InputArray _img, std::vector<KeyPoint>& keypoints, int thr
int xsize = img.cols;
int ysize = img.rows;
size_t nExpectedCorners = keypoints.capacity();
register int x, y;
register int xsizeB = xsize - (agastbase + 2);
register int ysizeB = ysize - (agastbase + 1);
register int width;
int x, y;
int xsizeB = xsize - (agastbase + 2);
int ysizeB = ysize - (agastbase + 1);
int width;
keypoints.resize(0);
@@ -7841,7 +7841,7 @@ static void AGAST_ALL(InputArray _img, std::vector<KeyPoint>& keypoints, int thr
break;
else
{
register const unsigned char* const ptr = img.ptr() + y*width + x;
const unsigned char* const ptr = img.ptr() + y*width + x;
result = agast_tree_search(table_struct1, pixel, ptr, threshold);
switch (result)
{
@@ -7863,7 +7863,7 @@ static void AGAST_ALL(InputArray _img, std::vector<KeyPoint>& keypoints, int thr
break;
else
{
register const unsigned char* const ptr = img.ptr() + y*width + x;
const unsigned char* const ptr = img.ptr() + y*width + x;
result = agast_tree_search(table_struct2, pixel, ptr, threshold);
switch (result)
{
modules/features2d/src/agast_score.cpp
+61 -61
View File
@@ -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)
{