Updated license, and converted to unix-style newlines.

LICENSE

@@ -1,25 +1,25 @@
-Copyright (c) 2013, Gregory P. Meyer
-                    University of Illinois Board of Trustees
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-    * Neither the name of the copyright holder(s) nor the names of its
-      contributors may be used to endorse or promote products derived from
-      this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+Copyright (c) 2013-2014, Gregory P. Meyer
+                         University of Illinois Board of Trustees
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the copyright holder(s) nor the names of its
+      contributors may be used to endorse or promote products derived from
+      this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

README.md

@@ -1,20 +1,20 @@
-Depth Image Processing
-======================
-
-Depth Image Processing (DIP) is a library of research code created by
-[Greg Meyer](http://www.ifp.illinois.edu/~gmeyer3/) at the University of
-Illinois at Urbana-Champaign. The following projects are currently implemented
-in DIP:
-
-* [Real-time 3D face modeling with a commodity depth camera]
-(http://www.ifp.illinois.edu/~gmeyer3/papers/icme2013.pdf)
-
-DIP can be compiled and installed using CMake.
-
-### Requirements ###
-
-* CUDA 5.0
-* Eigen 3.0.0
-* HDF5
-* OpenNI2
-* OpenGL/GLUT
+Depth Image Processing
+======================
+
+Depth Image Processing (DIP) is a library of research code created by
+[Greg Meyer](http://www.ifp.illinois.edu/~gmeyer3/) at the University of
+Illinois at Urbana-Champaign. The following projects are currently implemented
+in DIP:
+
+* [Real-time 3D face modeling with a commodity depth camera]
+(http://www.ifp.illinois.edu/~gmeyer3/papers/icme2013.pdf)
+
+DIP can be compiled and installed using CMake.
+
+### Requirements ###
+
+* CUDA 5.0
+* Eigen 3.0.0
+* HDF5
+* OpenNI2
+* OpenGL/GLUT

applications/camera_capture/camera_capture.cpp

@@ -1,6 +1,6 @@
 /*
-Copyright (c) 2013, Gregory P. Meyer
-                    University of Illinois Board of Trustees
+Copyright (c) 2013-2014, Gregory P. Meyer
+                         University of Illinois Board of Trustees
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

applications/camera_capture/includes.cmake

@@ -1,5 +1,5 @@
-set(INCLUDE_DIRS
-    ${INCLUDE_DIRS}
-    ${GLUT_INCLUDE_DIR}
-    ${OPENGL_INCLUDE_DIR}
+set(INCLUDE_DIRS
+    ${INCLUDE_DIRS}
+    ${GLUT_INCLUDE_DIR}
+    ${OPENGL_INCLUDE_DIR}
     )

applications/camera_capture/install.cmake

@@ -1,20 +1,20 @@
-include(../copy_dll.cmake)
-
-# Copy and Install HDF5 DLLs
-copy_dll("${HDF5_INCLUDE_DIR}/../bin/hdf5.dll")
-copy_dll("${HDF5_INCLUDE_DIR}/../bin/hdf5_cpp.dll")
-copy_dll("${HDF5_INCLUDE_DIR}/../bin/szip.dll")
-copy_dll("${HDF5_INCLUDE_DIR}/../bin/zlib.dll")
-
-# Copy and Install GLUT DLLs
-copy_dll("${GLUT_INCLUDE_DIR}/../bin/freeglut.dll")
-
-# Copy and Install OpenNI2 DLLs
-copy_dll("${OPENNI2_INCLUDE_DIRS}/../Redist/OpenNI2.dll")
-
-add_custom_command(TARGET ${APPICATION_NAME} POST_BUILD
-                   COMMAND ${CMAKE_COMMAND} -E copy_directory
-                   "${OPENNI2_INCLUDE_DIRS}/../Redist/OpenNI2"
-                   "$<TARGET_FILE_DIR:${APPICATION_NAME}>/OpenNI2")
-install(DIRECTORY "${OPENNI2_INCLUDE_DIRS}/../Redist/OpenNI2"
+include(../copy_file.cmake)
+
+# Copy and Install HDF5 DLLs
+copy_file("${HDF5_INCLUDE_DIR}/../bin/hdf5.dll")
+copy_file("${HDF5_INCLUDE_DIR}/../bin/hdf5_cpp.dll")
+copy_file("${HDF5_INCLUDE_DIR}/../bin/szip.dll")
+copy_file("${HDF5_INCLUDE_DIR}/../bin/zlib.dll")
+
+# Copy and Install GLUT DLLs
+copy_file("${GLUT_INCLUDE_DIR}/../bin/freeglut.dll")
+
+# Copy and Install OpenNI2 DLLs
+copy_file("${OPENNI2_INCLUDE_DIRS}/../Redist/OpenNI2.dll")
+
+add_custom_command(TARGET ${APPICATION_NAME} POST_BUILD
+                   COMMAND ${CMAKE_COMMAND} -E copy_directory
+                   "${OPENNI2_INCLUDE_DIRS}/../Redist/OpenNI2"
+                   "$<TARGET_FILE_DIR:${APPICATION_NAME}>/OpenNI2")
+install(DIRECTORY "${OPENNI2_INCLUDE_DIRS}/../Redist/OpenNI2"
         DESTINATION "${BIN_INSTALL_DIR}")

applications/camera_viewer/camera_viewer.cpp

@@ -1,6 +1,6 @@
 /*
-Copyright (c) 2013, Gregory P. Meyer
-                    University of Illinois Board of Trustees
+Copyright (c) 2013-2014, Gregory P. Meyer
+                         University of Illinois Board of Trustees
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

applications/camera_viewer/install.cmake

@@ -1,20 +1,20 @@
-include(../copy_dll.cmake)
-
-# Copy and Install HDF5 DLLs
-copy_dll("${HDF5_INCLUDE_DIR}/../bin/hdf5.dll")
-copy_dll("${HDF5_INCLUDE_DIR}/../bin/hdf5_cpp.dll")
-copy_dll("${HDF5_INCLUDE_DIR}/../bin/szip.dll")
-copy_dll("${HDF5_INCLUDE_DIR}/../bin/zlib.dll")
-
-# Copy and Install GLUT DLLs
-copy_dll("${GLUT_INCLUDE_DIR}/../bin/freeglut.dll")
-
-# Copy and Install OpenNI2 DLLs
-copy_dll("${OPENNI2_INCLUDE_DIRS}/../Redist/OpenNI2.dll")
-
-add_custom_command(TARGET ${APPICATION_NAME} POST_BUILD
-                   COMMAND ${CMAKE_COMMAND} -E copy_directory
-                   "${OPENNI2_INCLUDE_DIRS}/../Redist/OpenNI2"
-                   "$<TARGET_FILE_DIR:${APPICATION_NAME}>/OpenNI2")
-install(DIRECTORY "${OPENNI2_INCLUDE_DIRS}/../Redist/OpenNI2"
+include(../copy_file.cmake)
+
+# Copy and Install HDF5 DLLs
+copy_file("${HDF5_INCLUDE_DIR}/../bin/hdf5.dll")
+copy_file("${HDF5_INCLUDE_DIR}/../bin/hdf5_cpp.dll")
+copy_file("${HDF5_INCLUDE_DIR}/../bin/szip.dll")
+copy_file("${HDF5_INCLUDE_DIR}/../bin/zlib.dll")
+
+# Copy and Install GLUT DLLs
+copy_file("${GLUT_INCLUDE_DIR}/../bin/freeglut.dll")
+
+# Copy and Install OpenNI2 DLLs
+copy_file("${OPENNI2_INCLUDE_DIRS}/../Redist/OpenNI2.dll")
+
+add_custom_command(TARGET ${APPICATION_NAME} POST_BUILD
+                   COMMAND ${CMAKE_COMMAND} -E copy_directory
+                   "${OPENNI2_INCLUDE_DIRS}/../Redist/OpenNI2"
+                   "$<TARGET_FILE_DIR:${APPICATION_NAME}>/OpenNI2")
+install(DIRECTORY "${OPENNI2_INCLUDE_DIRS}/../Redist/OpenNI2"
         DESTINATION "${BIN_INSTALL_DIR}")

applications/copy_dll.cmake → applications/copy_file.cmake

@@ -1,8 +1,8 @@
-function(copy_dll path)
-  # Copy DLL to working directory.
-  add_custom_command(TARGET ${APPICATION_NAME} POST_BUILD COMMAND
-                      ${CMAKE_COMMAND} -E copy "${path}"
-                      $<TARGET_FILE_DIR:${APPICATION_NAME}>)
-  # Install DLL.
-  install(FILES "${path}" DESTINATION ${BIN_INSTALL_DIR})
-endfunction()
+function(copy_file path)
+  # Copy file to working directory.
+  add_custom_command(TARGET ${APPICATION_NAME} POST_BUILD COMMAND
+                      ${CMAKE_COMMAND} -E copy "${path}"
+                      $<TARGET_FILE_DIR:${APPICATION_NAME}>)
+  # Install file.
+  install(FILES "${path}" DESTINATION ${BIN_INSTALL_DIR})
+endfunction()

applications/face_modeling/face_modeling.cpp

@@ -1,6 +1,6 @@
 /*
-Copyright (c) 2013, Gregory P. Meyer
-                    University of Illinois Board of Trustees
+Copyright (c) 2013-2014, Gregory P. Meyer
+                         University of Illinois Board of Trustees
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

applications/face_modeling/install.cmake

@@ -1,20 +1,20 @@
-include(../copy_dll.cmake)
-
-# Copy and Install HDF5 DLLs
-copy_dll("${HDF5_INCLUDE_DIR}/../bin/hdf5.dll")
-copy_dll("${HDF5_INCLUDE_DIR}/../bin/hdf5_cpp.dll")
-copy_dll("${HDF5_INCLUDE_DIR}/../bin/szip.dll")
-copy_dll("${HDF5_INCLUDE_DIR}/../bin/zlib.dll")
-
-# Copy and Install GLUT DLLs
-copy_dll("${GLUT_INCLUDE_DIR}/../bin/freeglut.dll")
-
-# Copy and Install OpenNI2 DLLs
-copy_dll("${OPENNI2_INCLUDE_DIRS}/../Redist/OpenNI2.dll")
-
-add_custom_command(TARGET ${APPICATION_NAME} POST_BUILD
-                   COMMAND ${CMAKE_COMMAND} -E copy_directory
-                   "${OPENNI2_INCLUDE_DIRS}/../Redist/OpenNI2"
-                   "$<TARGET_FILE_DIR:${APPICATION_NAME}>/OpenNI2")
-install(DIRECTORY "${OPENNI2_INCLUDE_DIRS}/../Redist/OpenNI2"
+include(../copy_file.cmake)
+
+# Copy and Install HDF5 DLLs
+copy_file("${HDF5_INCLUDE_DIR}/../bin/hdf5.dll")
+copy_file("${HDF5_INCLUDE_DIR}/../bin/hdf5_cpp.dll")
+copy_file("${HDF5_INCLUDE_DIR}/../bin/szip.dll")
+copy_file("${HDF5_INCLUDE_DIR}/../bin/zlib.dll")
+
+# Copy and Install GLUT DLLs
+copy_file("${GLUT_INCLUDE_DIR}/../bin/freeglut.dll")
+
+# Copy and Install OpenNI2 DLLs
+copy_file("${OPENNI2_INCLUDE_DIRS}/../Redist/OpenNI2.dll")
+
+add_custom_command(TARGET ${APPICATION_NAME} POST_BUILD
+                   COMMAND ${CMAKE_COMMAND} -E copy_directory
+                   "${OPENNI2_INCLUDE_DIRS}/../Redist/OpenNI2"
+                   "$<TARGET_FILE_DIR:${APPICATION_NAME}>/OpenNI2")
+install(DIRECTORY "${OPENNI2_INCLUDE_DIRS}/../Redist/OpenNI2"
         DESTINATION "${BIN_INSTALL_DIR}")

applications/object_modeling/install.cmake

@@ -1,20 +1,20 @@
-include(../copy_dll.cmake)
-
-# Copy and Install HDF5 DLLs
-copy_dll("${HDF5_INCLUDE_DIR}/../bin/hdf5.dll")
-copy_dll("${HDF5_INCLUDE_DIR}/../bin/hdf5_cpp.dll")
-copy_dll("${HDF5_INCLUDE_DIR}/../bin/szip.dll")
-copy_dll("${HDF5_INCLUDE_DIR}/../bin/zlib.dll")
-
-# Copy and Install GLUT DLLs
-copy_dll("${GLUT_INCLUDE_DIR}/../bin/freeglut.dll")
-
-# Copy and Install OpenNI2 DLLs
-copy_dll("${OPENNI2_INCLUDE_DIRS}/../Redist/OpenNI2.dll")
-
-add_custom_command(TARGET ${APPICATION_NAME} POST_BUILD
-                   COMMAND ${CMAKE_COMMAND} -E copy_directory
-                   "${OPENNI2_INCLUDE_DIRS}/../Redist/OpenNI2"
-                   "$<TARGET_FILE_DIR:${APPICATION_NAME}>/OpenNI2")
-install(DIRECTORY "${OPENNI2_INCLUDE_DIRS}/../Redist/OpenNI2"
+include(../copy_file.cmake)
+
+# Copy and Install HDF5 DLLs
+copy_file("${HDF5_INCLUDE_DIR}/../bin/hdf5.dll")
+copy_file("${HDF5_INCLUDE_DIR}/../bin/hdf5_cpp.dll")
+copy_file("${HDF5_INCLUDE_DIR}/../bin/szip.dll")
+copy_file("${HDF5_INCLUDE_DIR}/../bin/zlib.dll")
+
+# Copy and Install GLUT DLLs
+copy_file("${GLUT_INCLUDE_DIR}/../bin/freeglut.dll")
+
+# Copy and Install OpenNI2 DLLs
+copy_file("${OPENNI2_INCLUDE_DIRS}/../Redist/OpenNI2.dll")
+
+add_custom_command(TARGET ${APPICATION_NAME} POST_BUILD
+                   COMMAND ${CMAKE_COMMAND} -E copy_directory
+                   "${OPENNI2_INCLUDE_DIRS}/../Redist/OpenNI2"
+                   "$<TARGET_FILE_DIR:${APPICATION_NAME}>/OpenNI2")
+install(DIRECTORY "${OPENNI2_INCLUDE_DIRS}/../Redist/OpenNI2"
         DESTINATION "${BIN_INSTALL_DIR}")

applications/object_modeling/object_modeling.cpp

@@ -1,6 +1,6 @@
 /*
-Copyright (c) 2013, Gregory P. Meyer
-                    University of Illinois Board of Trustees
+Copyright (c) 2013-2014, Gregory P. Meyer
+                         University of Illinois Board of Trustees
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

cameras/include/dip/cameras/camera.h

@@ -1,6 +1,6 @@
 /*
-Copyright (c) 2013, Gregory P. Meyer
-                    University of Illinois Board of Trustees
+Copyright (c) 2013-2014, Gregory P. Meyer
+                         University of Illinois Board of Trustees
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

cameras/include/dip/cameras/dumpfile.h

@@ -1,6 +1,6 @@
 /*
-Copyright (c) 2013, Gregory P. Meyer
-                    University of Illinois Board of Trustees
+Copyright (c) 2013-2014, Gregory P. Meyer
+                         University of Illinois Board of Trustees
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

cameras/include/dip/cameras/primesense.h

@@ -1,6 +1,6 @@
 /*
-Copyright (c) 2013, Gregory P. Meyer
-                    University of Illinois Board of Trustees
+Copyright (c) 2013-2014, Gregory P. Meyer
+                         University of Illinois Board of Trustees
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

cameras/src/dumpfile.cpp

@@ -1,6 +1,6 @@
 /*
-Copyright (c) 2013, Gregory P. Meyer
-                    University of Illinois Board of Trustees
+Copyright (c) 2013-2014, Gregory P. Meyer
+                         University of Illinois Board of Trustees
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

cameras/src/primesense.cpp

@@ -1,6 +1,6 @@
 /*
-Copyright (c) 2013, Gregory P. Meyer
-                    University of Illinois Board of Trustees
+Copyright (c) 2013-2014, Gregory P. Meyer
+                         University of Illinois Board of Trustees
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -259,8 +259,8 @@ void PrimeSense::initialize(const char *uri, bool calibration) {
       else {
         printf("Unable to Create Stream\n%s\n", OpenNI::getExtendedError());
       }
-    }
-
+    }
+
     device_.setImageRegistrationMode(IMAGE_REGISTRATION_DEPTH_TO_COLOR);
   }
   else {