removed MS specific from FD code
authorAnatoly Baksheev <no@email>
Fri, 4 Feb 2011 15:46:35 +0000 (15:46 +0000)
committerAnatoly Baksheev <no@email>
Fri, 4 Feb 2011 15:46:35 +0000 (15:46 +0000)
modules/gpu/src/nvidia/NCVHaarObjectDetection.cu

index dc47969..49d3267 100644 (file)
@@ -2393,11 +2393,11 @@ static NCVStatus loadFromNVBIN(const std::string &filename,
                                std::vector<HaarClassifierNode128> &haarClassifierNodes,\r
                                std::vector<HaarFeature64> &haarFeatures)\r
 {\r
-    FILE *fp;\r
-    fopen_s(&fp, filename.c_str(), "rb");\r
+    FILE *fp = fopen(filename.c_str(), "rb");\r
     ncvAssertReturn(fp != NULL, NCV_FILE_ERROR);\r
     Ncv32u fileVersion;\r
-    fread_s(&fileVersion, sizeof(Ncv32u), sizeof(Ncv32u), 1, fp);\r
+    fread(&fileVersion, sizeof(Ncv32u), 1, fp);        \r
+\r
     ncvAssertReturn(fileVersion == NVBIN_HAAR_VERSION, NCV_FILE_ERROR);\r
     Ncv32u fsize;\r
     fread_s(&fsize, sizeof(Ncv32u), sizeof(Ncv32u), 1, fp);\r
@@ -2409,7 +2409,7 @@ static NCVStatus loadFromNVBIN(const std::string &filename,
     fdata.resize(fsize);\r
     Ncv32u dataOffset = 0;\r
     fseek(fp, 0, SEEK_SET);\r
-    fread_s(&fdata[0], fsize, fsize, 1, fp);\r
+    fread(&fdata[0], fsize, 1, fp);\r
     fclose(fp);\r
 \r
     //data\r