small fix;

Author: Dinar Ahmatnurov

modules/latentsvm/include/opencv2/latentsvm.hpp

@@ -39,8 +39,8 @@
 //
 //M*/
 
-#ifndef __OPENCV_OBJDETECT_HPP__
-#define __OPENCV_OBJDETECT_HPP__
+#ifndef __OPENCV_LATENTSVM_HPP__
+#define __OPENCV_LATENTSVM_HPP__
 
 #include "opencv2/core.hpp"
 

modules/latentsvm/src/lsvmc_latentsvm.cpp

@@ -44,14 +44,6 @@
 #include "_lsvmc_matching.h"
 #include "_lsvmc_function.h"
 
-#ifndef max
-#define max(a,b)            (((a) > (b)) ? (a) : (b))
-#endif
-
-#ifndef min
-#define min(a,b)            (((a) < (b)) ? (a) : (b))
-#endif
-
 #ifdef HAVE_TBB
 #include <tbb/tbb.h>
 #include "tbb/parallel_for.h"

modules/latentsvm/src/lsvmc_parser.cpp

@@ -440,7 +440,7 @@ void parserCascadeThresholds  (FILE * xmlf, CvLSVMFilterObjectCaskade * model){
 
 void parserRFilter  (FILE * xmlf, int p, int pca, CvLSVMFilterObjectCaskade * model, float *b){
     int st = 0;
-    int sizeX, sizeY;
+    int sizeX = 0, sizeY = 0;
     int tag;
     int tagVal;
     char ch;
@@ -503,7 +503,7 @@ void parserRFilter  (FILE * xmlf, int p, int pca, CvLSVMFilterObjectCaskade * mo
                 }
                 if(tagVal == WEIGHTS){
                     data = (double *)malloc( sizeof(double) * p * sizeX * sizeY);
-                    fread(data, sizeof(double), p * sizeX * sizeY, xmlf);
+                    CV_Assert(fread(data, sizeof(double), p * sizeX * sizeY, xmlf));
                     model->H = (float *)malloc(sizeof(float)* p * sizeX * sizeY);
                     for(ii = 0; ii < p * sizeX * sizeY; ii++){
                         model->H[ii] = (float)data[ii];
@@ -512,7 +512,7 @@ void parserRFilter  (FILE * xmlf, int p, int pca, CvLSVMFilterObjectCaskade * mo
                 }
                 if(tagVal == WEIGHTSPCA){
                     data = (double *)malloc( sizeof(double) * pca * sizeX * sizeY);
-                    fread(data, sizeof(double), pca * sizeX * sizeY, xmlf);
+                    CV_Assert(fread(data, sizeof(double), pca * sizeX * sizeY, xmlf));
                     model->H_PCA = (float *)malloc(sizeof(float)* pca * sizeX * sizeY);
                     for(ii = 0; ii < pca * sizeX * sizeY; ii++){
                         model->H_PCA[ii] = (float)data[ii];
@@ -702,7 +702,7 @@ void parserD  (FILE * xmlf, int /*p*/, CvLSVMFilterObjectCaskade * model){
 
 void parserPFilter  (FILE * xmlf, int p, int pca, int /*N_path*/, CvLSVMFilterObjectCaskade * model){
     int st = 0;
-    int sizeX, sizeY;
+    int sizeX = 0, sizeY = 0;
     int tag;
     int tagVal;
     char ch;
@@ -772,7 +772,7 @@ void parserPFilter  (FILE * xmlf, int p, int pca, int /*N_path*/, CvLSVMFilterOb
                 }
                 if(tagVal == WEIGHTS){
                     data = (double *)malloc( sizeof(double) * p * sizeX * sizeY);
-                    fread(data, sizeof(double), p * sizeX * sizeY, xmlf);
+                    CV_Assert(fread(data, sizeof(double), p * sizeX * sizeY, xmlf));
                     model->H = (float *)malloc(sizeof(float)* p * sizeX * sizeY);
                     for(ii = 0; ii < p * sizeX * sizeY; ii++){
                         model->H[ii] = (float)data[ii];
@@ -781,7 +781,7 @@ void parserPFilter  (FILE * xmlf, int p, int pca, int /*N_path*/, CvLSVMFilterOb
                 }
                 if(tagVal == WEIGHTSPCA){
                     data = (double *)malloc( sizeof(double) * pca * sizeX * sizeY);
-                    fread(data, sizeof(double), pca * sizeX * sizeY, xmlf);
+                    CV_Assert(fread(data, sizeof(double), pca * sizeX * sizeY, xmlf));
                     model->H_PCA = (float *)malloc(sizeof(float)* pca * sizeX * sizeY);
                     for(ii = 0; ii < pca * sizeX * sizeY; ii++){
                         model->H_PCA[ii] = (float)data[ii];
@@ -988,7 +988,7 @@ void parserModel(FILE * xmlf, CvLSVMFilterObjectCaskade *** model, int *last, in
                     p--;
                     data = (double *)malloc( sizeof(double) * p * p);
                     (*PCAcoeff) = (float *)malloc( sizeof(float) * p * p);
-                    fread(data, sizeof(double), p * p, xmlf);
+                    CV_Assert(fread(data, sizeof(double), p * p, xmlf));
                     for(jj = 0; jj < p * p; jj++){
                       (*PCAcoeff)[jj] = (float)data[jj];
                     }