-
Michael Natterer authored
The functions don't need to know about sample_merged, in fact they used the boolean only to either use the passed image or drawable and otherwise ran the same code. The sample_merged logic belongs into their callers (and sometimes not even there).
0349b897