Canonical heights on genus-2 Jacobians