generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2218 from alalek:fix_defects_code_coverity

Browse Source
This commit is contained in:
Andrey Pavlenko 2014-01-31 19:23:01 +04:00 committed by OpenCV Buildbot
commit 25d2ab8a68
6 changed files with 33 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/core/include/opencv2/core/ocl.hpp
View File

@ -561,6 +561,9 @@ public:
explicit PlatformInfo2(void* id);
~PlatformInfo2();
PlatformInfo2(const PlatformInfo2& i);
PlatformInfo2& operator =(const PlatformInfo2& i);
String name() const;
String vendor() const;
String version() const;

23
modules/core/src/ocl.cpp
View File

@ -3691,6 +3691,7 @@ struct PlatformInfo2::Impl
{
Impl(void* id)
{
refcount = 1;
handle = *(cl_platform_id*)id;
getDevices(devices, handle);
}
@ -3724,6 +3725,26 @@ PlatformInfo2::~PlatformInfo2()
p->release();
}
PlatformInfo2::PlatformInfo2(const PlatformInfo2& i)
{
if (i.p)
i.p->addref();
this->p = i.p;
}
PlatformInfo2& PlatformInfo2::operator =(const PlatformInfo2& i)
{
if (i.p != this->p)
{
if (i.p)
i.p->addref();
if (this->p)
this->p->release();
this->p = i.p;
}
return *this;
}
int PlatformInfo2::deviceNumber() const
{
return p ? (int)p->devices.size() : 0;
@ -3731,7 +3752,7 @@ int PlatformInfo2::deviceNumber() const
void PlatformInfo2::getDevice(Device& device, int d) const
{
CV_Assert(d < (int)p->devices.size() );
CV_Assert(p && d < (int)p->devices.size() );
if(p)
device.set(p->devices[d]);
}

4
modules/java/generator/gen_java.py
View File

@ -398,7 +398,7 @@ JNIEXPORT jdoubleArray JNICALL Java_org_opencv_core_Core_n_1minMaxLocManual
return result;
} catch(cv::Exception e) {
} catch(const cv::Exception& e) {
LOGD("Core::n_1minMaxLoc() catched cv::Exception: %s", e.what());
jclass je = env->FindClass("org/opencv/core/CvException");
if(!je) je = env->FindClass("java/lang/Exception");
@ -471,7 +471,7 @@ JNIEXPORT jdoubleArray JNICALL Java_org_opencv_core_Core_n_1getTextSize
return result;
} catch(cv::Exception e) {
} catch(const cv::Exception& e) {
LOGD("Core::n_1getTextSize() catched cv::Exception: %s", e.what());
jclass je = env->FindClass("org/opencv/core/CvException");
if(!je) je = env->FindClass("java/lang/Exception");

2
modules/java/generator/src/cpp/Mat.cpp
View File

@ -467,7 +467,7 @@ JNIEXPORT jint JNICALL Java_org_opencv_core_Mat_n_1dims
LOGD("%s", method_name);
Mat* me = (Mat*) self; //TODO: check for NULL
return me->dims;
} catch(cv::Exception e) {
} catch(const cv::Exception& e) {
throwJavaException(env, &e, method_name);
} catch (...) {
throwJavaException(env, 0, method_name);

4
modules/java/generator/src/cpp/utils.cpp
View File

@ -48,7 +48,7 @@ JNIEXPORT void JNICALL Java_org_opencv_android_Utils_nBitmapToMat2
}
AndroidBitmap_unlockPixels(env, bitmap);
return;
} catch(cv::Exception e) {
} catch(const cv::Exception& e) {
AndroidBitmap_unlockPixels(env, bitmap);
LOGE("nBitmapToMat catched cv::Exception: %s", e.what());
jclass je = env->FindClass("org/opencv/core/CvException");
@ -130,7 +130,7 @@ JNIEXPORT void JNICALL Java_org_opencv_android_Utils_nMatToBitmap2
}
AndroidBitmap_unlockPixels(env, bitmap);
return;
} catch(cv::Exception e) {
} catch(const cv::Exception& e) {
AndroidBitmap_unlockPixels(env, bitmap);
LOGE("nMatToBitmap catched cv::Exception: %s", e.what());
jclass je = env->FindClass("org/opencv/core/CvException");

3
modules/video/src/lkpyramid.cpp
View File

@ -598,6 +598,7 @@ namespace cv
struct dim3
{
unsigned int x, y, z;
dim3() : x(0), y(0), z(0) { }
};
public:
PyrLKOpticalFlow()
@ -607,6 +608,8 @@ namespace cv
iters = 30;
derivLambda = 0.5;
useInitialFlow = false;
waveSize = 0;
}
bool checkParam()