Merge pull request #35 from paulvollmer/develop

v0.2.1
paulvollmer · May 15, 2019 · 0bd59e6 · 0bd59e6
2 parents cb22d00 + 3222074
commit 0bd59e6
Show file tree

Hide file tree

Showing 9 changed files with 40 additions and 36 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2011-2018 Paul Vollmer, https://paulvollmer.net
+Copyright (c) 2011-2019 Paul Vollmer, https://paulvollmer.net
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/README.md b/README.md
@@ -12,7 +12,7 @@ Check out for new release at <https://github.com/paulvollmer/ofxCsv>
 Current Version  
 ---------------
 
-0.2.0 (stable and versioned using [semantic versioning](http://semver.org))
+0.2.1 (stable and versioned using [semantic versioning](http://semver.org))
 
 Basic API Overview
 ------------------
@@ -93,6 +93,9 @@ Changelog
 
 A detailed changelog, intended for programmers.  
 
+0.2.1  
+bugfix for OF 0.10
+
 0.2.0  
 partial rewrite & update to OF 0.9+, added ofxCsvRow
 
@@ -123,4 +126,4 @@ License
 
 ofxCsv is Licensed under MIT Public License: http://www.opensource.org/licenses/MIT
 
-See also, LICENSE.txt in this distribution.
+See also, [LICENSE](LICENSE) in this distribution.
diff --git a/csvExample/src/main.cpp b/csvExample/src/main.cpp
@@ -4,8 +4,8 @@
  *
  *  The MIT License
  *
- *  Copyright (c) 2011-2014 Paul Vollmer, http://www.wng.cc
- *  
+ *  Copyright (c) 2011-2019 Paul Vollmer, https://paulvollmer.net
+ *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy
  *  of this software and associated documentation files (the "Software"), to deal
  *  in the Software without restriction, including without limitation the rights
@@ -24,8 +24,8 @@
  *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *  THE SOFTWARE.
  *
- *  @modified           2016.04.21
- *  @version            0.2.0
+ *  @modified           2019.05.15
+ *  @version            0.2.1
  */
 
 #include "ofMain.h"

diff --git a/csvExample/src/ofApp.cpp b/csvExample/src/ofApp.cpp
@@ -4,8 +4,8 @@
  *
  *  The MIT License
  *
- *  Copyright (c) 2011-2014 Paul Vollmer, http://www.wng.cc
- *  
+ *  Copyright (c) 2011-2019 Paul Vollmer, https://paulvollmer.net
+ *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy
  *  of this software and associated documentation files (the "Software"), to deal
  *  in the Software without restriction, including without limitation the rights
@@ -24,8 +24,8 @@
  *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *  THE SOFTWARE.
  *
- *  @modified           2016.04.23
- *  @version            0.2.0
+ *  @modified           2019.05.15
+ *  @version            0.2.1
  */
 
 #include "ofApp.h"

diff --git a/csvExample/src/ofApp.h b/csvExample/src/ofApp.h
@@ -4,8 +4,8 @@
  *
  *  The MIT License
  *
- *  Copyright (c) 2011-2014 Paul Vollmer, http://www.wng.cc
- *  
+ *  Copyright (c) 2011-2019 Paul Vollmer, https://paulvollmer.net
+ *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy
  *  of this software and associated documentation files (the "Software"), to deal
  *  in the Software without restriction, including without limitation the rights
@@ -24,8 +24,8 @@
  *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *  THE SOFTWARE.
  *
- *  @modified           2016.04.21
- *  @version            0.2.0
+ *  @modified           2019.05.15
+ *  @version            0.2.1
  */
 
 #pragma once

diff --git a/src/ofxCsv.cpp b/src/ofxCsv.cpp
@@ -4,8 +4,8 @@
  *
  *  The MIT License
  *
- *  Copyright (c) 2011-2014 Paul Vollmer, http://www.wng.cc
- *  
+ *  Copyright (c) 2011-2019 Paul Vollmer, https://paulvollmer.net
+ *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy
  *  of this software and associated documentation files (the "Software"), to deal
  *  in the Software without restriction, including without limitation the rights
@@ -24,8 +24,8 @@
  *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *  THE SOFTWARE.
  *
- *  @modified           2016.04.23
- *  @version            0.2.0
+ *  @modified           2019.05.15
+ *  @version            0.2.1
  */
 
 #include "ofxCsv.h"
@@ -205,11 +205,11 @@ void ofxCsv::load(const vector<vector<string>> &rows) {
 
 //--------------------------------------------------
 void ofxCsv::expand(int rows, int cols) {
-	rows = MAX(rows, 0);
+  rows = max(rows, 0);
 	if(data.empty()) {
-		rows = MAX(rows, 1);
+		rows = max(rows, 1);
 	}
-	cols = MAX(cols, 1);
+	cols = max(cols, 1);
 	while(data.size() < rows) {
 		data.push_back(ofxCsvRow());
 	}

diff --git a/src/ofxCsv.h b/src/ofxCsv.h
@@ -4,8 +4,8 @@
  *
  *  The MIT License
  *
- *  Copyright (c) 2011-2014 Paul Vollmer, http://www.wng.cc
- *  
+ *  Copyright (c) 2011-2019 Paul Vollmer, https://paulvollmer.net
+ *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy
  *  of this software and associated documentation files (the "Software"), to deal
  *  in the Software without restriction, including without limitation the rights
@@ -24,8 +24,8 @@
  *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *  THE SOFTWARE.
  *
- *  @modified           2016.04.23
- *  @version            0.2.0
+ *  @modified           2019.05.15
+ *  @version            0.2.1
  */
 
 #pragma once

diff --git a/src/ofxCsvRow.cpp b/src/ofxCsvRow.cpp
@@ -4,8 +4,8 @@
  *
  *  The MIT License
  *
- *  Copyright (c) 2011-2014 Paul Vollmer, http://www.wng.cc
- *  
+ *  Copyright (c) 2011-2019 Paul Vollmer, https://paulvollmer.net
+ *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy
  *  of this software and associated documentation files (the "Software"), to deal
  *  in the Software without restriction, including without limitation the rights
@@ -24,8 +24,8 @@
  *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *  THE SOFTWARE.
  *
- *  @modified           2016.04.23
- *  @version            0.2.0
+ *  @modified           2019.05.15
+ *  @version            0.2.1
  */
 
 #include "ofxCsvRow.h"
@@ -79,9 +79,9 @@ void ofxCsvRow::load(const vector<string> &cols) {
 
 //--------------------------------------------------
 void ofxCsvRow::expand(int cols) {
-	cols = MAX(cols, 0);
+	cols = max(cols, 0);
 	if(data.empty()) {
-		cols = MAX(cols, 1);
+		cols = max(cols, 1);
 	}
 	while(data.size() <= cols) {
 		data.push_back("");

diff --git a/src/ofxCsvRow.h b/src/ofxCsvRow.h
@@ -4,8 +4,8 @@
  *
  *  The MIT License
  *
- *  Copyright (c) 2011-2014 Paul Vollmer, http://www.wng.cc
- *  
+ *  Copyright (c) 2011-2019 Paul Vollmer, https://paulvollmer.net
+ *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy
  *  of this software and associated documentation files (the "Software"), to deal
  *  in the Software without restriction, including without limitation the rights
@@ -24,11 +24,12 @@
  *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *  THE SOFTWARE.
  *
- *  @modified           2016.04.23
- *  @version            0.2.0
+ *  @modified           2019.05.15
+ *  @version            0.2.1
  */
 
 #pragma once
+using namespace std;
 
 #include "ofConstants.h"