Bugfixes

This fixes the following bugs:
- calibrateCamera2 pointCount was in a wrong (transposed) format for OpenCV 2.4.5
- haddock generation halted due to a commented-out guard line