Attachment 43181 Details for Bug 34120 – patches to build with gcc-2.96 on Red Hat Linux 7.1

[patch] patches to build with gcc-2.96 on Red Hat Linux 7.1

poppler-git-10feb11-rh7.pat (text/plain), 3.48 KB, created by William Bader on 2011-02-09 20:49:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: William Bader

Created: 2011-02-09 20:49:04 UTC

Size: 3.48 KB

patch

obsolete

>--- poppler-git-10feb11-rh7/goo/TiffWriter.cc-	2011-02-10 04:43:25.000000000 +0100
>+++ poppler-git-10feb11-rh7/goo/TiffWriter.cc	2011-02-10 05:29:47.319664293 +0100
>@@ -59,9 +59,13 @@
>     { "none",	COMPRESSION_NONE,	"no compression" },
>     { "ccittrle", COMPRESSION_CCITTRLE,	"CCITT modified Huffman RLE" },
>     { "ccittfax3", COMPRESSION_CCITTFAX3,"CCITT Group 3 fax encoding" },
>+#ifdef COMPRESSION_CCITT_T4
>     { "ccittt4", COMPRESSION_CCITT_T4,	"CCITT T.4 (TIFF 6 name)" },
>+#endif
>     { "ccittfax4", COMPRESSION_CCITTFAX4, "CCITT Group 4 fax encoding" },
>+#ifdef COMPRESSION_CCITT_T6
>     { "ccittt6", COMPRESSION_CCITT_T6,	"CCITT T.6 (TIFF 6 name)" },
>+#endif
>     { "lzw",	COMPRESSION_LZW,	"Lempel-Ziv  & Welch" },
>     { "ojpeg",	COMPRESSION_OJPEG,	"!6.0 JPEG" },
>     { "jpeg",	COMPRESSION_JPEG,	"%JPEG DCT compression" },
>@@ -72,7 +76,9 @@
>     { "adeflate", COMPRESSION_ADOBE_DEFLATE, "Deflate compression, as recognized by Adobe" },
>     { "dcs",	COMPRESSION_DCS,	"Kodak DCS encoding" },
>     { "jbig",	COMPRESSION_JBIG,	"ISO JBIG" },
>+#ifdef COMPRESSION_JP2000
>     { "jp2000",	COMPRESSION_JP2000,	"Leadtools JPEG2000" },
>+#endif
>     { NULL,	0,			NULL }
>   };
> 
>--- poppler-git-10feb11-rh7/poppler/SplashOutputDev.cc-	2011-02-10 04:43:25.000000000 +0100
>+++ poppler-git-10feb11-rh7/poppler/SplashOutputDev.cc	2011-02-10 05:29:47.321664389 +0100
>@@ -81,6 +81,12 @@
> #define isfinite(x) finite(x)
> #endif
> 
>+#ifdef __GLIBC_PREREQ
>+#if !__GLIBC_PREREQ(2,3)
>+#define isfinite(x) finite(x)
>+#endif
>+#endif
>+
> static inline void convertGfxColor(SplashColorPtr dest,
>                                    SplashColorMode colorMode,
>                                    GfxColorSpace *colorSpace,
>--- poppler-git-10feb11-rh7/poppler/TextOutputDev.cc-	2011-02-10 04:43:25.000000000 +0100
>+++ poppler-git-10feb11-rh7/poppler/TextOutputDev.cc	2011-02-10 05:29:47.323664469 +0100
>@@ -64,6 +64,13 @@
> #include "ICSupport.h"
> #endif
> 
>+#ifdef __GLIBC_PREREQ
>+#if !__GLIBC_PREREQ(2,3)
>+#define fmax(x,y)  (((x)>=(y))?(x):(y))
>+#define fmin(x,y)  (((x)<=(y))?(x):(y))
>+#endif
>+#endif
>+
> //------------------------------------------------------------------------
> // parameters
> //------------------------------------------------------------------------
>--- poppler-git-10feb11-rh7/poppler/XRef.cc-	2011-02-10 04:43:25.000000000 +0100
>+++ poppler-git-10feb11-rh7/poppler/XRef.cc	2011-02-10 05:29:47.323664469 +0100
>@@ -48,6 +48,10 @@
> #include "XRef.h"
> #include "PopplerCache.h"
> 
>+#ifndef __GLIBC_PREREQ
>+#define __GLIBC_PREREQ(x,y) 1
>+#endif
>+
> //------------------------------------------------------------------------
> // Permission bits
> // Note that the PDF spec uses 1 base (eg bit 3 is 1<<2)
>@@ -570,7 +574,12 @@
>   if (obj.getDict()->lookup("XRefStm", &obj2)->isInt()) {
>     pos2 = (Guint)obj2.getInt();
>     for (size_t i = 0; ok == gTrue && i < followedXRefStm->size(); ++i) {
>-      if (followedXRefStm->at(i) == pos2) {
>+#if !__GLIBC_PREREQ(2,3)
>+      if ((*followedXRefStm)[i] == pos2)
>+#else
>+      if (followedXRefStm->at(i) == pos2)
>+#endif
>+      {
>         ok = gFalse;
>       }
>     }
>@@ -1306,7 +1315,12 @@
>       while (prevXRefOffset && entries[i].type == xrefEntryNone) {
>         bool followed = false;
>         for (size_t j = 0; j < followedPrev.size(); j++) {
>-          if (followedPrev.at(j) == prevXRefOffset) {
>+#if !__GLIBC_PREREQ(2,3)
>+          if (followedPrev[j] == prevXRefOffset)
>+#else
>+          if (followedPrev.at(j) == prevXRefOffset)
>+#endif
>+          {
>             followed = true;
>             break;
>           }

Actions: View | Splinter Review

Attachments on bug 34120: 43181

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.