poppler/PDFDoc.cc | 5 +++-- qt4/src/poppler-annotation.h | 7 ++++--- 2 files changed, 7 insertions(+), 5 deletions(-)
New commits: commit ebb580d756a8321de87814f05ab572564732c15e Author: Philip Lorenz <[email protected]> Date: Sun Dec 19 14:08:31 2010 +0000 Windows fixes diff --git a/poppler/PDFDoc.cc b/poppler/PDFDoc.cc index 687b2ae..089f38c 100644 --- a/poppler/PDFDoc.cc +++ b/poppler/PDFDoc.cc @@ -25,6 +25,7 @@ // Copyright (C) 2010 Jakub Wilk <[email protected]> // Copyright (C) 2010 Ilya Gorenbein <[email protected]> // Copyright (C) 2010 Srinivas Adicherla <[email protected]> +// Copyright (C) 2010 Philip Lorenz <[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 @@ -123,7 +124,7 @@ PDFDoc::PDFDoc(GooString *fileNameA, GooString *ownerPassword, fileName = fileNameA; guiData = guiDataA; - struct stat buf; + struct _stat buf; if (stat(fileName->getCString(), &buf) == 0) { size = buf.st_size; } @@ -188,7 +189,7 @@ PDFDoc::PDFDoc(wchar_t *fileNameA, int fileNameLen, GooString *ownerPassword, } file = _wfopen(fileName2, L"rb"); } else { - if (_wstat(fileName->getCString(), &buf) == 0) { + if (_stat(fileName->getCString(), &buf) == 0) { size = buf.st_size; } file = fopen(fileName->getCString(), "rb"); commit 88a4154420e016d93c5ce05b5b8e09b6bddcadc9 Author: Philip Lorenz <[email protected]> Date: Sun Dec 19 13:03:01 2010 +0000 build on newer MSVC diff --git a/qt4/src/poppler-annotation.h b/qt4/src/poppler-annotation.h index ab54c6f..ae90d71 100644 --- a/qt4/src/poppler-annotation.h +++ b/qt4/src/poppler-annotation.h @@ -2,6 +2,7 @@ * Copyright (C) 2006-2008, Albert Astals Cid <[email protected]> * Copyright (C) 2006, 2008 Pino Toscano <[email protected]> * Copyright (C) 2007, Brad Hards <[email protected]> + * Copyright (C) 2010, Philip Lorenz <[email protected]> * Adapting code from * Copyright (C) 2004 by Enrico Ros <[email protected]> * @@ -140,7 +141,7 @@ class POPPLER_QT4_EXPORT Annotation QRectF boundary() const; void setBoundary( const QRectF &boundary ); - struct Style + struct POPPLER_QT4_EXPORT Style { // appearance properties QColor color; // black @@ -160,7 +161,7 @@ class POPPLER_QT4_EXPORT Annotation } style; /* properties: popup window */ - struct Window + struct POPPLER_QT4_EXPORT Window { // window state (Hidden, FixedRotation, Deny* flags allowed) int flags; // -1 (never initialized) -> 0 (if inited and shown) @@ -177,7 +178,7 @@ class POPPLER_QT4_EXPORT Annotation } window; /* properties: versioning */ - struct Revision + struct POPPLER_QT4_EXPORT Revision { // child revision Annotation * annotation; // not null _______________________________________________ poppler mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/poppler
