potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 00:03: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_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)
{