From f0f731106a6cb2dd68b4a6e2687478b4f92c693e Mon Sep 17 00:00:00 2001 From: Hib Eris Date: Sat, 23 Jun 2012 18:09:01 +0200 Subject: [PATCH 3/5] Fix compile warnings on deprecated conversion from string constant to 'char*' --- poppler/FileSpec.cc | 2 +- poppler/GlobalParamsWin.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/poppler/FileSpec.cc b/poppler/FileSpec.cc index 1adcf5b..26af4cc 100644 --- a/poppler/FileSpec.cc +++ b/poppler/FileSpec.cc @@ -229,7 +229,7 @@ GBool getFileSpecNameForPlatform (Object *fileSpec, Object *fileName) if (!fileSpec->dictLookup("F", fileName)->isString ()) { fileName->free(); #ifdef _WIN32 - char *platform = "DOS"; + const char *platform = "DOS"; #else const char *platform = "Unix"; #endif diff --git a/poppler/GlobalParamsWin.cc b/poppler/GlobalParamsWin.cc index 527f08e..8bd6462 100644 --- a/poppler/GlobalParamsWin.cc +++ b/poppler/GlobalParamsWin.cc @@ -242,7 +242,7 @@ static bool FileExists(const char *path) void SysFontList::scanWindowsFonts(GooString *winFontDir) { OSVERSIONINFO version; - char *path; + const char *path; DWORD idx, valNameLen, dataLen, type; HKEY regKey; char valName[1024], data[1024]; -- 1.7.5.4