Weka Segmentation: fixed bug that was making the Rand calculations crashed whenever the number of objects was larger than 2^15 (the "short" pixels in ImageJ are signed and needed to be converted).
Merge branch 'trainable-seg-gui'
Merge branch 'master' of fiji.sc:/srv/git/fiji
Weka Segmentation: facilitate use of more than 5 classes in the GUI.
Weka Segmentation: add random colors to traces when the number of classes is larger than 5 (current maximum).
Weka Segmentation: change way to treat trace colors when the number of classes is larger than 5 (use golden angle).
StartupMacros: discover and run macros in macros/AutoRun/

The biggest shortcoming of the StartupMacros mechanism (which
it shares with the macro interpreter's Ext.* mechanism as well as
with the HandleExtraFileTypes class) is that there can be only one
file. There is no easy way that you can augment it locally.

Instead of forcing users to have their own, locally-modified
StartupMacros file that will be forever stale, change our StartupMacros
so that it discovers all macros stored as .ijm files in macros/AutoRun/
and runs them, in alphabetical order (for consistency).

Users who need to install macros upon startup (e.g. for keyboard
shortcuts) can always call

	run("Install...", "install=[" + getDirectory("imagej")
		+ "/macros/my-shortcuts.ijm]");

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Merge remote-tracking branch 'github/master'
Prepare fiji-scripting for ImageJ 1.47n

ImageJ 1.47n brings its own scripting support for Jython and Beanshell.
As it is inconsistent with the other scripting languages supported by
Fiji, we need to override it.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Move JNI Example files in preparation for Mavenization

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Add a pom.xml file for the JNI_Example project

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Ignore Maven products in the JNI_Example

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Fix compiler warnings identified in JNI_Example.c

These warnings are only now apparent due to NAR's default options.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
JNI_Example: use the JNI library name generated by NAR to load it

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Re-add FFMPEG plugin file that was removed by mistake

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Update the Analyze Reader/Writer to the current version

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Merge branch 'master' of fiji.sc:/srv/git/fiji
Merge branch 'trainable-seg-gui'
Weka Segmentation: fixed bug in the default class names.
TrackMate_: fix a bug when selecting edges in the 3D viewer

Signed-off-by: Jean-Yves Tinevez <jean-yves.tinevez@pasteur.fr>