renamed internal headers to avoid conflicts with system header files

modules/objdetect/src/_latentsvm.h

@@ -6,10 +6,9 @@
 #define SVM_LATENTSVM
 
 #include <stdio.h>
-#include "precomp.hpp"
+#include "_lsvm_types.h"
-#include "_types.h"
+#include "_lsvm_error.h"
-#include "_error.h"
+#include "_lsvm_routine.h"
-#include "_routine.h"
 
 //////////////////////////////////////////////////////////////
 // Building feature pyramid

modules/objdetect/src/_lsvm_distancetransform.h

@@ -1,10 +1,8 @@
-#ifndef DIST_TRANSFORM
+#ifndef LSVM_DIST_TRANSFORM
-#define DIST_TRANSFORM
+#define LSVM_DIST_TRANSFORM
-
-#include "precomp.hpp"
-#include "_types.h"
-#include "_error.h"
 
+#include "_lsvm_types.h"
+#include "_lsvm_error.h"
 
 /*
 // Computation the point of intersection functions

modules/objdetect/src/_lsvm_fft.h

@@ -1,10 +1,8 @@
-#ifndef _FFT_H
+#ifndef _LSVM_FFT_H
-#define _FFT_H
+#define _LSVM_FFT_H
-
-#include "precomp.hpp"
-#include "_types.h"
-#include "_error.h"
 
+#include "_lsvm_types.h"
+#include "_lsvm_error.h"
 #include <math.h>
 
 /*

modules/objdetect/src/_lsvm_matching.h

@@ -6,10 +6,10 @@
 #define SVM_MATCHING
 
 #include "_latentsvm.h"
-#include "_error.h"
+#include "_lsvm_error.h"
-#include "_distancetransform.h"
+#include "_lsvm_distancetransform.h"
-#include "_fft.h"
+#include "_lsvm_fft.h"
-#include "_routine.h"
+#include "_lsvm_routine.h"
 
 //extern "C" {
 /*

modules/objdetect/src/_lsvm_routine.h

@@ -1,9 +1,8 @@
-#ifndef _ROUTINE_H
+#ifndef _LSVM_ROUTINE_H
-#define _ROUTINE_H
+#define _LSVM_ROUTINE_H
 
-#include "precomp.hpp"
+#include "_lsvm_types.h"
-#include "_types.h"
+#include "_lsvm_error.h"
-#include "_error.h"
 
 
 //////////////////////////////////////////////////////////////

modules/objdetect/src/_lsvmparser.h

@@ -1,65 +0,0 @@
-#ifndef LSVM_PARSER
-#define LSVM_PARSER
-
-#include "precomp.hpp"
-#include "_types.h"
-
-#define MODEL    1
-#define P        2
-#define COMP     3
-#define SCORE    4
-#define RFILTER  100
-#define PFILTERs 101
-#define PFILTER  200
-#define SIZEX    150
-#define SIZEY    151
-#define WEIGHTS  152
-#define TAGV     300
-#define Vx       350
-#define Vy       351
-#define TAGD     400
-#define Dx       451
-#define Dy       452
-#define Dxx      453
-#define Dyy      454
-#define BTAG     500
-
-#define STEP_END 1000
-
-#define EMODEL    (STEP_END + MODEL)
-#define EP        (STEP_END + P)
-#define ECOMP     (STEP_END + COMP)
-#define ESCORE    (STEP_END + SCORE)
-#define ERFILTER  (STEP_END + RFILTER)
-#define EPFILTERs (STEP_END + PFILTERs)
-#define EPFILTER  (STEP_END + PFILTER)
-#define ESIZEX    (STEP_END + SIZEX)
-#define ESIZEY    (STEP_END + SIZEY)
-#define EWEIGHTS  (STEP_END + WEIGHTS)
-#define ETAGV     (STEP_END + TAGV)
-#define EVx       (STEP_END + Vx)
-#define EVy       (STEP_END + Vy)
-#define ETAGD     (STEP_END + TAGD)
-#define EDx       (STEP_END + Dx)
-#define EDy       (STEP_END + Dy)
-#define EDxx      (STEP_END + Dxx)
-#define EDyy      (STEP_END + Dyy)
-#define EBTAG     (STEP_END + BTAG)
-
-//extern "C" {
-    int LSVMparser(const char * filename, filterObject *** model, int *last, int *max, int **comp, float **b, int *count, float * score);
-#ifdef __cplusplus
-extern "C"
-#endif
-    int loadModel(
-             
-              const char *modelPath,
-             
-              filterObject ***filters,
-              int *kFilters,
-              int *kComponents,
-              int **kPartFilters,
-              float **b,
-              float *scoreThreshold); 
-//};
-#endif

modules/objdetect/src/distancetransform.cpp

@@ -1,4 +1,5 @@
-#include "_distancetransform.h"
+#include "precomp.hpp"
+#include "_lsvm_distancetransform.h"
 
 /*
 // Computation the point of intersection functions

modules/objdetect/src/featurepyramid.cpp

@@ -1,5 +1,6 @@
+#include "precomp.hpp"
 #include "_latentsvm.h"
-#include "_resizeimg.h"
+#include "_lsvm_resizeimg.h"
 
 #ifndef max
 #define max(a,b)            (((a) > (b)) ? (a) : (b))

modules/objdetect/src/fft.cpp

@@ -1,4 +1,5 @@
-#include "_fft.h"
+#include "precomp.hpp"
+#include "_lsvm_fft.h"
 
 int getEntireRes(int number, int divisor, int *entire, int *res)
 {

modules/objdetect/src/latentsvm.cpp

@@ -1,5 +1,6 @@
+#include "precomp.hpp"
 #include "_latentsvm.h"
-#include "_matching.h"
+#include "_lsvm_matching.h"
 
 /*
 // Transformation filter displacement from the block space 

modules/objdetect/src/latentsvmdetector.cpp

@@ -1,6 +1,6 @@
 #include "precomp.hpp"
 #include "_lsvmparser.h"
-#include "_matching.h" 
+#include "_lsvm_matching.h" 
 
 /*
 // load trained detector from a file

modules/objdetect/src/matching.cpp

@@ -1,4 +1,5 @@
-#include "_matching.h"
+#include "precomp.hpp"
+#include "_lsvm_matching.h"
 #include <stdio.h>
 
 #ifndef max

modules/objdetect/src/precomp.hpp

@@ -55,7 +55,7 @@
 #include "opencv2/imgproc/imgproc.hpp"
 #include "opencv2/imgproc/imgproc_c.h"
 #include "opencv2/core/core_c.h"
-#include "opencv2/highgui/highgui_c.h"
+#include "opencv2/highgui/highgui.hpp"
 #include "opencv2/core/internal.hpp"
 
 #endif

modules/objdetect/src/resizeimg.cpp

@@ -1,10 +1,10 @@
-#include "_resizeimg.h"
+#include "precomp.hpp"
+#include "_lsvm_resizeimg.h"
 #include <stdio.h>
 #include <assert.h>
 #include <math.h>
 
 
-
 IplImage * resize_opencv (IplImage * img, float scale){
     IplImage * imgTmp;
 

modules/objdetect/src/routine.cpp

@@ -1,4 +1,5 @@
-#include "_routine.h"
+#include "precomp.hpp"
+#include "_lsvm_routine.h"
 
 int allocFilterObject(filterObject **obj, const int sizeX, const int sizeY, const int p, const int xp){
     int i;