PD: I hate excuses... curiously the main aim of this improvement was headless ScatterDraw... however I forgot to test ScatterDraw_Demo after fixing ScatterDraw.h after the file was crashed and it had to be recovered from an old backup...
By the way, ScatterDraw and ScatterCtrl pass the gcc -pedantic compiling option.