Fix the code to allow a 3rd compound mode

It is possible down the road new compound modes are added in addition to
COMPOUND_AVERAGE and COMPOUND_WEDGE.

Change-Id: I85985d4c104effd34df13845344aac2a08d28019
4 files changed