[MOAB-dev] commit/MOAB: 2 new changesets

[commits-noreply at bitbucket.org]

2 new commits in MOAB:

https://bitbucket.org/fathomteam/moab/commits/a2854c3019e0/
Changeset:   a2854c3019e0
Branch:      None
User:        rajeeja
Date:        2014-05-22 23:26:16
Summary:     Undoing changes in Tqdcfr that break MeshKit CoreGen tests

Affected #:  2 files

diff --git a/.gitignore b/.gitignore
index 073629d..52e35a8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -97,9 +97,9 @@ Makefile
 Makefile.in
 moab.config
 MOABConfig.cmake
-moab.creator*
-moab.files
-moab.includes
+*.creator*
+*.files
+*.includes
 moab.make
 *.o
 .project

diff --git a/src/io/Tqdcfr.cpp b/src/io/Tqdcfr.cpp
index 522bc55..18e4fa9 100644
--- a/src/io/Tqdcfr.cpp
+++ b/src/io/Tqdcfr.cpp
@@ -2329,8 +2329,8 @@ ErrorCode Tqdcfr::read_acis_records( const char* sat_filename )
       
         // get next occurrence of '#' (record terminator)
       ret = strchr(&(char_buf[buf_pos]), '#');
-      while (ret && (unsigned int)(ret+1-&char_buf[0]) < bytes_left && *(ret+1) != '\n')
-        ret = strchr(ret+1, '#');
+     // while (ret && (unsigned int)(ret+1-&char_buf[0]) < bytes_left && *(ret+1) != '\n')
+     //   ret = strchr(ret+1, '#');
       if (NULL != ret) {
           // grab the string (inclusive of the record terminator and the line feed) and complete the record
         int num_chars = ret-&(char_buf[buf_pos])+2;


https://bitbucket.org/fathomteam/moab/commits/075748d8ff10/
Changeset:   075748d8ff10
Branch:      master
User:        rajeeja
Date:        2014-05-23 05:08:16
Summary:     Adding one more check for 0 as last character to cub file reader

Affected #:  1 file

diff --git a/src/io/Tqdcfr.cpp b/src/io/Tqdcfr.cpp
index 18e4fa9..ddcdd8a 100644
--- a/src/io/Tqdcfr.cpp
+++ b/src/io/Tqdcfr.cpp
@@ -2329,8 +2329,8 @@ ErrorCode Tqdcfr::read_acis_records( const char* sat_filename )
       
         // get next occurrence of '#' (record terminator)
       ret = strchr(&(char_buf[buf_pos]), '#');
-     // while (ret && (unsigned int)(ret+1-&char_buf[0]) < bytes_left && *(ret+1) != '\n')
-     //   ret = strchr(ret+1, '#');
+      while (ret && (unsigned int)(ret+1-&char_buf[0]) < bytes_left && *(ret+1) != '\n' && *(ret+1) != 0)
+        ret = strchr(ret+1, '#');
       if (NULL != ret) {
           // grab the string (inclusive of the record terminator and the line feed) and complete the record
         int num_chars = ret-&(char_buf[buf_pos])+2;

Repository URL: https://bitbucket.org/fathomteam/moab/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.