DLL.hh -> DLL.h, move public enumerated types into Constants.h and use them both for C and C++ interfaces

git-svn-id: svn+q:///qpdf/trunk@828 71b93d88-0707-0410-a8cf-f5a4172ac649

7 files changed, 41 insertions, 88 deletions

diff --git a/libqpdf/QPDFWriter.cc b/libqpdf/QPDFWriter.cc
index 320706b0..7a1caa46 100644
--- a/libqpdf/QPDFWriter.cc
+++ b/libqpdf/QPDFWriter.cc
@@ -29,7 +29,7 @@ QPDFWriter::QPDFWriter(QPDF& pdf, char const* filename) :
     normalize_content_set(false),
     normalize_content(false),
     stream_data_mode_set(false),
-    stream_data_mode(s_compress),
+    stream_data_mode(qpdf_s_compress),
     qdf_mode(false),
     static_id(false),
     suppress_original_object_ids(false),
@@ -37,7 +37,7 @@ QPDFWriter::QPDFWriter(QPDF& pdf, char const* filename) :
     encrypted(false),
     preserve_encryption(true),
     linearized(false),
-    object_stream_mode(o_preserve),
+    object_stream_mode(qpdf_o_preserve),
     encrypt_metadata(true),
     encrypt_use_aes(false),
     encryption_dict_objid(0),
@@ -77,13 +77,13 @@ QPDFWriter::~QPDFWriter()
 }
 
 void
-QPDFWriter::setObjectStreamMode(object_stream_e mode)
+QPDFWriter::setObjectStreamMode(qpdf_object_stream_e mode)
 {
     this->object_stream_mode = mode;
 }
 
 void
-QPDFWriter::setStreamDataMode(stream_data_e mode)
+QPDFWriter::setStreamDataMode(qpdf_stream_data_e mode)
 {
     this->stream_data_mode_set = true;
     this->stream_data_mode = mode;
@@ -198,7 +198,7 @@ void
 QPDFWriter::setR3EncryptionParameters(
     char const* user_password, char const* owner_password,
     bool allow_accessibility, bool allow_extract,
-    r3_print_e print, r3_modify_e modify)
+    qpdf_r3_print_e print, qpdf_r3_modify_e modify)
 {
     std::set<int> clear;
     interpretR3EncryptionParameters(
@@ -212,7 +212,7 @@ void
 QPDFWriter::setR4EncryptionParameters(
     char const* user_password, char const* owner_password,
     bool allow_accessibility, bool allow_extract,
-    r3_print_e print, r3_modify_e modify,
+    qpdf_r3_print_e print, qpdf_r3_modify_e modify,
     bool encrypt_metadata, bool use_aes)
 {
     std::set<int> clear;
@@ -230,7 +230,7 @@ QPDFWriter::interpretR3EncryptionParameters(
     std::set<int>& clear,
     char const* user_password, char const* owner_password,
     bool allow_accessibility, bool allow_extract,
-    r3_print_e print, r3_modify_e modify)
+    qpdf_r3_print_e print, qpdf_r3_modify_e modify)
 {
     // Acrobat 5 security options:
 
@@ -263,13 +263,13 @@ QPDFWriter::interpretR3EncryptionParameters(
     // statements).  Each option clears successively more access bits.
     switch (print)
     {
-      case r3p_none:
+      case qpdf_r3p_none:
 	clear.insert(3);	// any printing
 
-      case r3p_low:
+      case qpdf_r3p_low:
 	clear.insert(12);	// high resolution printing
 
-      case r3p_full:
+      case qpdf_r3p_full:
 	break;
 
 	// no default so gcc warns for missing cases
@@ -277,19 +277,19 @@ QPDFWriter::interpretR3EncryptionParameters(
 
     switch (modify)
     {
-      case r3m_none:
+      case qpdf_r3m_none:
 	clear.insert(11);	// document assembly
 
-      case r3m_assembly:
+      case qpdf_r3m_assembly:
 	clear.insert(9);	// filling in form fields
 
-      case r3m_form:
+      case qpdf_r3m_form:
 	clear.insert(6);	// modify annotations, fill in form fields
 
-      case r3m_annotate:
+      case qpdf_r3m_annotate:
 	clear.insert(4);	// other modifications
 
-      case r3m_all:
+      case qpdf_r3m_all:
 	break;
 
 	// no default so gcc warns for missing cases
@@ -922,8 +922,8 @@ QPDFWriter::unparseObject(QPDFObjectHandle object, int level,
 	{
 	    is_metadata = true;
 	}
-	bool filter = (this->stream_data_mode != s_preserve);
-	if (this->stream_data_mode == s_compress)
+	bool filter = (this->stream_data_mode != qpdf_s_preserve);
+	if (this->stream_data_mode == qpdf_s_compress)
 	{
 	    // Don't filter if the stream is already compressed with
 	    // FlateDecode.  We don't want to make it worse by getting
@@ -952,7 +952,7 @@ QPDFWriter::unparseObject(QPDFObjectHandle object, int level,
 	    normalize = true;
 	    filter = true;
 	}
-	else if (filter && (this->stream_data_mode == s_compress))
+	else if (filter && (this->stream_data_mode == qpdf_s_compress))
 	{
 	    compress = true;
 	    QTC::TC("qpdf", "QPDFWriter compressing uncompressed stream");
@@ -1107,7 +1107,8 @@ QPDFWriter::writeObjectStream(QPDFObjectHandle object)
 
 	    // Set up a stream to write the stream data into a buffer.
 	    Pipeline* next = pushPipeline(new Pl_Buffer("object stream"));
-	    if (! ((this->stream_data_mode == s_uncompress) || this->qdf_mode))
+	    if (! ((this->stream_data_mode == qpdf_s_uncompress) ||
+		   this->qdf_mode))
 	    {
 		compressed = true;
 		next = pushPipeline(
@@ -1455,7 +1456,7 @@ QPDFWriter::write()
 	}
 	if (! this->stream_data_mode_set)
 	{
-	    this->stream_data_mode = s_uncompress;
+	    this->stream_data_mode = qpdf_s_uncompress;
 	}
     }
 
@@ -1465,7 +1466,7 @@ QPDFWriter::write()
 	this->preserve_encryption = false;
     }
     else if (this->normalize_content ||
-	     (this->stream_data_mode == s_uncompress) ||
+	     (this->stream_data_mode == qpdf_s_uncompress) ||
 	     this->qdf_mode)
     {
 	// Encryption makes looking at contents pretty useless.  If
@@ -1485,12 +1486,12 @@ QPDFWriter::write()
 	if (v < 1.5)
 	{
 	    QTC::TC("qpdf", "QPDFWriter forcing object stream disable");
-	    this->object_stream_mode = o_disable;
+	    this->object_stream_mode = qpdf_o_disable;
 	}
     }
 
     if (this->qdf_mode || this->normalize_content ||
-	(this->stream_data_mode == s_uncompress))
+	(this->stream_data_mode == qpdf_s_uncompress))
     {
 	initializeSpecialStreams();
     }
@@ -1506,15 +1507,15 @@ QPDFWriter::write()
 
     switch (this->object_stream_mode)
     {
-      case o_disable:
+      case qpdf_o_disable:
 	// no action required
 	break;
 
-      case o_preserve:
+      case qpdf_o_preserve:
 	preserveObjectStreams();
 	break;
 
-      case o_generate:
+      case qpdf_o_generate:
 	generateObjectStreams();
 	break;
 
@@ -1760,7 +1761,7 @@ QPDFWriter::writeXRefStream(int xref_id, int max_id, int max_offset,
 
     Pipeline* p = pushPipeline(new Pl_Buffer("xref stream"));
     bool compressed = false;
-    if (! ((this->stream_data_mode == s_uncompress) || this->qdf_mode))
+    if (! ((this->stream_data_mode == qpdf_s_uncompress) || this->qdf_mode))
     {
 	compressed = true;
 	p = pushPipeline(
diff --git a/libqpdf/QUtil.cc b/libqpdf/QUtil.cc
index 1f5603fb..bc81ce57 100644
--- a/libqpdf/QUtil.cc
+++ b/libqpdf/QUtil.cc
@@ -1,4 +1,3 @@
-#include <qpdf/DLL.hh>
 #include <qpdf/QUtil.hh>
 #include <stdio.h>
 #include <errno.h>
diff --git a/libqpdf/qpdf-c.cc b/libqpdf/qpdf-c.cc
index 96de680f..f18080b2 100644
--- a/libqpdf/qpdf-c.cc
+++ b/libqpdf/qpdf-c.cc
@@ -251,48 +251,16 @@ QPDF_ERROR_CODE qpdf_init_write(qpdf_data qpdf, char const* filename)
     return status;
 }
 
-void qpdf_set_object_stream_mode(qpdf_data qpdf, int mode)
+void qpdf_set_object_stream_mode(qpdf_data qpdf, qpdf_object_stream_e mode)
 {
     QTC::TC("qpdf", "qpdf-c called qpdf_set_object_stream_mode");
-    QPDFWriter::object_stream_e omode = QPDFWriter::o_preserve;
-    switch (mode)
-    {
-      case QPDF_OBJECT_STREAM_DISABLE:
-	omode = QPDFWriter::o_disable;
-	break;
-
-      case QPDF_OBJECT_STREAM_GENERATE:
-	omode = QPDFWriter::o_generate;
-	break;
-
-      default:
-	// already set to o_preserve; treate out of range values as
-	// the default.
-	break;
-    }
-
-    qpdf->qpdf_writer->setObjectStreamMode(omode);
+    qpdf->qpdf_writer->setObjectStreamMode(mode);
 }
 
-void qpdf_set_stream_data_mode(qpdf_data qpdf, int mode)
+void qpdf_set_stream_data_mode(qpdf_data qpdf, qpdf_stream_data_e mode)
 {
     QTC::TC("qpdf", "qpdf-c called qpdf_set_stream_data_mode");
-    QPDFWriter::stream_data_e smode = QPDFWriter::s_preserve;
-    switch (mode)
-    {
-      case QPDF_STREAM_DATA_UNCOMPRESS:
-	smode = QPDFWriter::s_uncompress;
-	break;
-
-      case QPDF_STREAM_DATA_COMPRESS:
-	smode = QPDFWriter::s_compress;
-	break;
-
-      default:
-	// Treat anything else as default
-	break;
-    }
-    qpdf->qpdf_writer->setStreamDataMode(smode);
+    qpdf->qpdf_writer->setStreamDataMode(mode);
 }
 
 void qpdf_set_content_normalization(qpdf_data qpdf, QPDF_BOOL value)
@@ -346,39 +314,24 @@ void qpdf_set_r2_encryption_parameters(
 void qpdf_set_r3_encryption_parameters(
     qpdf_data qpdf, char const* user_password, char const* owner_password,
     QPDF_BOOL allow_accessibility, QPDF_BOOL allow_extract,
-    int print, int modify)
+    qpdf_r3_print_e print, qpdf_r3_modify_e modify)
 {
     QTC::TC("qpdf", "qpdf-c called qpdf_set_r3_encryption_parameters");
     qpdf->qpdf_writer->setR3EncryptionParameters(
 	user_password, owner_password,
-	allow_accessibility, allow_extract,
-	((print == QPDF_R3_PRINT_LOW) ? QPDFWriter::r3p_low :
-	 (print == QPDF_R3_PRINT_NONE) ? QPDFWriter::r3p_none :
-	 QPDFWriter::r3p_full),
-	((modify == QPDF_R3_MODIFY_ANNOTATE) ? QPDFWriter::r3m_annotate :
-	 (modify == QPDF_R3_MODIFY_FORM) ? QPDFWriter::r3m_form :
-	 (modify == QPDF_R3_MODIFY_ASSEMBLY) ? QPDFWriter::r3m_assembly :
-	 (modify == QPDF_R3_MODIFY_NONE) ? QPDFWriter::r3m_none :
-	 QPDFWriter::r3m_all));
+	allow_accessibility, allow_extract, print, modify);
 }
 
 void qpdf_set_r4_encryption_parameters(
     qpdf_data qpdf, char const* user_password, char const* owner_password,
     QPDF_BOOL allow_accessibility, QPDF_BOOL allow_extract,
-    int print, int modify, QPDF_BOOL encrypt_metadata, QPDF_BOOL use_aes)
+    qpdf_r3_print_e print, qpdf_r3_modify_e modify,
+    QPDF_BOOL encrypt_metadata, QPDF_BOOL use_aes)
 {
     QTC::TC("qpdf", "qpdf-c called qpdf_set_r4_encryption_parameters");
     qpdf->qpdf_writer->setR4EncryptionParameters(
 	user_password, owner_password,
-	allow_accessibility, allow_extract,
-	((print == QPDF_R3_PRINT_LOW) ? QPDFWriter::r3p_low :
-	 (print == QPDF_R3_PRINT_NONE) ? QPDFWriter::r3p_none :
-	 QPDFWriter::r3p_full),
-	((modify == QPDF_R3_MODIFY_ANNOTATE) ? QPDFWriter::r3m_annotate :
-	 (modify == QPDF_R3_MODIFY_FORM) ? QPDFWriter::r3m_form :
-	 (modify == QPDF_R3_MODIFY_ASSEMBLY) ? QPDFWriter::r3m_assembly :
-	 (modify == QPDF_R3_MODIFY_NONE) ? QPDFWriter::r3m_none :
-	 QPDFWriter::r3m_all),
+	allow_accessibility, allow_extract, print, modify,
 	encrypt_metadata, use_aes);
 }
 
diff --git a/libqpdf/qpdf/BitStream.hh b/libqpdf/qpdf/BitStream.hh
index d01be32e..b4b3ad02 100644
--- a/libqpdf/qpdf/BitStream.hh
+++ b/libqpdf/qpdf/BitStream.hh
@@ -3,7 +3,7 @@
 #ifndef __BITSTREAM_HH__
 #define __BITSTREAM_HH__
 
-#include <qpdf/DLL.hh>
+#include <qpdf/DLL.h>
 
 class DLL_EXPORT BitStream
 {
diff --git a/libqpdf/qpdf/BitWriter.hh b/libqpdf/qpdf/BitWriter.hh
index 9e99123b..09d758c7 100644
--- a/libqpdf/qpdf/BitWriter.hh
+++ b/libqpdf/qpdf/BitWriter.hh
@@ -3,7 +3,7 @@
 #ifndef __BITWRITER_HH__
 #define __BITWRITER_HH__
 
-#include <qpdf/DLL.hh>
+#include <qpdf/DLL.h>
 
 class Pipeline;
 
diff --git a/libqpdf/qpdf/MD5.hh b/libqpdf/qpdf/MD5.hh
index 9bc82877..f44c6069 100644
--- a/libqpdf/qpdf/MD5.hh
+++ b/libqpdf/qpdf/MD5.hh
@@ -2,7 +2,7 @@
 #define __MD5_HH__
 
 #include <string>
-#include <qpdf/DLL.hh>
+#include <qpdf/DLL.h>
 #include <qpdf/qpdf-config.h>
 #ifdef HAVE_INTTYPES_H
 # include <inttypes.h>
diff --git a/libqpdf/qpdf/PCRE.hh b/libqpdf/qpdf/PCRE.hh
index f8487ee9..ad7d960a 100644
--- a/libqpdf/qpdf/PCRE.hh
+++ b/libqpdf/qpdf/PCRE.hh
@@ -12,7 +12,7 @@
 #include <string>
 #include <stdexcept>
 
-#include <qpdf/DLL.hh>
+#include <qpdf/DLL.h>
 
 // Note: this class does not encapsulate all features of the PCRE
 // package -- only those that I actually need right now are here.