Evaluate type 1 charstrings for conversion to type 2.
CFF parser didn't count hints defined by hstem/vstem
Merge pull request #2527 from brendandahl/type1-charstrings

Evaluate type 1 charstrings for conversion to type 2.
Merge pull request #2615 from vyv03354/master

Fixes CFF parser failure when CharStrings contains cntrmask