From 22ff86b6cb0da4ca4319a904ee6731784589a3ee Mon Sep 17 00:00:00 2001 From: Atsushi Tadokoro Date: Sat, 23 Jun 2018 18:48:27 +0900 Subject: [PATCH 1/3] update for ver 0.10.0 --- src/ofxCsv.cpp | 6 +++--- src/ofxCsv.h | 1 + src/ofxCsvRow.cpp | 4 ++-- src/ofxCsvRow.h | 1 + 4 files changed, 7 insertions(+), 5 deletions(-) mode change 100644 => 100755 src/ofxCsvRow.cpp mode change 100644 => 100755 src/ofxCsvRow.h diff --git a/src/ofxCsv.cpp b/src/ofxCsv.cpp index 6e5493d..9aff6c1 100755 --- a/src/ofxCsv.cpp +++ b/src/ofxCsv.cpp @@ -205,11 +205,11 @@ void ofxCsv::load(const vector> &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 index ec95590..8bd3b62 100755 --- a/src/ofxCsv.h +++ b/src/ofxCsv.h @@ -29,6 +29,7 @@ */ #pragma once +using namespace std; #include "ofxCsvRow.h" diff --git a/src/ofxCsvRow.cpp b/src/ofxCsvRow.cpp old mode 100644 new mode 100755 index 2f8a961..fdb761c --- a/src/ofxCsvRow.cpp +++ b/src/ofxCsvRow.cpp @@ -79,9 +79,9 @@ void ofxCsvRow::load(const vector &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 old mode 100644 new mode 100755 index e127651..3eb6868 --- a/src/ofxCsvRow.h +++ b/src/ofxCsvRow.h @@ -29,6 +29,7 @@ */ #pragma once +using namespace std; #include "ofConstants.h" From e1cf507d41b7f3f1d9989567745bf856d007e295 Mon Sep 17 00:00:00 2001 From: Atsushi Tadokoro Date: Sat, 23 Jun 2018 19:00:52 +0900 Subject: [PATCH 2/3] update for ver 0.10.0 --- src/ofxCsv.h | 1 - 1 file changed, 1 deletion(-) diff --git a/src/ofxCsv.h b/src/ofxCsv.h index 8bd3b62..ec95590 100755 --- a/src/ofxCsv.h +++ b/src/ofxCsv.h @@ -29,7 +29,6 @@ */ #pragma once -using namespace std; #include "ofxCsvRow.h" From 32220749de80fb012716bc4e06a4a1f187753030 Mon Sep 17 00:00:00 2001 From: Paul Vollmer Date: Wed, 15 May 2019 10:50:10 +0200 Subject: [PATCH 3/3] Bump version to 0.2.1 --- LICENSE | 2 +- README.md | 7 +++++-- csvExample/src/main.cpp | 8 ++++---- csvExample/src/ofApp.cpp | 8 ++++---- csvExample/src/ofApp.h | 8 ++++---- src/ofxCsv.cpp | 8 ++++---- src/ofxCsv.h | 8 ++++---- src/ofxCsvRow.cpp | 8 ++++---- src/ofxCsvRow.h | 8 ++++---- 9 files changed, 34 insertions(+), 31 deletions(-) diff --git a/LICENSE b/LICENSE index c44f507..a08ddfd 100644 --- 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 index aaec4e5..b30fa39 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Check out for new release at 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 index e0e05e3..f34a1a4 100644 --- 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 index c6d5f75..2fcaa0c 100755 --- 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 index 4a13c5e..fc1ed12 100755 --- 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 index 9aff6c1..10ddad5 100755 --- 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" diff --git a/src/ofxCsv.h b/src/ofxCsv.h index ec95590..3421171 100755 --- 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 index fdb761c..899c76e 100755 --- 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" diff --git a/src/ofxCsvRow.h b/src/ofxCsvRow.h index 3eb6868..9a84600 100755 --- 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,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