From dd817857b41eda7644c199fbd8589ff95c741c71 Mon Sep 17 00:00:00 2001 From: Roman Donchenko Date: Fri, 22 Nov 2013 16:55:30 +0400 Subject: [PATCH] Replaced most of the instances of "s = s +" with "s +=". This resynchronizes master code with 2.4. I say "most", because I might have missed some due to different spacing; I'll deal with those instances later if I find them. --- modules/ocl/src/arithm.cpp | 4 ++-- modules/ocl/src/cl_operations.cpp | 4 ++-- modules/ocl/src/cl_programcache.cpp | 6 +++--- modules/ocl/src/haar.cpp | 18 +++++++++--------- modules/ocl/src/imgproc.cpp | 16 ++++++++-------- modules/ocl/src/mcwutil.cpp | 2 +- modules/ocl/src/split_merge.cpp | 10 +++++----- 7 files changed, 30 insertions(+), 30 deletions(-) diff --git a/modules/ocl/src/arithm.cpp b/modules/ocl/src/arithm.cpp index 0acb4c2..7784560 100644 --- a/modules/ocl/src/arithm.cpp +++ b/modules/ocl/src/arithm.cpp @@ -505,7 +505,7 @@ static void arithmetic_minMax_run(const oclMat &src, const oclMat & mask, cl_mem args.push_back( std::make_pair( sizeof(cl_int) , (void *)&minvalid_cols )); args.push_back( std::make_pair( sizeof(cl_int) , (void *)&moffset )); - kernelName = kernelName + "_mask"; + kernelName += "_mask"; } size_t globalThreads[3] = {groupnum * 256, 1, 1}; @@ -634,7 +634,7 @@ static void arithm_absdiff_nonsaturate_run(const oclMat & src1, const oclMat & s args.push_back( std::make_pair( sizeof(cl_int), (void *)&src2step1 )); args.push_back( std::make_pair( sizeof(cl_int), (void *)&src2offset1 )); - kernelName = kernelName + "_binary"; + kernelName += "_binary"; } args.push_back( std::make_pair( sizeof(cl_mem), (void *)&diff.data )); diff --git a/modules/ocl/src/cl_operations.cpp b/modules/ocl/src/cl_operations.cpp index a3b7c71..f618e02 100644 --- a/modules/ocl/src/cl_operations.cpp +++ b/modules/ocl/src/cl_operations.cpp @@ -379,7 +379,7 @@ cl_kernel openCLGetKernelFromSource(Context *ctx, const cv::ocl::ProgramEntry* s idxStr << "_C" << channels; if(depth != -1) idxStr << "_D" << depth; - kernelName = kernelName + idxStr.str(); + kernelName += idxStr.str(); std::string fixedOptions = removeDuplicatedWhiteSpaces(build_options); cl_kernel kernel = openCLGetKernelFromSource(ctx, source, kernelName, fixedOptions.c_str()); @@ -497,7 +497,7 @@ void openCLExecuteKernelInterop(Context *ctx, const cv::ocl::ProgramSource& sour idxStr << "_C" << channels; if(depth != -1) idxStr << "_D" << depth; - kernelName = kernelName + idxStr.str(); + kernelName += idxStr.str(); std::string name = std::string("custom_") + source.name; ProgramEntry program = { name.c_str(), source.programStr, source.programHash }; diff --git a/modules/ocl/src/cl_programcache.cpp b/modules/ocl/src/cl_programcache.cpp index 245bf33..56f0213 100644 --- a/modules/ocl/src/cl_programcache.cpp +++ b/modules/ocl/src/cl_programcache.cpp @@ -489,11 +489,11 @@ cl_program ProgramCache::getProgram(const Context *ctx, const cv::ocl::ProgramEn String all_build_options; if (!ctx->getDeviceInfo().compilationExtraOptions.empty()) - all_build_options = all_build_options + ctx->getDeviceInfo().compilationExtraOptions; + all_build_options += ctx->getDeviceInfo().compilationExtraOptions; if (build_options != NULL) { - all_build_options = all_build_options + " "; - all_build_options = all_build_options + build_options; + all_build_options += " "; + all_build_options += build_options; } const DeviceInfo& devInfo = ctx->getDeviceInfo(); String filename = binpath + (source->name ? source->name : "NULL") + "_" + devInfo.platform->platformName + "_" + devInfo.deviceName + ".clb"; diff --git a/modules/ocl/src/haar.cpp b/modules/ocl/src/haar.cpp index c10d089..00dfb52 100644 --- a/modules/ocl/src/haar.cpp +++ b/modules/ocl/src/haar.cpp @@ -959,15 +959,15 @@ void OclCascadeClassifier::detectMultiScale(oclMat &gimg, CV_OUT std::vectororig_window_size.width); - options = options + format(" -D WND_SIZE_Y=%d",cascade->orig_window_size.height); - options = options + format(" -D STUMP_BASED=%d",gcascade->is_stump_based); - options = options + format(" -D LSx=%d",localThreads[0]); - options = options + format(" -D LSy=%d",localThreads[1]); - options = options + format(" -D SPLITNODE=%d",splitnode); - options = options + format(" -D SPLITSTAGE=%d",splitstage); - options = options + format(" -D OUTPUTSZ=%d",outputsz); + options += format(" -D NODE_SIZE=%d",NODE_SIZE); + options += format(" -D WND_SIZE_X=%d",cascade->orig_window_size.width); + options += format(" -D WND_SIZE_Y=%d",cascade->orig_window_size.height); + options += format(" -D STUMP_BASED=%d",gcascade->is_stump_based); + options += format(" -D LSx=%d",localThreads[0]); + options += format(" -D LSy=%d",localThreads[1]); + options += format(" -D SPLITNODE=%d",splitnode); + options += format(" -D SPLITSTAGE=%d",splitstage); + options += format(" -D OUTPUTSZ=%d",outputsz); // init candiate global count by 0 int pattern = 0; diff --git a/modules/ocl/src/imgproc.cpp b/modules/ocl/src/imgproc.cpp index 549e9c7..593486c 100644 --- a/modules/ocl/src/imgproc.cpp +++ b/modules/ocl/src/imgproc.cpp @@ -217,15 +217,15 @@ namespace cv String kernelName = "remap"; if (map1.type() == CV_32FC2 && map2.empty()) - kernelName = kernelName + "_32FC2"; + kernelName += "_32FC2"; else if (map1.type() == CV_16SC2) { - kernelName = kernelName + "_16SC2"; + kernelName += "_16SC2"; if (!map2.empty()) - kernelName = kernelName + "_16UC1"; + kernelName += "_16UC1"; } else if (map1.type() == CV_32FC1 && map2.type() == CV_32FC1) - kernelName = kernelName + "_2_32FC1"; + kernelName += "_2_32FC1"; else CV_Error(Error::StsBadArg, "Unsupported map types"); @@ -916,16 +916,16 @@ namespace cv switch(borderType) { case cv::BORDER_REPLICATE: - option = option + " -D BORDER_REPLICATE"; + option += " -D BORDER_REPLICATE"; break; case cv::BORDER_REFLECT: - option = option + " -D BORDER_REFLECT"; + option += " -D BORDER_REFLECT"; break; case cv::BORDER_REFLECT101: - option = option + " -D BORDER_REFLECT101"; + option += " -D BORDER_REFLECT101"; break; case cv::BORDER_WRAP: - option = option + " -D BORDER_WRAP"; + option += " -D BORDER_WRAP"; break; } openCLExecuteKernel(src.clCxt, &imgproc_sobel3, "sobel3", gt2, lt2, args, -1, -1, option.c_str() ); diff --git a/modules/ocl/src/mcwutil.cpp b/modules/ocl/src/mcwutil.cpp index f6efbf7..e5dfdd4 100644 --- a/modules/ocl/src/mcwutil.cpp +++ b/modules/ocl/src/mcwutil.cpp @@ -64,7 +64,7 @@ namespace cv idxStr << "_C" << channels; if(depth != -1) idxStr << "_D" << depth; - kernelName = kernelName + idxStr.str().c_str(); + kernelName += idxStr.str().c_str(); cl_kernel kernel; kernel = openCLGetKernelFromSource(clCxt, source, kernelName, build_options); diff --git a/modules/ocl/src/split_merge.cpp b/modules/ocl/src/split_merge.cpp index 0bd5eb7..5838697 100644 --- a/modules/ocl/src/split_merge.cpp +++ b/modules/ocl/src/split_merge.cpp @@ -234,13 +234,13 @@ namespace cv (int)VEC_SIZE, depth, channels); if (dst0Aligned) - build_options = build_options + " -D DST0_ALIGNED"; + build_options += " -D DST0_ALIGNED"; if (dst1Aligned) - build_options = build_options + " -D DST1_ALIGNED"; + build_options += " -D DST1_ALIGNED"; if (dst2Aligned) - build_options = build_options + " -D DST2_ALIGNED"; + build_options += " -D DST2_ALIGNED"; if (dst3Aligned) - build_options = build_options + " -D DST3_ALIGNED"; + build_options += " -D DST3_ALIGNED"; const DeviceInfo& devInfo = clCtx->getDeviceInfo(); @@ -251,7 +251,7 @@ namespace cv && (devInfo.deviceVersion.find("Build 56860") != std::string::npos || devInfo.deviceVersion.find("Build 76921") != std::string::npos || devInfo.deviceVersion.find("Build 78712") != std::string::npos)) - build_options = build_options + " -D BYPASS_VSTORE=true"; + build_options += " -D BYPASS_VSTORE=true"; size_t globalThreads[3] = { divUp(src.cols, VEC_SIZE), src.rows, 1 }; openCLExecuteKernel(clCtx, &split_mat, kernelName, globalThreads, NULL, args, -1, -1, build_options.c_str()); -- 2.7.4