Merge branch 'master' into unstable

Author: eddiecohen

Include/XnPsVersion.h

@@ -36,7 +36,7 @@
 /** Xiron maintenance version. */ 
 #define XN_PS_MAINTENANCE_VERSION 6
 /** Xiron build version. */ 
-#define XN_PS_BUILD_VERSION 5
+#define XN_PS_BUILD_VERSION 6
 
 /** Xiron version (in brief string format): "Major.Minor.Maintenance (Build)" */ 
 #define XN_PS_BRIEF_VERSION_STRING \

NOTICE

@@ -1,10 +1,90 @@
-Sensor Module for OpenNI 1.x
+Sensor Module 
 Copyright (c) 2012 PrimeSense Ltd.
 
 This product is licensed under the Apache License, Version 2.0 (the "License");
 
-You should have received a copy of the Apache License
-along with OpenNI. If not, see:
+You should have received a copy of the Apache License along with the Sensor 
+module. If not, see:
     http://www.apache.org/licenses/LICENSE-2.0  
 
-This software is based in part on the work of the Independent JPEG Group.
+Unless required by applicable law or agreed to in writing, software 
+distributed under the License is distributed on an "AS IS" BASIS, WITHOUT 
+WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the 
+License for the specific language governing permissions and limitations under 
+the License.
+
+The following open source component is included in Sensor Module:
+
+LibJPEG, 6b of 27-Mar-1998
+
+This software is based in part on the work of the Independent JPEG Group. 
+Sensor module source code also contains the source code of libjpeg, as well 
+as its license terms. An online copy can be found at: 
+https://github.com/PrimeSense/Sensor/blob/master/Source/External/LibJPEG/README
+
+
+This license can be found at:
+https://github.com/aseprite/aseprite/blob/master/docs/licenses/libjpeg-LICENSE.txt
+
+The authors make NO WARRANTY or representation, either express or implied, 
+with respect to this software, its quality, accuracy, merchantability, or 
+fitness for a particular purpose.  This software is provided "AS IS", and 
+you, its user, assume the entire risk as to its quality and accuracy. 
+This software is copyright (C) 1991-1998, Thomas G. Lane.
+All Rights Reserved except as specified below.
+
+Permission is hereby granted to use, copy, modify, and distribute this 
+software (or portions thereof) for any purpose, without fee, subject to these 
+conditions: 
+(1) If any part of the source code for this software is distributed, then 
+this README file must be included, with this copyright and no-warranty notice 
+unaltered; and any additions, deletions, or changes to the original files 
+must be clearly indicated in accompanying documentation. 
+(2) If only executable code is distributed, then the accompanying 
+documentation must state that "this software is based in part on the work of 
+the Independent JPEG Group". 
+(3) Permission for use of this software is granted only if the user accepts 
+full responsibility for any undesirable consequences; the authors accept NO 
+LIABILITY for damages of any kind.
+These conditions apply to any software derived from or based on the IJG code, 
+not just to the unmodified library.  If you use our work, you ought to 
+acknowledge us. 
+Permission is NOT granted for the use of any IJG author's name or company 
+name in advertising or publicity relating to this software or products 
+derived from it.  This software may be referred to only as "the Independent 
+JPEG Group's software".
+We specifically permit and encourage the use of this software as the basis of 
+commercial products, provided that all warranty or liability claims are 
+assumed by the product vendor. 
+ansi2knr.c is included in this distribution by permission of L. Peter 
+Deutsch, sole proprietor of its copyright holder, Aladdin Enterprises of 
+Menlo Park, CA. ansi2knr.c is NOT covered by the above copyright and 
+conditions, but instead by the usual distribution terms of the Free Software 
+Foundation; principally,  that you must include source code if you 
+redistribute it.  (See the file
+ansi2knr.c for full details.)  However, since ansi2knr.c is not needed as 
+part of any program generated from the IJG code, this does not limit you more 
+than the foregoing paragraphs do. 
+The Unix configuration script "configure" was produced with GNU Autoconf. It 
+is copyright by the Free Software Foundation but is freely distributable. The 
+same holds for its supporting scripts (config.guess, config.sub, ltconfig, 
+ltmain.sh).  Another support script, install-sh, is copyright by M.I.T. but 
+is also freely distributable. 
+It appears that the arithmetic coding option of the JPEG spec is covered by 
+patents owned by IBM, AT&T, and Mitsubishi.  Hence arithmetic coding cannot 
+legally be used without obtaining one or more licenses.  For this reason, 
+support for arithmetic coding has been removed from the free JPEG software. 
+(Since arithmetic coding provides only a marginal gain over the unpatented 
+Huffman mode, it is unlikely that very many implementations will support 
+it.)  So far as we are aware, there are no patent restrictions on the 
+remaining code.
+The IJG distribution formerly included code to read and write GIF files. To 
+avoid entanglement with the Unisys LZW patent, GIF reading support has been 
+removed altogether, and the GIF writer has been simplified to produce 
+"uncompressed GIFs".  This technique does not use the LZW algorithm; the 
+resulting GIF files are larger than usual, but are readable by all standard 
+GIF decoders. 
+We are required to state that "The Graphics Interchange Format(c) is the 
+Copyright property of CompuServe Incorporated.  GIF(sm) is a Service Mark 
+property of CompuServe Incorporated." 
+

Platform/Win32/CreateRedist/EE_NI/Includes/EENIVariables.wxi

@@ -8,7 +8,7 @@
   <?define MinorVersion=1?>
   <?define MaintenanceVersion=6?>
   <!-- BuildVersion is NOT used by WiX in the upgrade procedure -->
-  <?define BuildVersion=5?>
+  <?define BuildVersion=6?>
 
   <!-- Full version number to display -->
   <?define VersionNumber="$(var.MajorVersion).$(var.MinorVersion).$(var.MaintenanceVersion).$(var.BuildVersion)" ?>