[poppler] 2 commits - qt5/src utils/pdftocairo.cc

[Albert Astals Cid]

 qt5/src/poppler-document.cc |    5 +----
 utils/pdftocairo.cc         |   15 ++-------------
 2 files changed, 3 insertions(+), 17 deletions(-)

New commits:
commit 81461f4cddf6b8705e6cf24d20084fc71891bb91
Author: Albert Astals Cid <aacid at kde.org>
Date:   Sat Dec 23 11:20:43 2017 +0100

    Remove another LCMS1 old ifdef

diff --git a/utils/pdftocairo.cc b/utils/pdftocairo.cc
index 6c24d7b2..15a80133 100644
--- a/utils/pdftocairo.cc
+++ b/utils/pdftocairo.cc
@@ -18,7 +18,7 @@
 // Copyright (C) 2009 Michael K. Johnson <a1237 at danlj.org>
 // Copyright (C) 2009 Shen Liang <shenzhuxi at gmail.com>
 // Copyright (C) 2009 Stefan Thomas <thomas at eload24.com>
-// Copyright (C) 2009, 2010 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2009, 2010, 2017 Albert Astals Cid <aacid at kde.org>
 // Copyright (C) 2010, 2011-2017 Adrian Johnson <ajohnson at redneon.com>
 // Copyright (C) 2010, 2014 Hib Eris <hib at hiberis.nl>
 // Copyright (C) 2010 Jonathan Liu <net147 at gmail.com>
@@ -395,12 +395,6 @@ static void writePageImage(GooString *filename)
       writer = new PNGWriter(PNGWriter::RGB);
 
 #ifdef USE_CMS
-#ifdef USE_LCMS1
-    if (icc_data)
-      static_cast<PNGWriter*>(writer)->setICCProfile(cmsTakeProductName(profile), icc_data, icc_data_size);
-    else
-      static_cast<PNGWriter*>(writer)->setSRGBProfile();
-#else
     if (icc_data) {
       cmsUInt8Number profileID[17];
       profileID[16] = '\0';
@@ -412,7 +406,6 @@ static void writePageImage(GooString *filename)
     }
 #endif
 #endif
-#endif
 
   } else if (jpeg) {
 #ifdef ENABLE_LIBJPEG
commit 2556ec0705373a01feffe3ca0cd7147af2fdd2c9
Author: suzuki toshiya <mpsuzuki at hiroshima-u.ac.jp>
Date:   Sat Dec 23 11:19:17 2017 +0100

    Remove libcms1 crumbs from pdftocairo and qt5 frontend
    
    Bug #104358

diff --git a/qt5/src/poppler-document.cc b/qt5/src/poppler-document.cc
index 03077f99..d7aa07f0 100644
--- a/qt5/src/poppler-document.cc
+++ b/qt5/src/poppler-document.cc
@@ -11,6 +11,7 @@
  * Copyright (C) 2015 William Bader <williambader at hotmail.com>
  * Copyright (C) 2016 Jakub Alba <jakubalba at gmail.com>
  * Copyright (C) 2017 Adrian Johnson <ajohnson at redneon.com>
+ * Copyright (C) 2017 Suzuki Toshiya <mpsuzuki at hiroshima-u.ac.jp>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -48,12 +49,8 @@
 #include "poppler-page-private.h"
 
 #if defined(USE_CMS)
-#if defined(USE_LCMS1)
-#include <lcms.h>
-#else
 #include <lcms2.h>
 #endif
-#endif
 
 namespace Poppler {
 
diff --git a/utils/pdftocairo.cc b/utils/pdftocairo.cc
index 7a5ef981..6c24d7b2 100644
--- a/utils/pdftocairo.cc
+++ b/utils/pdftocairo.cc
@@ -27,7 +27,7 @@
 // Copyright (C) 2011, 2015 Carlos Garcia Campos <carlosgc at gnome.org>
 // Copyright (C) 2012 Koji Otani <sho at bbr.jp>
 // Copyright (C) 2013 Lu Wang <coolwanglu at gmail.com>
-// Copyright (C) 2013 Suzuki Toshiya <mpsuzuki at hiroshima-u.ac.jp>
+// Copyright (C) 2013, 2017 Suzuki Toshiya <mpsuzuki at hiroshima-u.ac.jp>
 // Copyright (C) 2014 Rodrigo Rivas Costa <rodrigorivascosta at gmail.com>
 // Copyright (C) 2016 Jason Crain <jason at aquaticape.us>
 //
@@ -57,12 +57,8 @@
 #include "CairoOutputDev.h"
 #include "Win32Console.h"
 #ifdef USE_CMS
-#ifdef USE_LCMS1
-#include <lcms.h>
-#else
 #include <lcms2.h>
 #endif
-#endif
 #include <cairo.h>
 #ifdef CAIRO_HAS_PS_SURFACE
 #include <cairo-ps.h>