From 951833812ae17fa4a4b748de1dab807c1a9fcfc0 Mon Sep 17 00:00:00 2001
From: "Adi Shavit @ MacBookPro" <adi.shavit@autodesk.com>
Date: Wed, 27 Jul 2016 11:38:25 +0300
Subject: [PATCH] Changes the LoadObjWithCallback() API to accept
 `std::istream&` instead of pointed since this is a required argument. - Also
 changing the argument order to allow for defaults for optional arguments.

---
 tiny_obj_loader.h | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/tiny_obj_loader.h b/tiny_obj_loader.h
index 5aaea19..df42093 100644
--- a/tiny_obj_loader.h
+++ b/tiny_obj_loader.h
@@ -225,9 +225,8 @@ bool LoadObj(attrib_t *attrib, std::vector<shape_t> *shapes,
 /// Returns true when loading .obj/.mtl become success.
 /// Returns warning and error message into `err`
 /// See `examples/callback_api/` for how to use this function.
-bool LoadObjWithCallback(void *user_data, const callback_t &callback,
-                         std::string *err, std::istream *inStream,
-                         MaterialReader *readMatFn);
+bool LoadObjWithCallback(std::istream &inStream, const callback_t &callback, void *user_data = NULL,
+                         MaterialReader *readMatFn = NULL, std::string *err = NULL);
 
 /// Loads object from a std::istream, uses GetMtlIStreamFn to retrieve
 /// std::istream for materials.
@@ -1314,9 +1313,9 @@ bool LoadObj(attrib_t *attrib, std::vector<shape_t> *shapes,
   return true;
 }
 
-bool LoadObjWithCallback(void *user_data, const callback_t &callback,
-                         std::string *err, std::istream *inStream,
-                         MaterialReader *readMatFn) {
+bool LoadObjWithCallback(std::istream &inStream, const callback_t &callback, void *user_data /*= NULL*/,
+                         MaterialReader *readMatFn /*= NULL*/,
+                         std::string *err /*= NULL*/) {
   std::stringstream errss;
 
   // material
@@ -1331,8 +1330,8 @@ bool LoadObjWithCallback(void *user_data, const callback_t &callback,
   std::vector<const char *> names_out;
 
   std::string linebuf;
-  while (inStream->peek() != -1) {
-    std::getline(*inStream, linebuf);
+  while (inStream.peek() != -1) {
+    std::getline(inStream, linebuf);
 
     // Trim newline '\r\n' or '\n'
     if (linebuf.size() > 0) {
@@ -1411,7 +1410,7 @@ bool LoadObjWithCallback(void *user_data, const callback_t &callback,
       }
 
       if (callback.index_cb && indices.size() > 0) {
-        callback.index_cb(user_data, &indices.at(0), indices.size());
+        callback.index_cb(user_data, &indices.at(0), (int)indices.size());
       }
 
       continue;