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 03077f9..d7aa07f 100644
--- a/qt5/src/poppler-document.cc
+++ b/qt5/src/poppler-document.cc
@@ -11,6 +11,7 @@
* Copyright (C) 2015 William Bader <williambader@hotmail.com>
* Copyright (C) 2016 Jakub Alba <jakubalba@gmail.com>
* Copyright (C) 2017 Adrian Johnson <ajohnson@redneon.com>
+ * Copyright (C) 2017 Suzuki Toshiya <mpsuzuki@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 7a5ef98..6c24d7b 100644
--- a/utils/pdftocairo.cc
+++ b/utils/pdftocairo.cc
@@ -27,7 +27,7 @@
// Copyright (C) 2011, 2015 Carlos Garcia Campos <carlosgc@gnome.org>
// Copyright (C) 2012 Koji Otani <sho@bbr.jp>
// Copyright (C) 2013 Lu Wang <coolwanglu@gmail.com>
-// Copyright (C) 2013 Suzuki Toshiya <mpsuzuki@hiroshima-u.ac.jp>
+// Copyright (C) 2013, 2017 Suzuki Toshiya <mpsuzuki@hiroshima-u.ac.jp>
// Copyright (C) 2014 Rodrigo Rivas Costa <rodrigorivascosta@gmail.com>
// Copyright (C) 2016 Jason Crain <jason@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>