Fix: macro combination of SGPM and Intra Fusion

Both JVET_AB0157_INTRA_FUSION and JVET_AB0155_SGPM added arguments to initIntraPatternChType(). This MR fixed the argument lists when the 2 macros are combined in different ways.