summaryrefslogtreecommitdiffstats
path: root/libqpdf/qpdf
diff options
context:
space:
mode:
Diffstat (limited to 'libqpdf/qpdf')
-rw-r--r--libqpdf/qpdf/MD5.hh5
-rw-r--r--libqpdf/qpdf/PCRE.hh27
-rw-r--r--libqpdf/qpdf/Pl_ASCII85Decoder.hh1
-rw-r--r--libqpdf/qpdf/Pl_ASCIIHexDecoder.hh1
-rw-r--r--libqpdf/qpdf/Pl_LZWDecoder.hh1
-rw-r--r--libqpdf/qpdf/Pl_MD5.hh1
-rw-r--r--libqpdf/qpdf/Pl_PNGFilter.hh15
-rw-r--r--libqpdf/qpdf/Pl_QPDFTokenizer.hh1
-rw-r--r--libqpdf/qpdf/Pl_RC4.hh16
-rw-r--r--libqpdf/qpdf/QPDF_Array.hh1
-rw-r--r--libqpdf/qpdf/QPDF_Bool.hh1
-rw-r--r--libqpdf/qpdf/QPDF_Dictionary.hh1
-rw-r--r--libqpdf/qpdf/QPDF_Integer.hh1
-rw-r--r--libqpdf/qpdf/QPDF_Name.hh1
-rw-r--r--libqpdf/qpdf/QPDF_Null.hh1
-rw-r--r--libqpdf/qpdf/QPDF_Real.hh1
-rw-r--r--libqpdf/qpdf/QPDF_Stream.hh1
-rw-r--r--libqpdf/qpdf/QPDF_String.hh1
-rw-r--r--libqpdf/qpdf/RC4.hh1
19 files changed, 9 insertions, 69 deletions
diff --git a/libqpdf/qpdf/MD5.hh b/libqpdf/qpdf/MD5.hh
index ae2e2113..c1babb29 100644
--- a/libqpdf/qpdf/MD5.hh
+++ b/libqpdf/qpdf/MD5.hh
@@ -1,10 +1,8 @@
-
#ifndef __MD5_HH__
#define __MD5_HH__
#include <string>
#include <qpdf/DLL.hh>
-#include <qpdf/QEXC.hh>
#include <qpdf/qpdf-config.h>
#ifdef HAVE_INTTYPES_H
# include <inttypes.h>
@@ -26,8 +24,7 @@ class MD5
// encodes file and finalizes
DLL_EXPORT
- void encodeFile(char const* filename, int up_to_size = -1)
- throw(QEXC::System);
+ void encodeFile(char const* filename, int up_to_size = -1);
// appends string to current md5 object
DLL_EXPORT
diff --git a/libqpdf/qpdf/PCRE.hh b/libqpdf/qpdf/PCRE.hh
index ba6f6670..919431a3 100644
--- a/libqpdf/qpdf/PCRE.hh
+++ b/libqpdf/qpdf/PCRE.hh
@@ -10,9 +10,9 @@
#endif
#include <pcre.h>
#include <string>
+#include <stdexcept>
#include <qpdf/DLL.hh>
-#include <qpdf/QEXC.hh>
// Note: this class does not encapsulate all features of the PCRE
// package -- only those that I actually need right now are here.
@@ -20,18 +20,9 @@
class PCRE
{
public:
- class Exception: public QEXC::General
- {
- public:
- DLL_EXPORT
- Exception(std::string const& message);
- DLL_EXPORT
- virtual ~Exception() throw() {}
- };
-
// This is thrown when an attempt is made to access a non-existent
// back reference.
- class NoBackref: public Exception
+ class NoBackref: public std::logic_error
{
public:
DLL_EXPORT
@@ -65,14 +56,13 @@ class PCRE
// see getMatch flags below
DLL_EXPORT
- std::string getMatch(int n, int flags = 0)
- throw(QEXC::General, Exception);
+ std::string getMatch(int n, int flags = 0);
DLL_EXPORT
- void getOffsetLength(int n, int& offset, int& length) throw(Exception);
+ void getOffsetLength(int n, int& offset, int& length);
DLL_EXPORT
- int getOffset(int n) throw(Exception);
+ int getOffset(int n);
DLL_EXPORT
- int getLength(int n) throw(Exception);
+ int getLength(int n);
// nMatches returns the number of available matches including
// match 0 which is the whole string. In other words, if you
@@ -105,14 +95,13 @@ class PCRE
// The value passed in as options is passed to pcre_exec. See man
// pcreapi for details.
DLL_EXPORT
- PCRE(char const* pattern, int options = 0) throw(Exception);
+ PCRE(char const* pattern, int options = 0);
DLL_EXPORT
~PCRE();
DLL_EXPORT
Match match(char const* subject, int options = 0, int startoffset = 0,
- int size = -1)
- throw(QEXC::General, Exception);
+ int size = -1);
DLL_EXPORT
static void test(int n = 0);
diff --git a/libqpdf/qpdf/Pl_ASCII85Decoder.hh b/libqpdf/qpdf/Pl_ASCII85Decoder.hh
index 6efd8199..a2c38da3 100644
--- a/libqpdf/qpdf/Pl_ASCII85Decoder.hh
+++ b/libqpdf/qpdf/Pl_ASCII85Decoder.hh
@@ -1,4 +1,3 @@
-
#ifndef __PL_ASCII85DECODER_HH__
#define __PL_ASCII85DECODER_HH__
diff --git a/libqpdf/qpdf/Pl_ASCIIHexDecoder.hh b/libqpdf/qpdf/Pl_ASCIIHexDecoder.hh
index 068294d7..8a7b1899 100644
--- a/libqpdf/qpdf/Pl_ASCIIHexDecoder.hh
+++ b/libqpdf/qpdf/Pl_ASCIIHexDecoder.hh
@@ -1,4 +1,3 @@
-
#ifndef __PL_ASCIIHEXDECODER_HH__
#define __PL_ASCIIHEXDECODER_HH__
diff --git a/libqpdf/qpdf/Pl_LZWDecoder.hh b/libqpdf/qpdf/Pl_LZWDecoder.hh
index 4d348406..3226cd6a 100644
--- a/libqpdf/qpdf/Pl_LZWDecoder.hh
+++ b/libqpdf/qpdf/Pl_LZWDecoder.hh
@@ -1,4 +1,3 @@
-
#ifndef __PL_LZWDECODER_HH__
#define __PL_LZWDECODER_HH__
diff --git a/libqpdf/qpdf/Pl_MD5.hh b/libqpdf/qpdf/Pl_MD5.hh
index 9da018d1..13973f29 100644
--- a/libqpdf/qpdf/Pl_MD5.hh
+++ b/libqpdf/qpdf/Pl_MD5.hh
@@ -1,4 +1,3 @@
-
#ifndef __PL_MD5_HH__
#define __PL_MD5_HH__
diff --git a/libqpdf/qpdf/Pl_PNGFilter.hh b/libqpdf/qpdf/Pl_PNGFilter.hh
index 1d9afabd..eb2ed028 100644
--- a/libqpdf/qpdf/Pl_PNGFilter.hh
+++ b/libqpdf/qpdf/Pl_PNGFilter.hh
@@ -19,21 +19,6 @@
class Pl_PNGFilter: public Pipeline
{
public:
- class Exception: public Pipeline::Exception
- {
- public:
- DLL_EXPORT
- Exception(std::string const& message) :
- Pipeline::Exception(message)
- {
- }
-
- DLL_EXPORT
- virtual ~Exception() throw ()
- {
- }
- };
-
// Encoding is not presently supported
enum action_e { a_encode, a_decode };
diff --git a/libqpdf/qpdf/Pl_QPDFTokenizer.hh b/libqpdf/qpdf/Pl_QPDFTokenizer.hh
index 448dbb18..d300d7cd 100644
--- a/libqpdf/qpdf/Pl_QPDFTokenizer.hh
+++ b/libqpdf/qpdf/Pl_QPDFTokenizer.hh
@@ -1,4 +1,3 @@
-
#ifndef __PL_QPDFTOKENIZER_HH__
#define __PL_QPDFTOKENIZER_HH__
diff --git a/libqpdf/qpdf/Pl_RC4.hh b/libqpdf/qpdf/Pl_RC4.hh
index 01b651a5..907b4af8 100644
--- a/libqpdf/qpdf/Pl_RC4.hh
+++ b/libqpdf/qpdf/Pl_RC4.hh
@@ -1,4 +1,3 @@
-
#ifndef __PL_RC4_HH__
#define __PL_RC4_HH__
@@ -9,21 +8,6 @@
class Pl_RC4: public Pipeline
{
public:
- class Exception: public Pipeline::Exception
- {
- public:
- DLL_EXPORT
- Exception(std::string const& message) :
- Pipeline::Exception(message)
- {
- }
-
- DLL_EXPORT
- virtual ~Exception() throw()
- {
- }
- };
-
static int const def_bufsize = 65536;
// key_len of -1 means treat key_data as a null-terminated string
diff --git a/libqpdf/qpdf/QPDF_Array.hh b/libqpdf/qpdf/QPDF_Array.hh
index 371be50e..fce36a4c 100644
--- a/libqpdf/qpdf/QPDF_Array.hh
+++ b/libqpdf/qpdf/QPDF_Array.hh
@@ -1,4 +1,3 @@
-
#ifndef __QPDF_ARRAY_HH__
#define __QPDF_ARRAY_HH__
diff --git a/libqpdf/qpdf/QPDF_Bool.hh b/libqpdf/qpdf/QPDF_Bool.hh
index 06aca822..90dc590e 100644
--- a/libqpdf/qpdf/QPDF_Bool.hh
+++ b/libqpdf/qpdf/QPDF_Bool.hh
@@ -1,4 +1,3 @@
-
#ifndef __QPDF_BOOL_HH__
#define __QPDF_BOOL_HH__
diff --git a/libqpdf/qpdf/QPDF_Dictionary.hh b/libqpdf/qpdf/QPDF_Dictionary.hh
index b960050a..a6b1e77b 100644
--- a/libqpdf/qpdf/QPDF_Dictionary.hh
+++ b/libqpdf/qpdf/QPDF_Dictionary.hh
@@ -1,4 +1,3 @@
-
#ifndef __QPDF_DICTIONARY_HH__
#define __QPDF_DICTIONARY_HH__
diff --git a/libqpdf/qpdf/QPDF_Integer.hh b/libqpdf/qpdf/QPDF_Integer.hh
index fb6360b2..cc11cd65 100644
--- a/libqpdf/qpdf/QPDF_Integer.hh
+++ b/libqpdf/qpdf/QPDF_Integer.hh
@@ -1,4 +1,3 @@
-
#ifndef __QPDF_INTEGER_HH__
#define __QPDF_INTEGER_HH__
diff --git a/libqpdf/qpdf/QPDF_Name.hh b/libqpdf/qpdf/QPDF_Name.hh
index a32f6f4f..361556a0 100644
--- a/libqpdf/qpdf/QPDF_Name.hh
+++ b/libqpdf/qpdf/QPDF_Name.hh
@@ -1,4 +1,3 @@
-
#ifndef __QPDF_NAME_HH__
#define __QPDF_NAME_HH__
diff --git a/libqpdf/qpdf/QPDF_Null.hh b/libqpdf/qpdf/QPDF_Null.hh
index 60c1ae35..086a3228 100644
--- a/libqpdf/qpdf/QPDF_Null.hh
+++ b/libqpdf/qpdf/QPDF_Null.hh
@@ -1,4 +1,3 @@
-
#ifndef __QPDF_NULL_HH__
#define __QPDF_NULL_HH__
diff --git a/libqpdf/qpdf/QPDF_Real.hh b/libqpdf/qpdf/QPDF_Real.hh
index b950c569..76777477 100644
--- a/libqpdf/qpdf/QPDF_Real.hh
+++ b/libqpdf/qpdf/QPDF_Real.hh
@@ -1,4 +1,3 @@
-
#ifndef __QPDF_REAL_HH__
#define __QPDF_REAL_HH__
diff --git a/libqpdf/qpdf/QPDF_Stream.hh b/libqpdf/qpdf/QPDF_Stream.hh
index 71381fd3..c969255d 100644
--- a/libqpdf/qpdf/QPDF_Stream.hh
+++ b/libqpdf/qpdf/QPDF_Stream.hh
@@ -1,4 +1,3 @@
-
#ifndef __QPDF_STREAM_HH__
#define __QPDF_STREAM_HH__
diff --git a/libqpdf/qpdf/QPDF_String.hh b/libqpdf/qpdf/QPDF_String.hh
index f3063c50..82860e9d 100644
--- a/libqpdf/qpdf/QPDF_String.hh
+++ b/libqpdf/qpdf/QPDF_String.hh
@@ -1,4 +1,3 @@
-
#ifndef __QPDF_STRING_HH__
#define __QPDF_STRING_HH__
diff --git a/libqpdf/qpdf/RC4.hh b/libqpdf/qpdf/RC4.hh
index 657bf35b..c26f3d0f 100644
--- a/libqpdf/qpdf/RC4.hh
+++ b/libqpdf/qpdf/RC4.hh
@@ -1,4 +1,3 @@
-
#ifndef __RC4_HH__
#define __RC4_HH__
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-07-06 07:05:46 +0200