From: Anatoly Baksheev Date: Fri, 4 Feb 2011 15:46:35 +0000 (+0000) Subject: removed MS specific from FD code X-Git-Tag: accepted/tizen/6.0/unified/20201030.111113~7755 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=21f0d1e174e2267e6667f3b2b02b1e60ce9d10b5;p=platform%2Fupstream%2Fopencv.git removed MS specific from FD code --- diff --git a/modules/gpu/src/nvidia/NCVHaarObjectDetection.cu b/modules/gpu/src/nvidia/NCVHaarObjectDetection.cu index dc47969..49d3267 100644 --- a/modules/gpu/src/nvidia/NCVHaarObjectDetection.cu +++ b/modules/gpu/src/nvidia/NCVHaarObjectDetection.cu @@ -2393,11 +2393,11 @@ static NCVStatus loadFromNVBIN(const std::string &filename, std::vector &haarClassifierNodes, std::vector &haarFeatures) { - FILE *fp; - fopen_s(&fp, filename.c_str(), "rb"); + FILE *fp = fopen(filename.c_str(), "rb"); ncvAssertReturn(fp != NULL, NCV_FILE_ERROR); Ncv32u fileVersion; - fread_s(&fileVersion, sizeof(Ncv32u), sizeof(Ncv32u), 1, fp); + fread(&fileVersion, sizeof(Ncv32u), 1, fp); + ncvAssertReturn(fileVersion == NVBIN_HAAR_VERSION, NCV_FILE_ERROR); Ncv32u fsize; fread_s(&fsize, sizeof(Ncv32u), sizeof(Ncv32u), 1, fp); @@ -2409,7 +2409,7 @@ static NCVStatus loadFromNVBIN(const std::string &filename, fdata.resize(fsize); Ncv32u dataOffset = 0; fseek(fp, 0, SEEK_SET); - fread_s(&fdata[0], fsize, fsize, 1, fp); + fread(&fdata[0], fsize, 1, fp); fclose(fp); //data