[poppler] poppler/PDFDoc.h poppler/XRef.h

[Albert Astals Cid]

 poppler/PDFDoc.h |    2 +-
 poppler/XRef.h   |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 40efa72987ebf62cbf2c761c10a209e2e6be612e
Author: Fabio D'Urso <fabiodurso at hotmail.it>
Date:   Sun Nov 4 11:20:29 2012 +0100

    Replaced forward declaration of enum CryptAlgorithm with a proper #include
    
    Forward-declaring enums is illegal. It hasn't caused problems so far
    because XRef.h includes Object.h, which in turn includes Stream.h, where
    the enum is defined.
    Therefore, enum is alreadly defined when the compiler reaches that line.
    
    To avoid future issues, I've replaced it with a proper #include "Stream.h"
    (which expands to nothing as Stream.h has already been included at that
    point).
    
    I've also added a #include in XRef.h because it references enum
    CryptAlgorithm too. Also in this case, it expands to nothing.

diff --git a/poppler/PDFDoc.h b/poppler/PDFDoc.h
index 328b0c7..f3e9f68 100644
--- a/poppler/PDFDoc.h
+++ b/poppler/PDFDoc.h
@@ -43,10 +43,10 @@
 #include "Page.h"
 #include "Annot.h"
 #include "OptionalContent.h"
+#include "Stream.h"
 
 class GooString;
 class BaseStream;
-enum CryptAlgorithm;
 class OutputDev;
 class Links;
 class LinkAction;
diff --git a/poppler/XRef.h b/poppler/XRef.h
index 2defc6c..9af4a13 100644
--- a/poppler/XRef.h
+++ b/poppler/XRef.h
@@ -36,6 +36,7 @@
 
 #include "goo/gtypes.h"
 #include "Object.h"
+#include "Stream.h"
 
 #include <vector>