I had a similar challenge some time back. The photo was convex to fit the glass. I had a photographer take bracketed RAW shots of the photo. He used two lights set up like a copy stand and used a high aperture to make sure the entire image was in focus. I did not see any distortion caused by the shape of the image when I put it into
PS; but that may be because of the characteristics of the photo. I didn't have to use any free transform, warp or any other distortion correcting tool.