Updated to version 1.3.2.3.

CHANGES

@@ -1,8 +1,17 @@
 Detailed Change log:
 --------------------
 
+Version 1.3.2.3 (Unstable version - July 19th 2011)
+---------------------------------------------------
+  * Windows/Linux: Allow creating mutex even if name contains slashes/backslashes.
+  * Linux installer fix: dir /var/log/ni wasn't created, so installation might fail.
+  * Linux installer fix: do not try to install non-existing .Net wrappers.
+  * Java Bug Fix: ImageMap::createByteBuffer() causes infinite recursion (#1290).
+  * Bug Fix: on rare cases, creating nodes might succeed but return a NULL hNode.
+  * Java wrappers are now installed to /usr/share/java.
+
 Version 1.3.2.1 (Stable version - July 4th 2011)
------------------------------------------------
+------------------------------------------------
   * Moved HandTouchingFOVEdge to be a Capability, available through the HandGenerator.
   * Skeleton Capability:
 	 - CalibrationCallbacks (bundle of CalibrationStart and CalibrationEnd) marked as deprecated

Include/XnVersion.h

@@ -37,7 +37,7 @@
 /** OpenNI maintenance version. */ 
 #define XN_MAINTENANCE_VERSION 2
 /** OpenNI build version. */ 
-#define XN_BUILD_VERSION 1
+#define XN_BUILD_VERSION 3
 
 /** OpenNI version (in brief string format): "Major.Minor.Maintenance (Build)" */ 
 #define XN_BRIEF_VERSION_STRING \

Platform/Linux-x86/Build/CommonCSMakefile → Platform/Linux-x86/Build/Common/CommonCSMakefile

@@ -22,12 +22,15 @@ COMMON_CS_MAKE_FILE_DIR = $(dir $(lastword $(MAKEFILE_LIST)))
 include $(COMMON_CS_MAKE_FILE_DIR)CommonDefs.mak
 
 # create -r option to mcs
-USED_NETLIBS_OPTION = $(foreach lib,$(USED_LIBS),-r:$(OUT_DIR)/$(lib).dll)
+USED_NETLIBS_OPTION = $(foreach lib,$(USED_LIBS),-r:$(lib).dll)
 
 ifeq "$(NET_WIN_FORMS)" "1"
 	USED_NETLIBS_OPTION += -r:System.Windows.Forms.dll -r:System.Drawing.dll
 endif
 
+# add the output dir as a place to search for assemblies
+USED_NETLIBS_OPTION += -lib:$(OUT_DIR)
+
 ifeq "$(CFG)" "Release"
 	CSFLAGS += -o+
 endif

Platform/Linux-x86/Build/Common/CommonDefs.mak

@@ -0,0 +1,40 @@
+# some defaults
+ifndef CFG
+    CFG = Release
+endif
+
+ifndef PLATFORM
+    MACHINE = $(shell uname -m)
+    ifneq (,$(findstring x86,$(MACHINE)))
+        PLATFORM = x86
+    else ifneq (,$(findstring i686,$(MACHINE)))
+        PLATFORM = x86
+    else ifneq (,$(findstring i386,$(MACHINE)))
+        PLATFORM = x86
+    else ifneq (,$(findstring arm,$(MACHINE)))
+        PLATFORM = Arm
+    else
+        $(error Unknown Platform)
+    endif
+endif
+
+# expand file list
+SRC_FILES_LIST = $(wildcard $(SRC_FILES))
+
+# define the intermediate directory
+INT_DIR = $(CFG)
+
+# define output directory
+OUT_DIR = $(BIN_DIR)/$(CFG)
+
+# full path to output file
+OUTPUT_FILE = $(OUT_DIR)/$(OUTPUT_NAME)
+
+# take this file's dir
+COMMON_MAK_DIR = $(dir $(lastword $(MAKEFILE_LIST)))
+
+# get the OS type
+OSTYPE := $(shell uname -s)
+
+# platform specific args
+include $(COMMON_MAK_DIR)Platform.$(PLATFORM)

Platform/Linux-x86/Build/Platform.x86 → Platform/Linux-x86/Build/Common/Platform.x86

@@ -17,6 +17,9 @@ ifeq "$(CFG)" "Release"
 	else
 		ifeq ($(SSE_GENERATION), 3)
 			CFLAGS += -msse3
+			ifeq ($(SSSE3_ENABLED), 1)
+				CFLAGS += -mssse3
+			endif
 		else
 			($error "Only SSE2 and SSE3 are supported")
 		endif

Platform/Linux-x86/Build/Makefile

@@ -28,7 +28,7 @@ CP = cp
 RM = rm
 
 # platform specific args
--include Platform.$(PLATFORM)
+-include Common/Platform.$(PLATFORM)
 
 # Bin directory
 BIN_DIR = ../Bin

Platform/Linux-x86/Build/Modules/nimCodecs/Makefile

@@ -12,7 +12,7 @@ SRC_FILES = \
 LIB_NAME = nimCodecs
 USED_LIBS = OpenNI
 
-include ../../CommonCppMakefile
+include ../../Common/CommonCppMakefile
 
 
 

Platform/Linux-x86/Build/Modules/nimMockNodes/Makefile

@@ -10,5 +10,5 @@ SRC_FILES = \
 LIB_NAME = nimMockNodes
 USED_LIBS = OpenNI
 
-include ../../CommonCppMakefile
+include ../../Common/CommonCppMakefile
 

Platform/Linux-x86/Build/Modules/nimRecorder/Makefile

@@ -12,6 +12,6 @@ SRC_FILES = \
 LIB_NAME = nimRecorder
 USED_LIBS = OpenNI
 
-include ../../CommonCppMakefile
+include ../../Common/CommonCppMakefile
 
 

Platform/Linux-x86/Build/OpenNI/Makefile

@@ -25,6 +25,6 @@ ifneq ("$(OSTYPE)","Darwin")
 endif
 DEFINES = XN_EXPORTS
 
-include ../CommonCppMakefile
+include ../Common/CommonCppMakefile
 
 

Platform/Linux-x86/Build/Res/AssemblyInfo-OpenNI.cs

@@ -30,5 +30,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.3.2.1")]
-[assembly: AssemblyFileVersion("1.3.2.1")]
+[assembly: AssemblyVersion("1.3.2.3")]
+[assembly: AssemblyFileVersion("1.3.2.3")]

Platform/Linux-x86/Build/Samples/NiAudioSample/Makefile

@@ -7,5 +7,5 @@ SRC_FILES = ../../../../../Samples/NiAudioSample/*.cpp
 EXE_NAME = Sample-NiAudioSample
 USED_LIBS = OpenNI
 
-include ../../CommonCppMakefile
+include ../../Common/CommonCppMakefile
 

Platform/Linux-x86/Build/Samples/NiBackRecorder/Makefile

@@ -7,5 +7,5 @@ SRC_FILES = ../../../../../Samples/NiBackRecorder/*.cpp
 EXE_NAME = Sample-NiBackRecorder
 USED_LIBS = OpenNI
 
-include ../../CommonCppMakefile
+include ../../Common/CommonCppMakefile
 

Platform/Linux-x86/Build/Samples/NiCRead/Makefile

@@ -7,5 +7,5 @@ SRC_FILES = ../../../../../Samples/NiCRead/*.c
 EXE_NAME = Sample-NiCRead
 USED_LIBS = OpenNI
 
-include ../../CommonCppMakefile
+include ../../Common/CommonCppMakefile
 

Platform/Linux-x86/Build/Samples/NiConvertXToONI/Makefile

@@ -7,5 +7,5 @@ SRC_FILES = ../../../../../Samples/NiConvertXToONI/*.cpp
 EXE_NAME = Sample-NiConvertXToONI
 USED_LIBS = OpenNI
 
-include ../../CommonCppMakefile
+include ../../Common/CommonCppMakefile
 

Platform/Linux-x86/Build/Samples/NiRecordSynthetic/Makefile

@@ -7,5 +7,5 @@ SRC_FILES = ../../../../../Samples/NiRecordSynthetic/*.cpp
 EXE_NAME = Sample-NiRecordSynthetic
 USED_LIBS = OpenNI
 
-include ../../CommonCppMakefile
+include ../../Common/CommonCppMakefile
 

Platform/Linux-x86/Build/Samples/NiSampleModule/Makefile

@@ -7,5 +7,5 @@ SRC_FILES = ../../../../../Samples/NiSampleModule/*.cpp
 LIB_NAME = Sample-NiSampleModule
 USED_LIBS = OpenNI
 
-include ../../CommonCppMakefile
+include ../../Common/CommonCppMakefile
 

Platform/Linux-x86/Build/Samples/NiSimpleCreate/Makefile

@@ -7,5 +7,5 @@ SRC_FILES = ../../../../../Samples/NiSimpleCreate/*.cpp
 EXE_NAME = Sample-NiSimpleCreate
 USED_LIBS = OpenNI
 
-include ../../CommonCppMakefile
+include ../../Common/CommonCppMakefile
 

Platform/Linux-x86/Build/Samples/NiSimpleRead/Makefile

@@ -7,5 +7,5 @@ SRC_FILES = ../../../../../Samples/NiSimpleRead/*.cpp
 EXE_NAME = Sample-NiSimpleRead
 USED_LIBS = OpenNI
 
-include ../../CommonCppMakefile
+include ../../Common/CommonCppMakefile
 

Platform/Linux-x86/Build/Samples/NiSimpleViewer/Makefile

@@ -16,5 +16,5 @@ endif
 
 USED_LIBS += OpenNI
 
-include ../../CommonCppMakefile
+include ../../Common/CommonCppMakefile
 

Platform/Linux-x86/Build/Samples/NiUserTracker/Makefile

@@ -24,5 +24,5 @@ endif
 
 USED_LIBS += OpenNI
 
-include ../../CommonCppMakefile
+include ../../Common/CommonCppMakefile
 

Platform/Linux-x86/Build/Samples/NiViewer/Makefile

@@ -18,5 +18,5 @@ USED_LIBS += OpenNI
 
 EXE_NAME = NiViewer
 
-include ../../CommonCppMakefile
+include ../../Common/CommonCppMakefile
 

Platform/Linux-x86/Build/Samples/SimpleRead.java/Makefile

@@ -7,7 +7,7 @@ JAR_NAME = org.OpenNI.Samples.SimpleRead
 USED_JARS = org.OpenNI
 MAIN_CLASS = org.OpenNI.Samples.SimpleRead.SimpleRead
 
-include ../../CommonJavaMakefile
+include ../../Common/CommonJavaMakefile
 
 
 

Platform/Linux-x86/Build/Samples/SimpleRead.net/Makefile

@@ -8,4 +8,4 @@ SRC_FILES = \
 
 USED_LIBS = OpenNI.net
 
-include ../../CommonCSMakefile
+include ../../Common/CommonCSMakefile

Platform/Linux-x86/Build/Samples/SimpleViewer.java/Makefile

@@ -7,7 +7,4 @@ JAR_NAME = org.OpenNI.Samples.SimpleViewer
 USED_JARS = org.OpenNI
 MAIN_CLASS = org.OpenNI.Samples.SimpleViewer.SimpleViewerApplication
 
-include ../../CommonJavaMakefile
-
-
-
+include ../../Common/CommonJavaMakefile

Platform/Linux-x86/Build/Samples/SimpleViewer.net/Makefile

@@ -10,4 +10,4 @@ USED_LIBS = OpenNI.net
 CSFLAGS = -unsafe
 NET_WIN_FORMS = 1
 
-include ../../CommonCSMakefile
+include ../../Common/CommonCSMakefile

Platform/Linux-x86/Build/Samples/UserTracker.java/Makefile

@@ -7,7 +7,4 @@ JAR_NAME = org.OpenNI.Samples.UserTracker
 USED_JARS = org.OpenNI
 MAIN_CLASS = org.OpenNI.Samples.UserTracker.UserTrackerApplication
 
-include ../../CommonJavaMakefile
-
-
-
+include ../../Common/CommonJavaMakefile

Platform/Linux-x86/Build/Samples/UserTracker.net/Makefile

@@ -10,4 +10,4 @@ USED_LIBS = OpenNI.net
 CSFLAGS = -unsafe
 NET_WIN_FORMS = 1
 
-include ../../CommonCSMakefile
+include ../../Common/CommonCSMakefile

Platform/Linux-x86/Build/Utils/niLicense/Makefile

@@ -10,7 +10,7 @@ SRC_FILES = \
 EXE_NAME = niLicense
 USED_LIBS = OpenNI
 
-include ../../CommonCppMakefile
+include ../../Common/CommonCppMakefile
 
 
 

Platform/Linux-x86/Build/Utils/niReg/Makefile

@@ -10,7 +10,7 @@ SRC_FILES = \
 EXE_NAME = niReg
 USED_LIBS = OpenNI
 
-include ../../CommonCppMakefile
+include ../../Common/CommonCppMakefile
 
 
 

Platform/Linux-x86/Build/Wrappers/OpenNI.java/Makefile

@@ -5,7 +5,7 @@ SRC_FILES = \
 
 JAR_NAME = org.OpenNI
 
-include ../../CommonJavaMakefile
+include ../../Common/CommonJavaMakefile
 
 
 

Platform/Linux-x86/Build/Wrappers/OpenNI.jni/Makefile

@@ -10,7 +10,4 @@ SRC_FILES = \
 LIB_NAME = OpenNI.jni
 USED_LIBS = OpenNI
 
-include ../../CommonCppMakefile
-
-
-
+include ../../Common/CommonCppMakefile

Platform/Linux-x86/Build/Wrappers/OpenNI.net/Makefile

@@ -8,4 +8,4 @@ SRC_FILES = \
 
 CSFLAGS += -keyfile:OpenNI.snk
 
-include ../../CommonCSMakefile
+include ../../Common/CommonCSMakefile