RFCT Use a C++ function instead of a macro
BUG Fix SLIC superpixel connectivity

The previous method was still not enough.
RFCT Turn repeated expression into a function