From 9334fca07bc5f5cddf3730a9f0b94c35a9243268 Mon Sep 17 00:00:00 2001
From: Sebastien Dinot <sebastien.dinot@c-s.fr>
Date: Tue, 31 Jan 2012 13:32:41 +0100
Subject: [PATCH] ENH: GDAL copyright notice removed because GDAL source code
is not provided with OTB sources.
---
.../QtWidget/otbWrapperQtWidgetView.h | 2 +-
Copyright/GDALCopyright.txt | 22 -------------------
Testing/Code/Wrappers/Qt/CMakeLists.txt | 4 ++--
3 files changed, 3 insertions(+), 25 deletions(-)
delete mode 100644 Copyright/GDALCopyright.txt
diff --git a/Code/Wrappers/QtWidget/otbWrapperQtWidgetView.h b/Code/Wrappers/QtWidget/otbWrapperQtWidgetView.h
index ca02d8f1d6..7db8862743 100644
--- a/Code/Wrappers/QtWidget/otbWrapperQtWidgetView.h
+++ b/Code/Wrappers/QtWidget/otbWrapperQtWidgetView.h
@@ -54,7 +54,7 @@ private slots:
signals:
void QuitSignal();
-
+
private:
QtWidgetView(const QtWidgetView&); //purposely not implemented
diff --git a/Copyright/GDALCopyright.txt b/Copyright/GDALCopyright.txt
deleted file mode 100644
index 9b3a416323..0000000000
--- a/Copyright/GDALCopyright.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-
-The following terms are the same as X windows is released under, and is generally known as the "MIT License". It is intended to give you permission to do whatever you want with the GDAL source, including building proprietary commercial software, without further permission from me, or requirement to distribute your source code. A few portions of GDAL under under slightly different terms. For instance the libpng, libjpeg, libtiff, and libgeotiff license terms may vary slightly though I don't think any of them differ in any significant way. Some external libraries which can be optionally used by GDAL are under radically different licenses.
-
- Copyright (c) 2000, Frank Warmerdam
-
- 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 to use, copy, modify, merge, publish, distribute, sublicense,
- and/or sell copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included
- in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- DEALINGS IN THE SOFTWARE.
diff --git a/Testing/Code/Wrappers/Qt/CMakeLists.txt b/Testing/Code/Wrappers/Qt/CMakeLists.txt
index a1af9cbcc2..ab233cf03d 100644
--- a/Testing/Code/Wrappers/Qt/CMakeLists.txt
+++ b/Testing/Code/Wrappers/Qt/CMakeLists.txt
@@ -40,8 +40,8 @@ add_test(NAME owTvQtWidgetShow_${app}
otbWrapperQtWidgetShowWidget
${app}
$<TARGET_FILE_DIR:otbapp_${app}> )
-
+
endforeach(app)
add_test(owTvQtLogOutputNew ${OTB_WRAPPER_QTWIDGET_TESTS}
- otbQtLogOutputNew)
\ No newline at end of file
+ otbQtLogOutputNew)
--
GitLab