Bug 319: count PDF pages when marked by "/Type/Page" (without whitespace)

diff --git a/CHANGES b/CHANGES
index 58d99ece29c4d82c3701a699e5f811249d38e32f..86eca939225b35ef55d1aefd7ca13f3faf97d536 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,7 @@
 
 Changelog for HylaFAX 4.2.2
 
+* correct cover sheet page count for some PDFs (14 Jul 2005)
 * fix job blocking (concurrent call) handling, especially
   as dealing with batches (13 Jul 2003)
 * fix job modifications on batched, running jobs (13 Jul 2005)

diff --git a/util/SendFaxClient.c++ b/util/SendFaxClient.c++
index f3a4cb5a9e59a497fcafef8d9c52b5dade8ede0f..9a6caaf63a934fd8a68186d5c38369388db2ea82 100644 (file)
--- a/util/SendFaxClient.c++
+++ b/util/SendFaxClient.c++
@@ -792,7 +792,7 @@ SendFaxClient::estimatePostScriptPages(const char* filename)
                     endbuf = cp+len;    // Will only change on the last pass.
                    cp = line;
                    while ((cp = (char *) memchr((const char*) cp, '/', endbuf-cp-slen))) {
-                       if ((memcmp(cp, "/Type /Page", slen-1) == 0) && (*(cp+slen-1) != 's'))
+                       if (((memcmp(cp, "/Type /Page", slen-1) == 0) || (memcmp(cp, "/Type/Page", slen-2) == 0)) && (*(cp+slen-1) != 's'))
                            npages++;
                        cp++;
                    }