pgf 3.0.0

git-svn-id: svn://tug.org/texlive/trunk@33057 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 11 insertions, 10 deletions

diff --git a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcoreimage.code.tex b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcoreimage.code.tex
index 59a3699f70d..1f2d6ea5d17 100644
--- a/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcoreimage.code.tex
+++ b/Master/texmf-dist/tex/generic/pgf/basiclayer/pgfcoreimage.code.tex
@@ -7,7 +7,7 @@
 %
 % See the file doc/generic/pgf/licenses/LICENSE for more details.
 
-\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/basiclayer/pgfcoreimage.code.tex,v 1.16 2010/03/25 20:57:13 ludewich Exp $
+\ProvidesFileRCS $Header: /cvsroot/pgf/pgf/generic/pgf/basiclayer/pgfcoreimage.code.tex,v 1.18 2013/07/15 15:41:24 tantau Exp $
 
 
 
@@ -44,8 +44,8 @@
     \pgfkeys{/pgf/images/page=}% make page empty     
   \fi%
   \ifx\pgf@filename\pgfutil@empty%
-    \PackageWarning{pgf}%
-    {File "#3" not found when defining image "#2".\MessageBreak
+    \pgfwarning%
+    {File "#3" not found when defining image "#2".
       Tried all extensions in "\pgfsys@imagesuffixlist"}%
     \pgf@declaredraftimage{#2}{#3}%
   \else%
@@ -66,13 +66,14 @@
 \pgfkeys{/pgf/images/height/.estore in=\pgf@imageheight}
 \pgfkeys{/pgf/images/page/.estore in=\pgf@imagepage}
 \pgfkeys{/pgf/images/interpolate/.cd,.code=\edef\pgf@imageinterpolate{#1},.default=true}
+\let\pgf@imageinterpolate\pgfutil@empty
 \pgfkeys{/pgf/images/mask/.code=%
   {%
     \edef\pgf@imagemask{#1}%
     \ifx\pgf@imagemask\pgfutil@empty%
     \else%
       \pgfutil@ifundefined{pgf@mask@#1}%
-      {\PackageError{pgf}{Undefined mask "#1".}{}%
+      {\pgferror{Undefined mask "#1".}%
         \edef\pgf@imagemask{}}%
       {\edef\pgf@imagemask{\csname pgf@mask@#1\endcsname}%
       }%
@@ -92,11 +93,11 @@
 % #2: file name
 \def\pgf@declaredraftimage#1#2{%
   \ifx\pgf@imagewidth\pgfutil@empty%
-    \PackageWarning{pgf}{Missing width for image "#1" ("#2") in draft mode.\MessageBreak  Using 1cm instead}%
+    \pgfwarning{Missing width for image "#1" ("#2") in draft mode. Using 1cm instead}%
     \edef\pgf@imagewidth{1cm}%
   \fi%
   \ifx\pgf@imageheight\pgfutil@empty%
-    \PackageWarning{pgf}{Missing height for image "#1" ("#2") in draft mode.\MessageBreak Using 1cm instead}%
+    \pgfwarning{Missing height for image "#1" ("#2") in draft mode. Using 1cm instead}%
     \edef\pgf@imageheight{1cm}%
   \fi%  
   \ifx\pgf@imagepage\pgfutil@empty\else\edef\pgf@imagepagetext{ page \pgf@imagepage}\fi%
@@ -105,7 +106,7 @@
       \vrule\kern-0.4pt%
       \vbox to \pgf@imageheight{%
         \hrule\vfil%
-        \hbox to \pgf@imagewidth{\hskip-10cm\hfil\noexpand\tiny#2\pgf@imagepage\hfil\hskip-10cm}%
+        \hbox to \pgf@imagewidth{\hskip-10cm\hfil\noexpand\pgfutil@font@tiny#2\pgf@imagepage\hfil\hskip-10cm}%
         \vfil\hrule}%
       \kern-0.4pt\vrule}%
   }%
@@ -141,8 +142,8 @@
   \gdef\pgf@filename{}%
   \expandafter\pgf@findfile\pgfsys@imagesuffixlist:+{#3}%
   \ifx\pgf@filename\pgfutil@empty%
-    \PackageWarning{pgf}%
-    {File "#3" not found when defining mask "#2".\MessageBreak
+    \pgfwarning%
+    {File "#3" not found when defining mask "#2".
       Tried all extensions in "\pgfsys@imagesuffixlist"}%
   \else%
     \pgfsys@definemask{#2}%
@@ -183,7 +184,7 @@
   \def\pgf@imagename{pgf@image@#1}%
   \pgf@tryextensions{\pgf@imagename}{\pgfalternateextension}%
   \expandafter\pgfutil@ifundefined\expandafter{\pgf@imagename}%
-  {\PackageError{pgf}{Undefined image "#1"}{}}%
+  {\pgferror{Undefined image "#1"}}%
   {{\leavevmode\csname\pgf@imagename\endcsname}}}
 
 \def\pgf@tryextensions#1#2{%