Permalink
Browse files

remove old libs from licensing.txt

  • Loading branch information...
1 parent 1253661 commit 1d09bc73fc4fa103f5c515989e5223a5f0171a1c @hurzl hurzl committed Sep 19, 2012
Showing with 2 additions and 101 deletions.
  1. +2 −8 licensing.txt
  2. +0 −93 src/convert.h
View
@@ -3,15 +3,9 @@ Segments of the code fall under other licenses, as detailed below.
VMMLib is licensed under a revised 3-clause BSD license as detailed in the file licenses/vmmlib-license.txt
-asyncserial.cpp and asyncserial.h are licensed under the Boost Software License, Version 1.0 as detailed in the file licenses/BSL-1.0.txt
+arcball.cpp and arcball.h are (C) 1999-2003 Tatewake.com and licensed under the MIT license as noted in the file licenses/MIT.txt
-flu_dnd.cpp, flu_dnd.h, flu_enumerations.h, flu_export.h, flu_pixmaps.cpp, flu_pixmaps.h, flu_simplestring.cpp, flu_simplestring.h, flu_tree_browser.cpp, and flu_tree_browser.h are licensed under the LGPL version 2.0 as noted in file licenses/LGPL-2.0.txt with several exceptions as noted in file licenses/FLTK.txt
-
-ivcon.cpp and convert.h are licensed under the LGPL version 2.0 as noted in the file licenses/LGPL-2.0.txt
-
-Arcball.cpp and Arcball.h are (C) 1999-2003 Tatewake.com and licensed under the MIT license as noted in the file licenses/MIT.txt
-
-Several functions in libraries/polylib/GeometryBase.cpp are licensed as follows:
+Several functions in slicer/geometry.cpp are licensed as follows:
Copyright 2001, softSurfer (www.softsurfer.com)
This code may be freely used and modified for any purpose
providing that this copyright notice is included with it.
View
@@ -1,93 +0,0 @@
-/******* COPYRIGHT ************************************************
- * *
- * FlowVR *
- * Application Library *
- * *
- *-----------------------------------------------------------------*
- * COPYRIGHT (C) 2007/2008 by *
- * INRIA *
- * ALL RIGHTS RESERVED. *
- * *
- * This source is covered by the GNU LGPL, please refer to the *
- * COPYING file for further information. *
- * *
- *-----------------------------------------------------------------*
- * *
- * Original Contributors: *
- * Jeremie Allard, *
- * Thomas Arcila, *
- * Jean-Denis Lesage. *
- * Clement Menier, *
- * Bruno Raffin *
- * *
- ******************************************************************/
-
-/* Modified by Kulitorum 2010 */
-
-#pragma once
-#include <iostream>
-#include <sstream>
-#include <string>
-#include <typeinfo>
-#include <stdexcept>
-
-class BadConversion : public std::runtime_error {
-public:
- BadConversion(const std::string& s)
- : std::runtime_error(s)
- { }
-};
-
-template<typename T> inline std::string stringify(const T& x)
-{
- std::ostringstream o;
- if (!(o << x))
- throw BadConversion(std::string("stringify(") + typeid(x).name() + ")");
- return o.str();
-}
-/*
-
-void myCode()
-{
-Foo x;
-...
-std::string s = "this is a Foo: " + stringify(x);
-...
-} */
-
-template<typename T> inline void convert(const std::string& s, T& x, bool failIfLeftoverChars = true)
-{
- std::istringstream i(s);
- char c;
- if (!(i >> x) || (failIfLeftoverChars && i.get(c))) throw BadConversion(s);
-}
-
-/*
-void myCode()
-{
- std::string s = ...a string representation of a Foo...;
- ...
- Foo x;
- convert(s, x);
- ...
- ...code that uses x...
-}
-*/
-template<typename T>
-inline T convertTo(const std::string& s, bool failIfLeftoverChars = true)
-{
- T x;
- convert(s, x, failIfLeftoverChars);
- return x;
-}
-/*
-#include "convert.h"
-
-void myCode()
-{
- std::string a = ...string representation of an int...;
- std::string b = ...string representation of an int...;
- ...
- if (convertTo<int>(a) < convertTo<int>(b))
- ...;
-*/

0 comments on commit 1d09bc7

Please sign in to comment.