cpp/poppler-global.h | 9 +++++++++ goo/gtypes.h | 18 ++++++++++++++++++ poppler/GlobalParams.cc | 5 +++-- poppler/SplashOutputDev.cc | 6 ++++++ 4 files changed, 36 insertions(+), 2 deletions(-)
New commits: commit c96aa0f5fc74ae04f483485b787aaf65f1791991 Author: Pino Toscano <[email protected]> Date: Sun Mar 7 02:01:13 2010 +0100 add Patrick's copyright notices diff --git a/cpp/poppler-global.h b/cpp/poppler-global.h index 19af9ec..9010af1 100644 --- a/cpp/poppler-global.h +++ b/cpp/poppler-global.h @@ -1,5 +1,6 @@ /* * Copyright (C) 2009-2010, Pino Toscano <[email protected]> + * Copyright (C) 2010, Patrick Spendrin <[email protected]> * * 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 diff --git a/goo/gtypes.h b/goo/gtypes.h index e9dcb93..a6887ad 100644 --- a/goo/gtypes.h +++ b/goo/gtypes.h @@ -6,6 +6,20 @@ * Copyright 1996-2003 Glyph & Cog, LLC */ +//======================================================================== +// +// Modified under the Poppler project - http://poppler.freedesktop.org +// +// All changes made under the Poppler project to this file are licensed +// under GPL version 2 or later +// +// Copyright (C) 2010 Patrick Spendrin <[email protected]> +// +// To see a description of the changes please see the Changelog file that +// came with your tarball or type make ChangeLog if you are building from git +// +//======================================================================== + #ifndef GTYPES_H #define GTYPES_H diff --git a/poppler/GlobalParams.cc b/poppler/GlobalParams.cc index 8f8e297..09a1b20 100644 --- a/poppler/GlobalParams.cc +++ b/poppler/GlobalParams.cc @@ -23,6 +23,7 @@ // Copyright (C) 2009 William Bader <[email protected]> // Copyright (C) 2009 Kovid Goyal <[email protected]> // Copyright (C) 2010 Hib Eris <[email protected]> +// Copyright (C) 2010 Patrick Spendrin <[email protected]> // // To see a description of the changes please see the Changelog file that // came with your tarball or type make ChangeLog if you are building from git diff --git a/poppler/SplashOutputDev.cc b/poppler/SplashOutputDev.cc index 7593b5b..ab0722a 100644 --- a/poppler/SplashOutputDev.cc +++ b/poppler/SplashOutputDev.cc @@ -23,6 +23,7 @@ // Copyright (C) 2009 Thomas Freitag <[email protected]> // Copyright (C) 2009 Carlos Garcia Campos <[email protected]> // Copyright (C) 2009 William Bader <[email protected]> +// Copyright (C) 2010 Patrick Spendrin <[email protected]> // // To see a description of the changes please see the Changelog file that // came with your tarball or type make ChangeLog if you are building from git commit 3311bedd2eb831ef1fd553f3f50960331cf6885f Author: Patrick Spendrin <[email protected]> Date: Sun Mar 7 01:56:15 2010 +0100 MSVC: disable for the 'ustring' class the warning C4251 (which does not apply) diff --git a/cpp/poppler-global.h b/cpp/poppler-global.h index 77fe3b4..19af9ec 100644 --- a/cpp/poppler-global.h +++ b/cpp/poppler-global.h @@ -71,6 +71,11 @@ enum case_sensitivity_enum { case_sensitive, case_insensitive }; typedef std::vector<char> byte_array; +// to disable warning only for this occurrence +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable: 4251) /* class 'A' needs to have dll interface for to be used by clients of class 'B'. */ +#endif class POPPLER_CPP_EXPORT ustring : public std::basic_string<unsigned short> { public: @@ -90,6 +95,9 @@ private: operator std::string() const; ustring& operator=(const std::string &); }; +#ifdef _MSC_VER +#pragma warning(pop) +#endif POPPLER_CPP_EXPORT unsigned int /*time_t*/ convert_date(const std::string &date); commit 9efa18397bd05fbd27c7811fa6e0f34ce94012e0 Author: Patrick Spendrin <[email protected]> Date: Sun Mar 7 01:48:03 2010 +0100 MSVC: disable warning C4800, which is of no use for now diff --git a/goo/gtypes.h b/goo/gtypes.h index 9f64f57..e9dcb93 100644 --- a/goo/gtypes.h +++ b/goo/gtypes.h @@ -17,6 +17,10 @@ typedef int GBool; #define gTrue 1 #define gFalse 0 +#ifdef _MSC_VER +#pragma warning(disable: 4800) /* 'type' : forcing value to bool 'true' or 'false' (performance warning) */ +#endif + /* * These have stupid names to avoid conflicts with <sys/types.h>, * which on various systems defines some random subset of these. commit 3a88d1bf8d2c5a9e8014e0d46e24c9ec06556469 Author: Patrick Spendrin <[email protected]> Date: Sun Mar 7 01:26:10 2010 +0100 MSVC: no isfinite(), so provide it using _finite() diff --git a/poppler/SplashOutputDev.cc b/poppler/SplashOutputDev.cc index a26cd09..7593b5b 100644 --- a/poppler/SplashOutputDev.cc +++ b/poppler/SplashOutputDev.cc @@ -66,6 +66,11 @@ extern "C" int unlink(char *filename); #endif #endif +#ifdef _MSC_VER +#include <float.h> +#define isfinite(x) _finite(x) +#endif + //------------------------------------------------------------------------ // Divide a 16-bit value (in [0, 255*255]) by 255, returning an 8-bit result. commit 7774912c46f832f25c51b4cfc0e9430b1cd7fa1f Author: Patrick Spendrin <[email protected]> Date: Sun Mar 7 01:22:31 2010 +0100 MSVC: do not force constness here, so the right overload will be chosen diff --git a/poppler/GlobalParams.cc b/poppler/GlobalParams.cc index 4e84573..8f8e297 100644 --- a/poppler/GlobalParams.cc +++ b/poppler/GlobalParams.cc @@ -179,9 +179,9 @@ get_poppler_datadir (void) if (!GetModuleFileName (hmodule, (CHAR *) retval, sizeof(retval) - 20)) return POPPLER_DATADIR; - p = _mbsrchr ((const unsigned char *) retval, '\\'); + p = _mbsrchr ((unsigned char *) retval, '\\'); *p = '\0'; - p = _mbsrchr ((const unsigned char *) retval, '\\'); + p = _mbsrchr ((unsigned char *) retval, '\\'); if (p) { if (stricmp ((const char *) (p+1), "bin") == 0) *p = '\0'; _______________________________________________ poppler mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/poppler
