From c910692c3f4ae56067ac82598351e5aa9c8a9f5b Mon Sep 17 00:00:00 2001 From: Andreas Politz Date: Fri, 27 Apr 2018 17:43:14 +0200 Subject: [PATCH] Revert change regarding const'ness and use casts instead Implement the originally proposed fix. Gbp-Pq: Name 0004-Revert-change-regarding-const-ness-and-use-casts-ins.patch --- server/poppler-hack.cc | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'server') diff --git a/server/poppler-hack.cc b/server/poppler-hack.cc index c727425..427f9df 100644 --- a/server/poppler-hack.cc +++ b/server/poppler-hack.cc @@ -51,7 +51,10 @@ GType poppler_annot_markup_get_type (void) G_GNUC_CONST; double y2; }; - char *_xpoppler_goo_string_to_utf8(const GooString *s) + // This function does not modify its argument s, but for + // compatibility reasons (e.g. getLength in GooString.h before 2015) + // with older poppler code, it can't be declared as such. + char *_xpoppler_goo_string_to_utf8(/* const */ GooString *s) { char *result; @@ -85,7 +88,7 @@ GType poppler_annot_markup_get_type (void) G_GNUC_CONST; // Set the rectangle of an annotation. It was first added in v0.26. void xpoppler_annot_set_rectangle (PopplerAnnot *a, PopplerRectangle *rectangle) { - const GooString *state = a->annot->getAppearState (); + GooString *state = (GooString*) a->annot->getAppearState (); char *ustate = _xpoppler_goo_string_to_utf8 (state); a->annot->setRect (rectangle->x1, rectangle->y1, @@ -100,12 +103,12 @@ GType poppler_annot_markup_get_type (void) G_GNUC_CONST; gchar *xpoppler_annot_markup_get_created (PopplerAnnotMarkup *poppler_annot) { AnnotMarkup *annot; - const GooString *text; + GooString *text; g_return_val_if_fail (POPPLER_IS_ANNOT_MARKUP (poppler_annot), NULL); annot = static_cast(POPPLER_ANNOT (poppler_annot)->annot); - text = annot->getDate (); + text = (GooString*) annot->getDate (); return text ? _xpoppler_goo_string_to_utf8 (text) : NULL; } -- cgit v1.2.3