diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/oberdiek/bmpsize.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/oberdiek/bmpsize.sty | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/Master/texmf-dist/tex/latex/oberdiek/bmpsize.sty b/Master/texmf-dist/tex/latex/oberdiek/bmpsize.sty index bc7be80416f..24140816d40 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/bmpsize.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/bmpsize.sty @@ -29,24 +29,33 @@ %% bmpsize-dvipdfm.def, bmpsize-dvipdfmx.def. %% \ProvidesPackage{bmpsize}% - [2007/05/01 v1.3 Extract size and resolution data from bitmap files (HO)]% + [2007/11/11 v1.4 Extract size and resolution data from bitmap files (HO)]% \RequirePackage{ifpdf} \ifpdf \PackageInfo{bmpsize}{Superseded by pdfTeX in PDF mode}% \expandafter\endinput \fi +\RequirePackage{pdftexcmds}[2007/11/11] \begingroup\expandafter\expandafter\expandafter\endgroup -\expandafter\ifx\csname pdffiledump\endcsname\relax +\expandafter\ifx\csname pdf@filedump\endcsname\relax \PackageError{bmpsize}{% You need pdfTeX 1.30.0 or newer% }{Package loading is aborted.}% \expandafter\endinput \fi +\RequirePackage{infwarerr}[2007/09/09] \RequirePackage{graphics} -\RequirePackage{keyval} +\RequirePackage{keyval}\relax +\expandafter\ifx\csname KV@errx\endcsname\relax + \def\KV@errx#1{% + \@PackageError{keyval}{#1}\@ehc + }% +\fi +\expandafter\ifx\csname KV@err\endcsname\relax + \let\KV@err\KV@errx +\fi \RequirePackage{bmpsize-base} -\RequirePackage{infwarerr} \InputIfFileExists{bmpsize-\Gin@driver}{}{} @@ -72,18 +81,18 @@ \x{ } \def\@bmpsize@read@resolution#1#2 #3 #4\@nil{% \ifcase 0\ifx\\#2\\1\fi - \ifnum\pdfstrcmp{#2}{\Gin@exclamation}=\z@ + \ifnum\pdf@strcmp{#2}{\Gin@exclamation}=\z@ \ifx\\#3\\1\fi - \ifnum\pdfstrcmp{#3}{\Gin@exclamation}=\z@ + \ifnum\pdf@strcmp{#3}{\Gin@exclamation}=\z@ 1% \fi \fi - \ifcase\pdfstrcmp{#2}{\Gin@exclamation}\relax + \ifcase\pdf@strcmp{#2}{\Gin@exclamation}\relax \let\bmpsize@pixelx@default\Gin@exclamation \else \edef\bmpsize@pixelx@default{#2}% \fi - \ifcase\pdfstrcmp{#3}{\Gin@exclamation}\relax + \ifcase\pdf@strcmp{#3}{\Gin@exclamation}\relax \let\bmpsize@pixely@default\Gin@exclamation \else \ifx\\#3\\% @@ -105,7 +114,7 @@ \let\@bmpsize@org@setfile\Gin@setfile \def\Gin@setfile#1#2#3{% - \ifcase\pdfstrcmp{#1}{bmp}\relax + \ifcase\pdf@strcmp{#1}{bmp}\relax \expandafter\@firstofone \else \expandafter\@gobble |