fixed rect convert metric to conform to both s/w and h/w pipelines. fixe...

...d some indentation