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

fixed a few warnings and bugs, including ticket #1079

Browse Source
This commit is contained in:
Vadim Pisarevsky 2011-06-12 20:29:50 +00:00
parent b6c19d365f
commit 9df999154c
7 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/core/src/system.cpp
View File

@ -72,7 +72,7 @@
#include <sys/time.h> #include <sys/time.h>
#include <time.h> #include <time.h>
#ifdef __MACH__ && defined __APPLE__ #if defined __MACH__ && defined __APPLE__
#include <mach/mach.h> #include <mach/mach.h>
#include <mach/mach_time.h> #include <mach/mach_time.h>
#endif #endif

1
modules/objdetect/src/_lsvm_tbbversion.h
View File

@ -2,7 +2,6 @@
#define _LSVM_TBBVERSION_H #define _LSVM_TBBVERSION_H
#include "_lsvm_matching.h" #include "_lsvm_matching.h"
#include "precomp.hpp"
/* /*
// Computation score function using TBB tasks // Computation score function using TBB tasks

2
modules/objdetect/src/lsvmtbbversion.cpp
View File

@ -1,3 +1,5 @@
#include "precomp.hpp"
#ifdef HAVE_TBB #ifdef HAVE_TBB
#include "_lsvm_tbbversion.h" #include "_lsvm_tbbversion.h"

2
modules/python/src1/gen.py
View File

@ -325,7 +325,7 @@ for nm,args,ty,flags in sorted(api):
ds_args += o2s(optional) ds_args += o2s(optional)
ds = "%s(%s) -> %s" % (nm, ds_args, str(ty)) ds = "%s(%s) -> %s" % (nm, ds_args, str(ty))
print ds #print ds
if has_optional(args): if has_optional(args):
entry = '{"%%s", (PyCFunction)pycv%s, METH_KEYWORDS, "%s"},' % (cname(nm), ds) entry = '{"%%s", (PyCFunction)pycv%s, METH_KEYWORDS, "%s"},' % (cname(nm), ds)

2
modules/ts/include/opencv2/ts/ts.hpp
View File

@ -5,7 +5,7 @@
#define GTEST_LINKED_AS_SHARED_LIBRARY 1 #define GTEST_LINKED_AS_SHARED_LIBRARY 1
#endif #endif
#include <cstdarg> // for va_list #include <stdarg.h> // for va_list
#include "opencv2/ts/ts_gtest.h" #include "opencv2/ts/ts_gtest.h"
#include "opencv2/core/core.hpp" #include "opencv2/core/core.hpp"

2
samples/cpp/letter_recog.cpp
View File

@ -610,7 +610,7 @@ int build_nbayes_classifier( char* data_filename )
true_results[j - ntrain_samples] = responses->data.fl[j]; true_results[j - ntrain_samples] = responses->data.fl[j];
} }
CvMat *result = cvCreateMat(1, nsamples_all - ntrain_samples, CV_32FC1); CvMat *result = cvCreateMat(1, nsamples_all - ntrain_samples, CV_32FC1);
(int)nbayes.predict(&sample, result); nbayes.predict(&sample, result);
int true_resp = 0; int true_resp = 0;
//int accuracy = 0; //int accuracy = 0;
for (int i = 0; i < nsamples_all - ntrain_samples; i++) for (int i = 0; i < nsamples_all - ntrain_samples; i++)

2
samples/gpu/cascadeclassifier_nvidia_api.cpp
View File

@ -1,4 +1,6 @@
#if _MSC_VER >= 1400
#pragma warning( disable : 4201 4408 4127 4100) #pragma warning( disable : 4201 4408 4127 4100)
#endif
#include "cvconfig.h" #include "cvconfig.h"
#include <iostream> #include <iostream>