From 01921ee81f5195c9e056eb9b64fb593b0216f560 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Mon, 8 Oct 2018 20:40:01 +0200 Subject: [PATCH] Retrigger unittest --- test/unit/utglTF2ImportExport.cpp | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/test/unit/utglTF2ImportExport.cpp b/test/unit/utglTF2ImportExport.cpp index baeaaab5e..a07f07848 100644 --- a/test/unit/utglTF2ImportExport.cpp +++ b/test/unit/utglTF2ImportExport.cpp @@ -347,21 +347,22 @@ TEST_F(utglTF2ImportExport, importglTF2PrimitiveModeTrianglesFan) { } } -std::vector ReadFile(const char* name) -{ +std::vector ReadFile(const char* name) { std::vector ret; FILE* p = ::fopen(name, "r"); - if (p) - { - ::fseek(p, 0, SEEK_END); - const auto size = ::ftell(p); - ::fseek(p, 0, SEEK_SET); - - ret.resize(size); - ::fread(&ret[0], 1, size, p); - ::fclose(p); + if (nullptr == p) { + return ret; } + + ::fseek(p, 0, SEEK_END); + const auto size = ::ftell(p); + ::fseek(p, 0, SEEK_SET); + + ret.resize(size); + ::fread(&ret[0], 1, size, p); + ::fclose(p); + return ret; }