[latex3-commits] [git/LaTeX3-latex3-latex3] main: Correct init. code for ICCbased spaces (6891d9f59)

[Joseph Wright]

Repository : https://github.com/latex3/latex3
On branch  : main
Link       : https://github.com/latex3/latex3/commit/6891d9f596d18dea303e46570c34f9bd3b0086f8

>---------------------------------------------------------------

commit 6891d9f596d18dea303e46570c34f9bd3b0086f8
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Mon Feb 22 15:25:30 2021 +0000

    Correct init. code for ICCbased spaces


>---------------------------------------------------------------

6891d9f596d18dea303e46570c34f9bd3b0086f8
 l3backend/l3backend-color.dtx | 14 +++++++++-----
 l3kernel/l3color.dtx          |  4 ++--
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/l3backend/l3backend-color.dtx b/l3backend/l3backend-color.dtx
index 92fe5a1c9..0bab610c0 100644
--- a/l3backend/l3backend-color.dtx
+++ b/l3backend/l3backend-color.dtx
@@ -1001,11 +1001,11 @@
 % \end{macro}
 % \end{macro}
 %
-% \begin{macro}{\@@_backend_iccbased_init:nnn}
+% \begin{macro}{\@@_backend_iccbased_init:nn}
 %  Lots of data to save here: we only want to do that once per file,
 %  so track it by name.
 %    \begin{macrocode}
-\cs_new_protected:Npn \@@_backend_iccbased_init:nnn #1#2#3
+\cs_new_protected:Npn \@@_backend_iccbased_init:nn #1#2
   {
     \pdf_object_if_exist:nF { @@_icc_ #1 }
       {
@@ -1017,11 +1017,15 @@
           }
       }
     \pdf_object_unnamed_write:nx { array }
-      { /ICCBased~ \pdf_object_ref:n { @@_icc_ #1 } }
+      { /ICCBased ~ \pdf_object_ref:n { @@_icc_ #1 } }
     \cs_if_exist:NT \pdfmanagement_add:nnn
       {
-        \pdfmanagement_add:nnx { Page / Resources / ColorSpace }
-          {#3} { ~ \pdf_object_ref_last: }
+        \use:x
+          {
+            \pdfmanagement_add:nnn { Page / Resources / ColorSpace }
+              { color \int_use:N \g_@@_model_int }
+              { ~ \pdf_object_ref_last: }
+          }
       }
   }
 %    \end{macrocode}
diff --git a/l3kernel/l3color.dtx b/l3kernel/l3color.dtx
index d52f18518..c0839842b 100644
--- a/l3kernel/l3color.dtx
+++ b/l3kernel/l3color.dtx
@@ -2576,8 +2576,8 @@
   {
     \@@_model_init:nnn {#2} {#1} { iccbased }
     \use:c { @@_model_devicen_parse_ #1 :nn } {#2} {#1}
-    \exp_args:Nx \@@_backend_devicen_init:nnn
-      { \file_full_name:n {#3} } {#1} {#2}
+    \exp_args:Nx \@@_backend_iccbased_init:nn
+      { \file_full_name:n {#3} } {#1}
   }
 %    \end{macrocode}
 % \end{macro}