From ddfc3dcce42ad1dc805f29102f7d056a5809d489 Mon Sep 17 00:00:00 2001
From: Nicolas Pena <npm@chromium.org>
Date: Thu, 20 Apr 2017 15:29:25 -0400
Subject: Let {Argb,Cmyk}Decode return tuples
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: Ic4e766d9417f9a9ece5f9e4269d0f96e1e91639b
Reviewed-on: https://pdfium-review.googlesource.com/4392
Commit-Queue: Nicolás Peña <npm@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
---
 core/fxge/win32/fx_win32_gdipext.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'core/fxge/win32/fx_win32_gdipext.cpp')

diff --git a/core/fxge/win32/fx_win32_gdipext.cpp b/core/fxge/win32/fx_win32_gdipext.cpp
index 6a3527f393..87172ffff8 100644
--- a/core/fxge/win32/fx_win32_gdipext.cpp
+++ b/core/fxge/win32/fx_win32_gdipext.cpp
@@ -575,8 +575,11 @@ static void OutputImageMask(GpGraphics* pGraphics,
                                         (image_clip.Width() + 3) / 4 * 4,
                                         PixelFormat8bppIndexed,
                                         pStretched->GetBuffer(), &bitmap);
-    int a, r, g, b;
-    ArgbDecode(argb, a, r, g, b);
+    int a;
+    int r;
+    int g;
+    int b;
+    std::tie(a, r, g, b) = ArgbDecode(argb);
     UINT pal[258];
     pal[0] = 0;
     pal[1] = 256;
-- 
cgit v1.2.3