Merge pull request #9664 from tomoaki0705:fixBuildVS2013

6a5298a5 · Alexander Alekhin · 8129f537 · 48c4bea5 · 6a5298a5
Commit 6a5298a5 authored Sep 19, 2017 by Alexander Alekhin
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

npy_blob.cpp modules/dnn/test/npy_blob.cpp +1 -1

No files found.
--- a/modules/dnn/test/npy_blob.cpp
+++ b/modules/dnn/test/npy_blob.cpp
@@ -72,7 +72,7 @@ Mat blobFromNPY(const std::string& path)
    ifs.ignore(1);  // Skip major version byte.
    ifs.ignore(1);  // Skip minor version byte.

-    uint16_t headerSize;
+    unsigned short headerSize;
    ifs.read((char*)&headerSize, sizeof(headerSize));

    std::string header(headerSize, '*');