From 555b8f38d6ffd2f5af03e4645b99577436df9227 Mon Sep 17 00:00:00 2001 From: DepthDeluxe Date: Sun, 10 Apr 2016 15:38:02 -0400 Subject: [PATCH] cleaned comments out of code base --- openbr/plugins/cuda/cudaaffine.cpp | 15 --------------- openbr/plugins/cuda/cudaaffine.cu | 43 ------------------------------------------- openbr/plugins/cuda/cudargb2grayscale.cpp | 10 ---------- 3 files changed, 0 insertions(+), 68 deletions(-) diff --git a/openbr/plugins/cuda/cudaaffine.cpp b/openbr/plugins/cuda/cudaaffine.cpp index b733aab..a1963e7 100644 --- a/openbr/plugins/cuda/cudaaffine.cpp +++ b/openbr/plugins/cuda/cudaaffine.cpp @@ -125,13 +125,6 @@ namespace br } if (twoPoints) srcPoints[2] = getThirdAffinePoint(srcPoints[0], srcPoints[1]); - // Code section being altered (original) - // - // Mat affineTransform = getAffineTransform(srcPoints, dstPoints); - // warpAffine(src, dst, affineTransform, Size(width, height), method); - // - // end original - Mat affineTransform = getAffineTransform(srcPoints, dstPoints); void* const* srcDataPtr = src.m().ptr(); @@ -146,14 +139,6 @@ namespace br dstDataPtr[2] = srcDataPtr[2]; *((int*)dstDataPtr[2]) = width; // cols dstDataPtr[3] = srcDataPtr[3]; - // Print the transform - //for(int x = 0; x < affineTransform.rows; x++){ - //for(int y = 0; y < affineTransform.cols; y++){ - //printf("%8.3f\t", affineTransform.at(x, y)); - //} - //printf("\n"); - //} - cuda::affine::wrapper(srcDataPtr[0], &dstDataPtr[0], affineTransform, rows, cols, height, width); // end altered code diff --git a/openbr/plugins/cuda/cudaaffine.cu b/openbr/plugins/cuda/cudaaffine.cu index 3dea2b6..fc1baa7 100644 --- a/openbr/plugins/cuda/cudaaffine.cu +++ b/openbr/plugins/cuda/cudaaffine.cu @@ -125,9 +125,6 @@ namespace br { namespace cuda { namespace affine { __device__ __forceinline__ void getSrcCoordDevice(double *trans_inv, int dst_row, int dst_col, double* src_row_pnt, double* src_col_pnt){ *src_col_pnt = dst_col * trans_inv[0] + dst_row * trans_inv[3] + trans_inv[6]; *src_row_pnt = dst_col * trans_inv[1] + dst_row * trans_inv[4] + trans_inv[7]; - - //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]); - } @@ -136,8 +133,6 @@ namespace br { namespace cuda { namespace affine { int dstColInd = blockIdx.x*blockDim.x+threadIdx.x; int dstIndex = dstRowInd*dst_cols + dstColInd; - //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]); - double srcRowPnt; double srcColPnt; @@ -152,9 +147,7 @@ namespace br { namespace cuda { namespace affine { } getSrcCoordDevice(trans_inv, dstRowInd, dstColInd, &srcRowPnt, &srcColPnt); - //const uint8_t cval = getDistancePixelValueDevice(srcRowPnt, srcColPnt, srcPtr, src_rows, src_cols); // Get initial pixel value const uint8_t cval = getBilinearPixelValueDevice(srcRowPnt, srcColPnt, srcPtr, src_rows, src_cols); // Get initial pixel value - //const uint8_t cval = getPixelValueDevice(round(srcRowPnt), round(srcColPnt), srcPtr, src_rows, src_cols); // Get initial pixel value dstPtr[dstIndex] = cval; } @@ -180,9 +173,6 @@ namespace br { namespace cuda { namespace affine { double a22 = affineTransform.at(1, 1); double a31 = affineTransform.at(0, 2); double a32 = affineTransform.at(1, 2); - // double a23 = 0; - // double a13 = 0; - // double a33 = 1; // compute transform inverse double det = 1 / (a11*a22 - a21*a12); @@ -198,30 +188,6 @@ namespace br { namespace cuda { namespace affine { affineInverse[7] = (a31*a12 - a11*a32) * det; affineInverse[8] = (a11*a22 - a21*a12) * det; - // Move from affineTransform to gpuAffine (currently fake) - // double fakeAffine[6]; - // fakeAffine[0] = affineTransform.at(0, 0); - // fakeAffine[1] = affineTransform.at(0, 1); - // fakeAffine[2] = affineTransform.at(0, 2); - // fakeAffine[3] = affineTransform.at(1, 0); - // fakeAffine[4] = affineTransform.at(1, 1); - // fakeAffine[5] = affineTransform.at(1, 2); - - // printf("\n"); - // printf("%f\t%f\t%f\n", a11, a12, 0.0); - // printf("%f\t%f\t%f\n", a21, a22, 0.0); - // printf("%f\t%f\t%f\n", a31, a32, 1.0); - // printf("\n"); - - // printf("Affine Inverse:\n"); - // for(int i = 0; i < 3; i++){ - // for(int j = 0; j < 3; j++){ - // printf("%f\t", affineInverse[3*i + j]); - // } - // printf("\n"); - // } - - CUDA_SAFE_MALLOC(dstPtr, dst_rows*dst_cols*sizeof(uint8_t), &err); CUDA_SAFE_MALLOC(&gpuInverse, 3*3*sizeof(double), &err); @@ -232,14 +198,5 @@ namespace br { namespace cuda { namespace affine { CUDA_SAFE_FREE(srcPtr, &err); CUDA_SAFE_FREE(gpuInverse, &err); - - // printf("\n\n"); - // for(int i = 0; i < cols; i++){ - // for(int j = 0; j < src_rows; j++){ - // printf("%4d\t", ((uint8_t*) dstPtr)[j*cols + i]); - // } - // printf("\n"); - // } - // printf("\n"); } }}} diff --git a/openbr/plugins/cuda/cudargb2grayscale.cpp b/openbr/plugins/cuda/cudargb2grayscale.cpp index acc7138..b5ae881 100644 --- a/openbr/plugins/cuda/cudargb2grayscale.cpp +++ b/openbr/plugins/cuda/cudargb2grayscale.cpp @@ -61,16 +61,6 @@ private: cuda::rgb2grayscale::wrapper(srcDataPtr[0], &dstDataPtr[0], rows, cols); dst = dstMat; - - /* - if (src.m().channels() > 1 || colorSpace == Color) cvtColor(src, dst, colorSpace); - else dst = src; - - if (channel != -1) { - std::vector mv; - split(dst, mv); - dst = mv[channel % (int)mv.size()]; - } */ } }; -- libgit2 0.21.4