Commit 555b8f38d6ffd2f5af03e4645b99577436df9227

Authored by DepthDeluxe
1 parent 8ab6c433

cleaned comments out of code base

openbr/plugins/cuda/cudaaffine.cpp
@@ -125,13 +125,6 @@ namespace br @@ -125,13 +125,6 @@ namespace br
125 } 125 }
126 if (twoPoints) srcPoints[2] = getThirdAffinePoint(srcPoints[0], srcPoints[1]); 126 if (twoPoints) srcPoints[2] = getThirdAffinePoint(srcPoints[0], srcPoints[1]);
127 127
128 - // Code section being altered (original)  
129 - //  
130 - // Mat affineTransform = getAffineTransform(srcPoints, dstPoints);  
131 - // warpAffine(src, dst, affineTransform, Size(width, height), method);  
132 - //  
133 - // end original  
134 -  
135 Mat affineTransform = getAffineTransform(srcPoints, dstPoints); 128 Mat affineTransform = getAffineTransform(srcPoints, dstPoints);
136 129
137 void* const* srcDataPtr = src.m().ptr<void*>(); 130 void* const* srcDataPtr = src.m().ptr<void*>();
@@ -146,14 +139,6 @@ namespace br @@ -146,14 +139,6 @@ namespace br
146 dstDataPtr[2] = srcDataPtr[2]; *((int*)dstDataPtr[2]) = width; // cols 139 dstDataPtr[2] = srcDataPtr[2]; *((int*)dstDataPtr[2]) = width; // cols
147 dstDataPtr[3] = srcDataPtr[3]; 140 dstDataPtr[3] = srcDataPtr[3];
148 141
149 - // Print the transform  
150 - //for(int x = 0; x < affineTransform.rows; x++){  
151 - //for(int y = 0; y < affineTransform.cols; y++){  
152 - //printf("%8.3f\t", affineTransform.at<double>(x, y));  
153 - //}  
154 - //printf("\n");  
155 - //}  
156 -  
157 cuda::affine::wrapper(srcDataPtr[0], &dstDataPtr[0], affineTransform, rows, cols, height, width); 142 cuda::affine::wrapper(srcDataPtr[0], &dstDataPtr[0], affineTransform, rows, cols, height, width);
158 143
159 // end altered code 144 // end altered code
openbr/plugins/cuda/cudaaffine.cu
@@ -125,9 +125,6 @@ namespace br { namespace cuda { namespace affine { @@ -125,9 +125,6 @@ namespace br { namespace cuda { namespace affine {
125 __device__ __forceinline__ void getSrcCoordDevice(double *trans_inv, int dst_row, int dst_col, double* src_row_pnt, double* src_col_pnt){ 125 __device__ __forceinline__ void getSrcCoordDevice(double *trans_inv, int dst_row, int dst_col, double* src_row_pnt, double* src_col_pnt){
126 *src_col_pnt = dst_col * trans_inv[0] + dst_row * trans_inv[3] + trans_inv[6]; 126 *src_col_pnt = dst_col * trans_inv[0] + dst_row * trans_inv[3] + trans_inv[6];
127 *src_row_pnt = dst_col * trans_inv[1] + dst_row * trans_inv[4] + trans_inv[7]; 127 *src_row_pnt = dst_col * trans_inv[1] + dst_row * trans_inv[4] + trans_inv[7];
128 -  
129 - //printf("Dst: [%d, %d, 1] = [%d, %d, 1] \n[ %0.4f, %0.4f, %0.4f] \n[ %0.4f, %0.4f, %0.4f ]\n[ %0.4f, %0.4f, %0.4f ]\n\n", *src_col, *src_row, dst_col, dst_row, trans_inv[0], trans_inv[1], trans_inv[2], trans_inv[3], trans_inv[4], trans_inv[5], trans_inv[6], trans_inv[7], trans_inv[8]);  
130 -  
131 } 128 }
132 129
133 130
@@ -136,8 +133,6 @@ namespace br { namespace cuda { namespace affine { @@ -136,8 +133,6 @@ namespace br { namespace cuda { namespace affine {
136 int dstColInd = blockIdx.x*blockDim.x+threadIdx.x; 133 int dstColInd = blockIdx.x*blockDim.x+threadIdx.x;
137 int dstIndex = dstRowInd*dst_cols + dstColInd; 134 int dstIndex = dstRowInd*dst_cols + dstColInd;
138 135
139 - //printf("Kernel Inv:\n[%0.4f %0.4f %0.4f]\n[%0.4f %0.4f %0.4f]\n[%0.4f %0.4f %0.4f]\n\n", trans_inv[0], trans_inv[1], trans_inv[2], trans_inv[3], trans_inv[4], trans_inv[5], trans_inv[6], trans_inv[7], trans_inv[8]);  
140 -  
141 double srcRowPnt; 136 double srcRowPnt;
142 double srcColPnt; 137 double srcColPnt;
143 138
@@ -152,9 +147,7 @@ namespace br { namespace cuda { namespace affine { @@ -152,9 +147,7 @@ namespace br { namespace cuda { namespace affine {
152 } 147 }
153 148
154 getSrcCoordDevice(trans_inv, dstRowInd, dstColInd, &srcRowPnt, &srcColPnt); 149 getSrcCoordDevice(trans_inv, dstRowInd, dstColInd, &srcRowPnt, &srcColPnt);
155 - //const uint8_t cval = getDistancePixelValueDevice(srcRowPnt, srcColPnt, srcPtr, src_rows, src_cols); // Get initial pixel value  
156 const uint8_t cval = getBilinearPixelValueDevice(srcRowPnt, srcColPnt, srcPtr, src_rows, src_cols); // Get initial pixel value 150 const uint8_t cval = getBilinearPixelValueDevice(srcRowPnt, srcColPnt, srcPtr, src_rows, src_cols); // Get initial pixel value
157 - //const uint8_t cval = getPixelValueDevice(round(srcRowPnt), round(srcColPnt), srcPtr, src_rows, src_cols); // Get initial pixel value  
158 151
159 dstPtr[dstIndex] = cval; 152 dstPtr[dstIndex] = cval;
160 } 153 }
@@ -180,9 +173,6 @@ namespace br { namespace cuda { namespace affine { @@ -180,9 +173,6 @@ namespace br { namespace cuda { namespace affine {
180 double a22 = affineTransform.at<double>(1, 1); 173 double a22 = affineTransform.at<double>(1, 1);
181 double a31 = affineTransform.at<double>(0, 2); 174 double a31 = affineTransform.at<double>(0, 2);
182 double a32 = affineTransform.at<double>(1, 2); 175 double a32 = affineTransform.at<double>(1, 2);
183 - // double a23 = 0;  
184 - // double a13 = 0;  
185 - // double a33 = 1;  
186 176
187 // compute transform inverse 177 // compute transform inverse
188 double det = 1 / (a11*a22 - a21*a12); 178 double det = 1 / (a11*a22 - a21*a12);
@@ -198,30 +188,6 @@ namespace br { namespace cuda { namespace affine { @@ -198,30 +188,6 @@ namespace br { namespace cuda { namespace affine {
198 affineInverse[7] = (a31*a12 - a11*a32) * det; 188 affineInverse[7] = (a31*a12 - a11*a32) * det;
199 affineInverse[8] = (a11*a22 - a21*a12) * det; 189 affineInverse[8] = (a11*a22 - a21*a12) * det;
200 190
201 - // Move from affineTransform to gpuAffine (currently fake)  
202 - // double fakeAffine[6];  
203 - // fakeAffine[0] = affineTransform.at<double>(0, 0);  
204 - // fakeAffine[1] = affineTransform.at<double>(0, 1);  
205 - // fakeAffine[2] = affineTransform.at<double>(0, 2);  
206 - // fakeAffine[3] = affineTransform.at<double>(1, 0);  
207 - // fakeAffine[4] = affineTransform.at<double>(1, 1);  
208 - // fakeAffine[5] = affineTransform.at<double>(1, 2);  
209 -  
210 - // printf("\n");  
211 - // printf("%f\t%f\t%f\n", a11, a12, 0.0);  
212 - // printf("%f\t%f\t%f\n", a21, a22, 0.0);  
213 - // printf("%f\t%f\t%f\n", a31, a32, 1.0);  
214 - // printf("\n");  
215 -  
216 - // printf("Affine Inverse:\n");  
217 - // for(int i = 0; i < 3; i++){  
218 - // for(int j = 0; j < 3; j++){  
219 - // printf("%f\t", affineInverse[3*i + j]);  
220 - // }  
221 - // printf("\n");  
222 - // }  
223 -  
224 -  
225 CUDA_SAFE_MALLOC(dstPtr, dst_rows*dst_cols*sizeof(uint8_t), &err); 191 CUDA_SAFE_MALLOC(dstPtr, dst_rows*dst_cols*sizeof(uint8_t), &err);
226 CUDA_SAFE_MALLOC(&gpuInverse, 3*3*sizeof(double), &err); 192 CUDA_SAFE_MALLOC(&gpuInverse, 3*3*sizeof(double), &err);
227 193
@@ -232,14 +198,5 @@ namespace br { namespace cuda { namespace affine { @@ -232,14 +198,5 @@ namespace br { namespace cuda { namespace affine {
232 198
233 CUDA_SAFE_FREE(srcPtr, &err); 199 CUDA_SAFE_FREE(srcPtr, &err);
234 CUDA_SAFE_FREE(gpuInverse, &err); 200 CUDA_SAFE_FREE(gpuInverse, &err);
235 -  
236 - // printf("\n\n");  
237 - // for(int i = 0; i < cols; i++){  
238 - // for(int j = 0; j < src_rows; j++){  
239 - // printf("%4d\t", ((uint8_t*) dstPtr)[j*cols + i]);  
240 - // }  
241 - // printf("\n");  
242 - // }  
243 - // printf("\n");  
244 } 201 }
245 }}} 202 }}}
openbr/plugins/cuda/cudargb2grayscale.cpp
@@ -61,16 +61,6 @@ private: @@ -61,16 +61,6 @@ private:
61 61
62 cuda::rgb2grayscale::wrapper(srcDataPtr[0], &dstDataPtr[0], rows, cols); 62 cuda::rgb2grayscale::wrapper(srcDataPtr[0], &dstDataPtr[0], rows, cols);
63 dst = dstMat; 63 dst = dstMat;
64 -  
65 - /*  
66 - if (src.m().channels() > 1 || colorSpace == Color) cvtColor(src, dst, colorSpace);  
67 - else dst = src;  
68 -  
69 - if (channel != -1) {  
70 - std::vector<Mat> mv;  
71 - split(dst, mv);  
72 - dst = mv[channel % (int)mv.size()];  
73 - } */  
74 } 64 }
75 }; 65 };
76 66