Skip to content

Commit 0bd59e6

Browse files
paulvollmerpaulvollmer
authored
Merge pull request #35 from paulvollmer/develop
v0.2.1
2 parents cb22d00 + 3222074 commit 0bd59e6

File tree

9 files changed

+40
-36
lines changed

9 files changed

+40
-36
lines changed

‎LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2011-2018 Paul Vollmer, https://paulvollmer.net
1+
Copyright (c) 2011-2019 Paul Vollmer, https://paulvollmer.net
22

33
Permission is hereby granted, free of charge, to any person obtaining a copy
44
of this software and associated documentation files (the "Software"), to deal

‎README.md

+5-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Check out for new release at <https://github.com/paulvollmer/ofxCsv>
1212
Current Version
1313
---------------
1414

15-
0.2.0 (stable and versioned using [semantic versioning](http://semver.org))
15+
0.2.1 (stable and versioned using [semantic versioning](http://semver.org))
1616

1717
Basic API Overview
1818
------------------
@@ -93,6 +93,9 @@ Changelog
9393

9494
A detailed changelog, intended for programmers.
9595

96+
0.2.1
97+
bugfix for OF 0.10
98+
9699
0.2.0
97100
partial rewrite & update to OF 0.9+, added ofxCsvRow
98101

@@ -123,4 +126,4 @@ License
123126

124127
ofxCsv is Licensed under MIT Public License: http://www.opensource.org/licenses/MIT
125128

126-
See also, LICENSE.txt in this distribution.
129+
See also, [LICENSE](LICENSE) in this distribution.

‎csvExample/src/main.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
*
55
* The MIT License
66
*
7-
* Copyright (c) 2011-2014 Paul Vollmer, http://www.wng.cc
8-
*
7+
* Copyright (c) 2011-2019 Paul Vollmer, https://paulvollmer.net
8+
*
99
* Permission is hereby granted, free of charge, to any person obtaining a copy
1010
* of this software and associated documentation files (the "Software"), to deal
1111
* in the Software without restriction, including without limitation the rights
@@ -24,8 +24,8 @@
2424
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
2525
* THE SOFTWARE.
2626
*
27-
* @modified 2016.04.21
28-
* @version 0.2.0
27+
* @modified 2019.05.15
28+
* @version 0.2.1
2929
*/
3030

3131
#include "ofMain.h"

‎csvExample/src/ofApp.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
*
55
* The MIT License
66
*
7-
* Copyright (c) 2011-2014 Paul Vollmer, http://www.wng.cc
8-
*
7+
* Copyright (c) 2011-2019 Paul Vollmer, https://paulvollmer.net
8+
*
99
* Permission is hereby granted, free of charge, to any person obtaining a copy
1010
* of this software and associated documentation files (the "Software"), to deal
1111
* in the Software without restriction, including without limitation the rights
@@ -24,8 +24,8 @@
2424
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
2525
* THE SOFTWARE.
2626
*
27-
* @modified 2016.04.23
28-
* @version 0.2.0
27+
* @modified 2019.05.15
28+
* @version 0.2.1
2929
*/
3030

3131
#include "ofApp.h"

‎csvExample/src/ofApp.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
*
55
* The MIT License
66
*
7-
* Copyright (c) 2011-2014 Paul Vollmer, http://www.wng.cc
8-
*
7+
* Copyright (c) 2011-2019 Paul Vollmer, https://paulvollmer.net
8+
*
99
* Permission is hereby granted, free of charge, to any person obtaining a copy
1010
* of this software and associated documentation files (the "Software"), to deal
1111
* in the Software without restriction, including without limitation the rights
@@ -24,8 +24,8 @@
2424
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
2525
* THE SOFTWARE.
2626
*
27-
* @modified 2016.04.21
28-
* @version 0.2.0
27+
* @modified 2019.05.15
28+
* @version 0.2.1
2929
*/
3030

3131
#pragma once

‎src/ofxCsv.cpp

+7-7
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
*
55
* The MIT License
66
*
7-
* Copyright (c) 2011-2014 Paul Vollmer, http://www.wng.cc
8-
*
7+
* Copyright (c) 2011-2019 Paul Vollmer, https://paulvollmer.net
8+
*
99
* Permission is hereby granted, free of charge, to any person obtaining a copy
1010
* of this software and associated documentation files (the "Software"), to deal
1111
* in the Software without restriction, including without limitation the rights
@@ -24,8 +24,8 @@
2424
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
2525
* THE SOFTWARE.
2626
*
27-
* @modified 2016.04.23
28-
* @version 0.2.0
27+
* @modified 2019.05.15
28+
* @version 0.2.1
2929
*/
3030

3131
#include "ofxCsv.h"
@@ -205,11 +205,11 @@ void ofxCsv::load(const vector<vector<string>> &rows) {
205205

206206
//--------------------------------------------------
207207
void ofxCsv::expand(int rows, int cols) {
208-
rows = MAX(rows, 0);
208+
rows = max(rows, 0);
209209
if(data.empty()) {
210-
rows = MAX(rows, 1);
210+
rows = max(rows, 1);
211211
}
212-
cols = MAX(cols, 1);
212+
cols = max(cols, 1);
213213
while(data.size() < rows) {
214214
data.push_back(ofxCsvRow());
215215
}

‎src/ofxCsv.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
*
55
* The MIT License
66
*
7-
* Copyright (c) 2011-2014 Paul Vollmer, http://www.wng.cc
8-
*
7+
* Copyright (c) 2011-2019 Paul Vollmer, https://paulvollmer.net
8+
*
99
* Permission is hereby granted, free of charge, to any person obtaining a copy
1010
* of this software and associated documentation files (the "Software"), to deal
1111
* in the Software without restriction, including without limitation the rights
@@ -24,8 +24,8 @@
2424
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
2525
* THE SOFTWARE.
2626
*
27-
* @modified 2016.04.23
28-
* @version 0.2.0
27+
* @modified 2019.05.15
28+
* @version 0.2.1
2929
*/
3030

3131
#pragma once

‎src/ofxCsvRow.cpp

100644100755
+6-6
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
*
55
* The MIT License
66
*
7-
* Copyright (c) 2011-2014 Paul Vollmer, http://www.wng.cc
8-
*
7+
* Copyright (c) 2011-2019 Paul Vollmer, https://paulvollmer.net
8+
*
99
* Permission is hereby granted, free of charge, to any person obtaining a copy
1010
* of this software and associated documentation files (the "Software"), to deal
1111
* in the Software without restriction, including without limitation the rights
@@ -24,8 +24,8 @@
2424
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
2525
* THE SOFTWARE.
2626
*
27-
* @modified 2016.04.23
28-
* @version 0.2.0
27+
* @modified 2019.05.15
28+
* @version 0.2.1
2929
*/
3030

3131
#include "ofxCsvRow.h"
@@ -79,9 +79,9 @@ void ofxCsvRow::load(const vector<string> &cols) {
7979

8080
//--------------------------------------------------
8181
void ofxCsvRow::expand(int cols) {
82-
cols = MAX(cols, 0);
82+
cols = max(cols, 0);
8383
if(data.empty()) {
84-
cols = MAX(cols, 1);
84+
cols = max(cols, 1);
8585
}
8686
while(data.size() <= cols) {
8787
data.push_back("");

‎src/ofxCsvRow.h

100644100755
+5-4
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
*
55
* The MIT License
66
*
7-
* Copyright (c) 2011-2014 Paul Vollmer, http://www.wng.cc
8-
*
7+
* Copyright (c) 2011-2019 Paul Vollmer, https://paulvollmer.net
8+
*
99
* Permission is hereby granted, free of charge, to any person obtaining a copy
1010
* of this software and associated documentation files (the "Software"), to deal
1111
* in the Software without restriction, including without limitation the rights
@@ -24,11 +24,12 @@
2424
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
2525
* THE SOFTWARE.
2626
*
27-
* @modified 2016.04.23
28-
* @version 0.2.0
27+
* @modified 2019.05.15
28+
* @version 0.2.1
2929
*/
3030

3131
#pragma once
32+
using namespace std;
3233

3334
#include "ofConstants.h"
3435

0 commit comments

Comments
 (0)