[XeTeX] Wrong dimensions when using \XeTeXpicfile with CMYKimage

[Akira Kakuto]

Dear Marcel,

> Thanks for the patch. I can confirm it works as expected.
>
> However, when not specifying width nor height nor [x|y]scaled I think
> the internal size (i.e., DPI setting) should be used.

I have confirmed that xelatex and pdflatex
give the same results for both of test1.tex
and test2.tex below.
Thus I assume that my changes in XeTeX are correct.

Thanks,
Akira

%
% test1.tex
% xelatex test1
% or
% pdflatex test1
%
\documentclass{article}
\usepackage{graphicx}
\begin{document}
\includegraphics[width=8cm]{test-cmyk300.jpg}

\includegraphics[width=8cm]{test-cmyk72.jpg}

\includegraphics[width=8cm]{test-rgb300.jpg}
\end{document}


%
% test2.tex
% xelatex test2
% or
% pdflatex test2
%
\documentclass{article}
\usepackage{graphicx}
\begin{document}
\includegraphics{test-cmyk300.jpg}

\includegraphics{test-cmyk72.jpg}

\includegraphics{test-rgb300.jpg}
\end{document}