poppler/CairoOutputDev.cc | 6 +++--- poppler/Error.cc | 7 ------- poppler/Error.h | 1 - 3 files changed, 3 insertions(+), 11 deletions(-)
New commits: commit f331c009f94703d6007fce9570ee19c6e4822339 Author: Albert Astals Cid <[email protected]> Date: Wed Aug 31 19:20:12 2011 +0200 xpdf303: Remove warning() from Error.h diff --git a/poppler/CairoOutputDev.cc b/poppler/CairoOutputDev.cc index 30c69f1..00a0a5b 100644 --- a/poppler/CairoOutputDev.cc +++ b/poppler/CairoOutputDev.cc @@ -187,7 +187,7 @@ void CairoOutputDev::setCairo(cairo_t *cairo) if (this->cairo != NULL) { cairo_status_t status = cairo_status (this->cairo); if (status) { - warning("cairo context error: %s\n", cairo_status_to_string(status)); + error(errInternal, -1, "cairo context error: {0:s}\n", cairo_status_to_string(status)); } cairo_destroy (this->cairo); assert(!cairo_shape); @@ -344,7 +344,7 @@ void CairoOutputDev::updateCTM(GfxState *state, double m11, double m12, * instead of having to invert the matrix. */ invert_matrix = matrix; if (cairo_matrix_invert(&invert_matrix)) { - warning("matrix not invertible\n"); + error(errSyntaxWarning, -1, "matrix not invertible\n"); return; } @@ -629,7 +629,7 @@ void CairoOutputDev::updateFont(GfxState *state) { */ invert_matrix = matrix; if (cairo_matrix_invert(&invert_matrix)) { - warning("font matrix not invertible\n"); + error(errSyntaxWarning, -1, "font matrix not invertible\n"); return; } diff --git a/poppler/Error.cc b/poppler/Error.cc index 782346b..9d044bc 100644 --- a/poppler/Error.cc +++ b/poppler/Error.cc @@ -82,10 +82,3 @@ void CDECL error(ErrorCategory category, int pos, const char *msg, ...) { } delete s; } - -void warning(const char *msg, ...) { - va_list args; - va_start(args, msg); - vprintf(msg, args); - va_end(args); -} diff --git a/poppler/Error.h b/poppler/Error.h index 6cd22b4..d7a0991 100644 --- a/poppler/Error.h +++ b/poppler/Error.h @@ -52,6 +52,5 @@ extern void setErrorCallback(void (*cbk)(void *data, ErrorCategory category, void *data); extern void CDECL error(ErrorCategory category, int pos, const char *msg, ...); -void warning(const char *msg, ...) GCC_PRINTF_FORMAT (1, 2); #endif _______________________________________________ poppler mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/poppler
