Bugfixes parsing OBJ file under MSys build

Author: sadko4u

include/lsp-plug.in/fmt/obj/PullParser.h

@@ -49,7 +49,6 @@ namespace lsp
                 lsp_wchar_t        *pBuffer;        // Buffer for character data
                 size_t              nBufOff;        // Buffer offset
                 size_t              nBufLen;        // Buffer length
-                bool                bSkipLF;        // Skip line-feed character
                 size_t              nLines;         // Number of lines read
 
                 event_t             sEvent;

src/main/fmt/obj/PullParser.cpp

@@ -41,7 +41,6 @@ namespace lsp
             nBufOff         = 0;
             nBufLen         = 0;
             nLines          = 0;
-            bSkipLF         = false;
             nVx             = 0;
             nParVx          = 0;
             nTexVx          = 0;
@@ -210,7 +209,6 @@ namespace lsp
             pBuffer         = b;
             nBufOff         = 0;
             nBufLen         = 0;
-            bSkipLF         = false;
             nLines          = 0;
             nVx             = 0;
             nParVx          = 0;
@@ -234,7 +232,6 @@ namespace lsp
             nBufOff         = 0;
             nBufLen         = 0;
             nLines          = 0;
-            bSkipLF         = false;
 
             // Release input sequence
             if (pIn != NULL)
@@ -351,27 +348,13 @@ namespace lsp
                     nBufOff     = 0;
                 }
 
-                // Scan for line ending
-                if (bSkipLF)
-                {
-                    bSkipLF = false;
-                    if (pBuffer[nBufOff] == '\r')
-                    {
-                        if ((++nBufOff) >= nBufLen)
-                            continue;
-                    }
-                }
-
                 // Scan for line ending character
                 size_t tail = nBufOff;
                 while (tail < nBufLen)
                 {
                     lsp_wchar_t ch = pBuffer[tail++];
                     if (ch == '\n') // Found!
-                    {
-                        bSkipLF = true;
                         break;
-                    }
                 }
 
                 // Append data to string and update buffer state
@@ -383,6 +366,8 @@ namespace lsp
                 if (sLine.last() != '\n') // Not end of line?
                     continue;
                 sLine.set_length(--len);
+                if (sLine.last() == '\r') // Remove carriage-return symbol if it is present
+                    sLine.set_length(--len);
 
                 // Compute number of terminating '\\' characters
                 ssize_t slashes = 0, xoff = len-1;

src/test/utest/fmt/obj/compressor.cpp

@@ -217,13 +217,6 @@ namespace lsp
                     memcpy(call->indices.t, vt, n * sizeof(obj::index_t));
                     memcpy(call->indices.n, vn, n * sizeof(obj::index_t));
 
-                    printf("#%04d: f ", int(vCalls.size() - 1));
-                    for (size_t i=0; i<n; ++i)
-                    {
-                        printf("%d/%d/%d ", int(vv[i]), int(vt[i]), int(vn[i]));
-                    }
-                    printf("\n");
-
                     return STATUS_OK;
                 }
 

src/test/utest/fmt/obj/pullparser.cpp

@@ -97,19 +97,19 @@ UTEST_BEGIN("runtime.fmt.obj", pullparser)
             "vn 0 0 1\n"
             "f 1//1 2//1 3//1\n"
             "\n"
-            "o   Triangle 2\n\r"
-            "v -2.0 -1.0 -2.0\n\r"
-            "v 2.0 -1.0 -2.0\n\r"
-            "v 0.0 2.0 -2.0\n\r"
-            "vt -2.0 -1.0\n\r"
-            "vt 2.0 -1.0\n\r"
-            "vt 0.0 2.0\n\r"
-            "vn 0.0 0.0 1.0\n\r"
-            "vn 0.1 0.1 1.0\n\r"
-            "f 4/1/2 5/2/2 6/3/3\n\r"
-            "f -1/-1/-1 -2/-2/-1 -3/-3/-2\n\r"
-            "\n\r"
-            "\n\r";
+            "o   Triangle 2\r\n"
+            "v -2.0 -1.0 -2.0\r\n"
+            "v 2.0 -1.0 -2.0\r\n"
+            "v 0.0 2.0 -2.0\r\n"
+            "vt -2.0 -1.0\r\n"
+            "vt 2.0 -1.0\r\n"
+            "vt 0.0 2.0\r\n"
+            "vn 0.0 0.0 1.0\r\n"
+            "vn 0.1 0.1 1.0\r\n"
+            "f 4/1/2 5/2/2 6/3/3\r\n"
+            "f -1/-1/-1 -2/-2/-1 -3/-3/-2\r\n"
+            "\r\n"
+            "\r\n";
 
         PullParser p;
         event_t ev;