Merge branch 'file-formatting' of https://github.com/aaronfranke/assimp…

… into aaronfranke-file-formatting

INSTALL

@@ -1,50 +1,50 @@
-	
-========================================================================
-Open Asset Import Library (assimp) INSTALL 
-========================================================================
-
-------------------------------
-Getting the documentation
-------------------------------
-
-A regularly-updated copy is available at 
-http://assimp.sourceforge.net/lib_html/index.html
-
-A CHM file is included in the SVN repos: ./doc/AssimpDoc_Html/AssimpDoc.chm.
-To build the doxygen documentation on your own, follow these steps:
-
-a) download & install latest doxygen 
-b) make sure doxygen is in the executable search path
-c) navigate to ./doc
-d) and run 'doxygen'
-
-Open the generated HTML (AssimpDoc_Html/index.html) in the browser of your choice.
-Windows only: To generate the CHM doc, install 'Microsoft HTML Workshop'
-and configure the path to it in the DOXYFILE first. 
-
-------------------------------
-Building Assimp 
-------------------------------
-
-More detailed build instructions can be found in the documentation,
-this section is just for the inpatient among you.
-
-CMake is the preferred build system for Assimp. The minimum required version 
-is 2.6. If you don't have it yet, downloads for CMake can be found on
-http://www.cmake.org/. 
-
-For Unix:
-
-1. mkdir build && cd build
-2. cmake .. -G 'Unix Makefiles'
-3. make -j4
-
-For Windows:
-1. Open a command prompt
-2. mkdir build
-3. cd build
-4. cmake ..
-5. cmake --build .
-
-For iOS:
-Just check the following project, which deploys a compiler toolchain for different iOS-versions: https://github.com/assimp/assimp/tree/master/port/iOS
+
+========================================================================
+Open Asset Import Library (assimp) INSTALL 
+========================================================================
+
+------------------------------
+Getting the documentation
+------------------------------
+
+A regularly-updated copy is available at 
+http://assimp.sourceforge.net/lib_html/index.html
+
+A CHM file is included in the SVN repos: ./doc/AssimpDoc_Html/AssimpDoc.chm.
+To build the doxygen documentation on your own, follow these steps:
+
+a) download & install latest doxygen 
+b) make sure doxygen is in the executable search path
+c) navigate to ./doc
+d) and run 'doxygen'
+
+Open the generated HTML (AssimpDoc_Html/index.html) in the browser of your choice.
+Windows only: To generate the CHM doc, install 'Microsoft HTML Workshop'
+and configure the path to it in the DOXYFILE first. 
+
+------------------------------
+Building Assimp 
+------------------------------
+
+More detailed build instructions can be found in the documentation,
+this section is just for the inpatient among you.
+
+CMake is the preferred build system for Assimp. The minimum required version 
+is 2.6. If you don't have it yet, downloads for CMake can be found on
+http://www.cmake.org/. 
+
+For Unix:
+
+1. mkdir build && cd build
+2. cmake .. -G 'Unix Makefiles'
+3. make -j4
+
+For Windows:
+1. Open a command prompt
+2. mkdir build
+3. cd build
+4. cmake ..
+5. cmake --build .
+
+For iOS:
+Just check the following project, which deploys a compiler toolchain for different iOS-versions: https://github.com/assimp/assimp/tree/master/port/iOS

code/AssetLib/AMF/AMFImporter_Geometry.cpp

@@ -1,4 +1,4 @@
-/*
+/*
 ---------------------------------------------------------------------------
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------

code/AssetLib/AMF/AMFImporter_Macro.hpp

@@ -1,4 +1,4 @@
-/*
+/*
 ---------------------------------------------------------------------------
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------

code/AssetLib/AMF/AMFImporter_Material.cpp

@@ -1,4 +1,4 @@
-/*
+/*
 ---------------------------------------------------------------------------
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------

code/AssetLib/AMF/AMFImporter_Node.hpp

@@ -1,4 +1,4 @@
-/*
+/*
 ---------------------------------------------------------------------------
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------

code/AssetLib/MMD/MMDImporter.h

@@ -93,4 +93,4 @@ class MMDImporter : public BaseImporter {
 
 } // Namespace Assimp
 
-#endif
+#endif

code/AssetLib/glTF/glTFAsset.h

@@ -1,4 +1,4 @@
-/*
+/*
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 

code/AssetLib/glTF/glTFExporter.cpp

@@ -1,4 +1,4 @@
-/*
+/*
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 

code/AssetLib/glTF/glTFImporter.cpp

@@ -1,4 +1,4 @@
-/*
+/*
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 

code/AssetLib/glTF2/glTF2Exporter.cpp

@@ -1,4 +1,4 @@
-/*
+/*
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 

code/Common/ImporterRegistry.cpp

@@ -1,4 +1,4 @@
-/*
+/*
 ---------------------------------------------------------------------------
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------

code/PostProcessing/ArmaturePopulate.h

@@ -109,4 +109,4 @@ class ASSIMP_API ArmaturePopulate : public BaseProcess {
 } // Namespace Assimp
 
 
-#endif // SCALE_PROCESS_H_
+#endif // SCALE_PROCESS_H_

code/PostProcessing/ScaleProcess.h

@@ -94,4 +94,4 @@ class ASSIMP_API ScaleProcess : public BaseProcess {
 } // Namespace Assimp
 
 
-#endif // SCALE_PROCESS_H_
+#endif // SCALE_PROCESS_H_

code/PostProcessing/ValidateDataStructure.cpp

@@ -1,4 +1,4 @@
-/*
+/*
 ---------------------------------------------------------------------------
 Open Asset Import Library (assimp)
 ---------------------------------------------------------------------------

contrib/Open3DGC/o3dgcSC3DMCDecoder.h

@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2013 Khaled Mammou - Advanced Micro Devices, Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy

contrib/android-cmake/README.md

@@ -237,4 +237,4 @@ The _android-cmake_ should correctly handle projects with assembler sources (`*.
 
 ## Copying
 
-_android-cmake_ is distributed under the terms of [BSD 3-Clause License](http://opensource.org/licenses/BSD-3-Clause)
+_android-cmake_ is distributed under the terms of [BSD 3-Clause License](http://opensource.org/licenses/BSD-3-Clause)

contrib/gtest/docs/Documentation.md

@@ -11,4 +11,4 @@ documentation for that specific version instead.**
 To contribute code to Google Test, read:
 
   * [DevGuide](DevGuide.md) -- read this _before_ writing your first patch.
-  * [PumpManual](PumpManual.md) -- how we generate some of Google Test's source files.
+  * [PumpManual](PumpManual.md) -- how we generate some of Google Test's source files.

contrib/gtest/docs/V1_5_Documentation.md

@@ -9,4 +9,4 @@ This page lists all official documentation wiki pages for Google Test **1.5.0**
 To contribute code to Google Test, read:
 
   * DevGuide -- read this _before_ writing your first patch.
-  * [PumpManual](V1_5_PumpManual.md) -- how we generate some of Google Test's source files.
+  * [PumpManual](V1_5_PumpManual.md) -- how we generate some of Google Test's source files.

contrib/gtest/docs/V1_5_PumpManual.md

@@ -174,4 +174,4 @@ You can find real-world applications of Pump in [Google Test](http://www.google.
 ## Tips ##
 
   * If a meta variable is followed by a letter or digit, you can separate them using `[[]]`, which inserts an empty string. For example `Foo$j[[]]Helper` generate `Foo1Helper` when `j` is 1.
-  * To avoid extra-long Pump source lines, you can break a line anywhere you want by inserting `[[]]` followed by a new line. Since any new-line character next to `[[` or `]]` is ignored, the generated code won't contain this new line.
+  * To avoid extra-long Pump source lines, you can break a line anywhere you want by inserting `[[]]` followed by a new line. Since any new-line character next to `[[` or `]]` is ignored, the generated code won't contain this new line.

contrib/gtest/docs/V1_5_XcodeGuide.md

@@ -90,4 +90,4 @@ The Debugger has exited with status 0.
 
 # Summary #
 
-Unit testing is a valuable way to ensure your data model stays valid even during rapid development or refactoring. The Google Testing Framework is a great unit testing framework for C and C++ which integrates well with an Xcode development environment.
+Unit testing is a valuable way to ensure your data model stays valid even during rapid development or refactoring. The Google Testing Framework is a great unit testing framework for C and C++ which integrates well with an Xcode development environment.

contrib/gtest/docs/V1_6_Documentation.md

@@ -11,4 +11,4 @@ documentation for that specific version instead.**
 To contribute code to Google Test, read:
 
   * [DevGuide](DevGuide.md) -- read this _before_ writing your first patch.
-  * [PumpManual](V1_6_PumpManual.md) -- how we generate some of Google Test's source files.
+  * [PumpManual](V1_6_PumpManual.md) -- how we generate some of Google Test's source files.

contrib/gtest/docs/V1_6_XcodeGuide.md

@@ -90,4 +90,4 @@ The Debugger has exited with status 0.
 
 # Summary #
 
-Unit testing is a valuable way to ensure your data model stays valid even during rapid development or refactoring. The Google Testing Framework is a great unit testing framework for C and C++ which integrates well with an Xcode development environment.
+Unit testing is a valuable way to ensure your data model stays valid even during rapid development or refactoring. The Google Testing Framework is a great unit testing framework for C and C++ which integrates well with an Xcode development environment.

contrib/gtest/docs/V1_7_Documentation.md

@@ -11,4 +11,4 @@ documentation for that specific version instead.**
 To contribute code to Google Test, read:
 
   * [DevGuide](DevGuide.md) -- read this _before_ writing your first patch.
-  * [PumpManual](V1_7_PumpManual.md) -- how we generate some of Google Test's source files.
+  * [PumpManual](V1_7_PumpManual.md) -- how we generate some of Google Test's source files.

contrib/gtest/docs/V1_7_XcodeGuide.md

@@ -90,4 +90,4 @@ The Debugger has exited with status 0.
 
 # Summary #
 
-Unit testing is a valuable way to ensure your data model stays valid even during rapid development or refactoring. The Google Testing Framework is a great unit testing framework for C and C++ which integrates well with an Xcode development environment.
+Unit testing is a valuable way to ensure your data model stays valid even during rapid development or refactoring. The Google Testing Framework is a great unit testing framework for C and C++ which integrates well with an Xcode development environment.

contrib/gtest/docs/XcodeGuide.md

@@ -90,4 +90,4 @@ The Debugger has exited with status 0.
 
 # Summary #
 
-Unit testing is a valuable way to ensure your data model stays valid even during rapid development or refactoring. The Google Testing Framework is a great unit testing framework for C and C++ which integrates well with an Xcode development environment.
+Unit testing is a valuable way to ensure your data model stays valid even during rapid development or refactoring. The Google Testing Framework is a great unit testing framework for C and C++ which integrates well with an Xcode development environment.

contrib/poly2tri/README

@@ -1,4 +1,4 @@
-==================
+==================
 INSTALLATION GUIDE
 ==================
 
@@ -48,4 +48,4 @@ Examples:
   ./p2t nazca_monkey.dat 0 0 9
 
   ./p2t random 10 100 5.0
-  ./p2t random 1000 20000 0.025
+  ./p2t random 1000 20000 0.025

contrib/poly2tri/poly2tri/common/shapes.cc

@@ -362,4 +362,4 @@ void Triangle::DebugPrint()
   cout << points_[2]->x << "," << points_[2]->y << endl;
 }
 
-}
+}

contrib/poly2tri/poly2tri/common/shapes.h

@@ -324,4 +324,4 @@ inline void Triangle::IsInterior(bool b)
 
 }
 
-#endif
+#endif

contrib/poly2tri/poly2tri/poly2tri.h

@@ -35,4 +35,4 @@
 #include "common/shapes.h"
 #include "sweep/cdt.h"
 
-#endif
+#endif

contrib/poly2tri/poly2tri/sweep/advancing_front.cc

@@ -105,4 +105,4 @@ AdvancingFront::~AdvancingFront()
 {
 }
 
-}
+}

contrib/poly2tri/poly2tri/sweep/advancing_front.h

@@ -115,4 +115,4 @@ inline void AdvancingFront::set_search(Node* node)
 
 }
 
-#endif
+#endif

contrib/poly2tri/poly2tri/sweep/cdt.cc

@@ -68,4 +68,4 @@ CDT::~CDT()
   delete sweep_;
 }
 
-}
+}

contrib/poly2tri/poly2tri/sweep/cdt.h

@@ -102,4 +102,4 @@ class CDT
 
 }
 
-#endif
+#endif

contrib/poly2tri/poly2tri/sweep/sweep.h

@@ -282,4 +282,4 @@ class Sweep
 
 }
 
-#endif
+#endif

contrib/stb_image/stb_image.h

@@ -7459,4 +7459,4 @@ AUTHORS 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.
 ------------------------------------------------------------------------------
-*/
+*/

contrib/zip/.travis.sh

@@ -15,4 +15,4 @@ else
     make -j 8
     make install
     ASAN_OPTIONS=detect_leaks=0 LSAN_OPTIONS=verbosity=1:log_threads=1 ctest -V
-fi
+fi

contrib/zip/.travis.yml

@@ -19,4 +19,4 @@ after_success:
   - make
   - make test
   # Uploading report to CodeCov
-  - bash <(curl -s https://codecov.io/bash)
+  - bash <(curl -s https://codecov.io/bash)

contrib/zlib/contrib/blast/test.txt

@@ -1 +1 @@
-AIAIAIAIAIAIA
+AIAIAIAIAIAIA

contrib/zlib/contrib/dotzlib/LICENSE_1_0.txt

@@ -20,4 +20,4 @@ FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
 SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
 FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
 ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
+DEALINGS IN THE SOFTWARE.

contrib/zlib/contrib/testzlib/testzlib.txt

@@ -7,4 +7,4 @@ copy to a directory file from :
 - contrib/masmx64
 - contrib/vstudio/vc7
 
-and open testzlib8.sln
+and open testzlib8.sln

contrib/zlib_note.txt

@@ -8,4 +8,4 @@ This is a heavily modified and shrinked version of zlib 1.2.3
 
 Assimp itself does not use the compression part yet, so
 it needn't be compiled (trees.c, deflate.c, compress.c).
-Currently these units are just used by assimp_cmd.
+Currently these units are just used by assimp_cmd.

doc/architecture/Assimp_Arch_Import.class.violet.html

@@ -351,4 +351,4 @@
 ETwCgEfwCAAewSMAeASP4BEAPIJHAPAIHgFItrEBsYNHAD7BK4gZPAKAR/AIAB7BIwCQBvwfU/j0
 jy2hMWgAAAAASUVORK5C" />
 </BODY>
-</HTML>
+</HTML>

doc/architecture/Assimp_Arch_export.class.violet.html

@@ -645,4 +645,4 @@
 ahsAtY3aBtQ2AGobtQ1qGwC1jdoGtQ2A2kZtA2obALWN2ga1DUA1igr2o7ZBbQPw0/wD+/DsALUN
 gNpGbYPaBkBto7ZBbQMAAD/R/wDNluGGIxSgmAAAAABJRU5ErkJg" />
 </BODY>
-</HTML>
+</HTML>

doc/architecture/assimp.object.violet.html

@@ -104,4 +104,4 @@
 oLOf5O8VrfC7XlrtOvYCO77PYocddthhhx122GGHHXbYYYcddthhhx122GGHHXbYYYdd29q1c83s
 I9m5B21Yuxg77FJtRzQV/wEjVLA5JUDyfgAAAABJRU5ErkJg" />
 </BODY>
-</HTML>
+</HTML>