Age | Commit message (Collapse) | Author | Files | Lines |
|
|
|
|
|
|
|
Compilation of glib/demo uses a C compiler, thus compiler warnings
should be enabled in the CFLAGS variable.
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
glib/poppler-document.cc
poppler/PDFDoc.cc
poppler/XRef.h
utils/HtmlFonts.cc
|
|
|
|
|
|
Bug 52197
|
|
Bug 52197
|
|
|
|
|
|
|
|
|
|
A PopplerInputStream has been added to handle GMemoryInputStream and
GLocalFileInputStream, since we don't want to cache the contents in
those cases. A PopplerCachedFileLoader has been added to handle all
other cases.
|
|
|
|
|
|
Although configure --help says as if environmental variables
FREETYPE_CFLAGS and FREETYPE_LIBS will overwrite the values obtained
by pkg-config. But it is not. These help messages are automatically given
by pkg-config macro (so I guess no poppler developer designed so intentionally).
In current configure, FREETYPE_CFLAGS, FREETYPE_LIBS are cleared before
PKG_CONFIG_MODULES(), like:
dnl Check for freetype headers
FREETYPE_LIBS=
FREETYPE_CFLAGS=
PKG_CHECK_MODULES(FREETYPE, freetype2,
[freetype_pkgconfig=yes], [freetype_pkgconfig=no])
if test "x$freetype_pkgconfig" = "xyes"; then
AC_DEFINE(HAVE_FREETYPE_H, 1, [Have FreeType2 include files])
else
AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no)
[...]
Checking the history why these values are cleared, it seems that
the initial revision of poppler did not use pkg-config to detect
FREETYPE_CFLAGS, _LIBS. At that time, only freetype-config is used.
In later, when PKG_CHECK_MODULES is introduced, it was accidentally
introduced AFTER the clearning of FREETYPE_CFLAGS,_LIBS. As a result,
the inconsistency between "configure --help" and what configure does
really. I propose to move the clearance of FREETYPE_CFLAGS,_LIBS
just before AC_PATH_PROG, to make PKG_CHECK_MODULES catch the environmental
values.
|
|
SplashOutputDev.cc uses isfinite() function (defined by math.h).
isfinite() was standardized in C99, and imported to C++0x in later.
In QNX header file system, isfinite() is disabled by default,
the definition of __STDC_VERSION__ > 199901 is required to enable it.
In the case of GCC, "-std=c99" (for C) or "-std=gnu++0x" (for C++)
is expected.
But, current configure of poppler appends "-ansi" flag for CXXFLAGS,
if the compiler is known to be GNU. "-ansi" is C89 or C++98, so isfinite()
is unavailable. I propose a patch NOT to "-ansi" flag, if CXXFLAGS
includes "-std=XXX" already.
|
|
|
|
|
|
Signed-off-by: Peter Breitenlohner <peb@mppmu.mpg.de>
|
|
Partial credit goes to suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
|
|
this is quite small fix. In poppler's configure, basically the shell
variables are not enclosed, and not quoted, aslike
if test x$use_glib = x; then
This syntax make the test command confused when use_glib is multi-word
value, as, "no (required cairo output)". In such case, test cannot know
how to evaluate the token "no" "(required" "cairo", so some "syntax error"
messages are given. Thus, quoting of the variable would be safer.
|
|
In libjpeg6b, there is a type definition conflict issue in jmorecfg.h.
jmorecfg.h typedefs INT16 as short, INT32 as long. The latter conflict
with basetsd.h of Microsoft Windows SDK or MinGW that typedefs INT32
as int. basetsd.h is included by windows.h, so, if the users work with
ANSI C features only, the conflict does not appear, it would be the
background why such fundamental error has been preserved.
Anyway, jmorecfg.h designer was aware about the conflict with X11 headers
(Xmd.h defines INT16, INT32, etc), so if we pretend as if Xmd.h were
included (by defining XMD_H), this issue can be bypassed. Attached patch
checks the conflict, then, if there is a conflict, tries XMD_H trick, and
uses it if it works. If jmorecfg.h or basetsd.h was manually fixed to
prevent this issue, this trick is not used.
|
|
evaluate pkg-config-like environmental variables like LIBJPEG_CFLAGS,
LIBJPEG_LIBS, LIBTIFF_CFLAGS and LIBTIFF_LIBS in configuration.
|
|
|
|
|
|
argument
|
|
Now that openjpeg 1.5 is released and supports pkg-config the compile
test can be replaced with a pkg-config version check.
|
|
and if not found fallback to using AC_CHECK_LIB/AC_CHECK_HEADERS
openjpeg >= 1.4 installs a pkgconfig file
Bug 21789
|
|
|
|
This makes 'make distcheck' run succesfully.
|
|
Conflicts:
utils/HtmlOutputDev.cc
utils/HtmlOutputDev.h
|
|
|
|
Conflicts:
poppler/CairoOutputDev.cc
poppler/CairoOutputDev.h
poppler/FontInfo.cc
poppler/GfxFont.cc
poppler/GfxState.cc
poppler/GlobalParams.cc
poppler/GlobalParams.h
poppler/Lexer.cc
|
|
Fixes/workarounds bug 43414 with openjpeg 1.5 (unreleased)
(cherry picked from commit de6415af1a39ec7dfa4f149c6c5e311b86352cec)
|
|
|
|
Bug 44619
|
|
so that CAIRO_LIBS includes the freetype dependency and pdftocairo
includes the dependencies for optional cairo backends.
Bug 43969
|
|
We were using $FOO_REQUIRED instead of @FOO_REQUIRED@
|
|
|
|
poppler-glib links to poppler-cairo statically, so it doesn'tm depend on
the dynamic library.
|
|
|
|
|
|
|