From c7755a92c6f144a751bb24ec4b927c1b53a2ecaa Mon Sep 17 00:00:00 2001 From: Paul Melnikow Date: Thu, 4 Oct 2018 18:43:54 -0400 Subject: [PATCH] =?UTF-8?q?Avoid=20=E2=80=9Cstoi:=20no=20conversion?= =?UTF-8?q?=E2=80=9D=20when=20Windows=20newlines=20are=20present?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Source/OBJ_Loader.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Source/OBJ_Loader.h b/Source/OBJ_Loader.h index 0b7d010..628adf4 100644 --- a/Source/OBJ_Loader.h +++ b/Source/OBJ_Loader.h @@ -466,6 +466,10 @@ namespace objl std::string curline; while (std::getline(file, curline)) { + if ((curline.size() > 0) && (curline[curline.size() - 1] == '\r')) { + curline.resize(curline.size() - 1); + } + #ifdef OBJL_CONSOLE_OUTPUT if ((outputIndicator = ((outputIndicator + 1) % outputEveryNth)) == 1) {