Skip to content

Commit

Permalink
Update csparse_extension license in README
Browse files Browse the repository at this point in the history
Fix #743
  • Loading branch information
RainerKuemmerle committed Nov 25, 2023
1 parent 5ce8d6f commit 0c278d8
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 15 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ The API documentation can be generated as described in doc/doxygen/readme.txt
g2o is licensed under the BSD License. However, some libraries are available
under different license terms. See below.

The following parts are licensed under LGPL3+:
The following parts are licensed under LGPL v2.1+:

- csparse_extension

Expand Down
12 changes: 3 additions & 9 deletions g2o/solvers/csparse/csparse_extension.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
// CSparse is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
// version 1.1 of the License, or (at your option) any later version.
// version 2.1 of the License, or (at your option) any later version.
//
// CSparse is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
Expand All @@ -21,15 +21,10 @@
#include "csparse_extension.h"

#include <cassert>
#include <iostream>

#include "g2o/stuff/logger.h"
#include "g2o/stuff/macros.h"

using namespace std;

namespace g2o {
namespace csparse_extension {
namespace g2o::csparse_extension {

/**
* Originally from CSparse, avoid memory re-allocations by giving workspace
Expand Down Expand Up @@ -125,5 +120,4 @@ csn* cs_chol_workspace(const cs* A, const css* S, int* cin, double* xin) {
return (cs_ndone(N, E, NULL, NULL, 1)); /* success: free E,s,x; return N */
}

} // namespace csparse_extension
} // namespace g2o
} // namespace g2o::csparse_extension
7 changes: 2 additions & 5 deletions g2o/solvers/csparse/csparse_extension.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,7 @@

#include "g2o_csparse_extension_api.h"

namespace g2o {

namespace csparse_extension {
namespace g2o::csparse_extension {

// our extensions to csparse
// Copyright (C) 2011 R. Kuemmerle, G. Grisetti, W. Burgard
Expand All @@ -44,7 +42,6 @@ G2O_CSPARSE_EXTENSION_API int cs_cholsolsymb(const cs* A, double* b,
const css* S, double* workspace,
int* work);

} // namespace csparse_extension
} // namespace g2o
} // namespace g2o::csparse_extension

#endif

0 comments on commit 0c278d8

Please sign in to comment.