Synchrotron x-ray scattering study of charge-density-wave order in HgBa2CuO4+