From c1eb7f03c961a83c2b1c569a760873511770cec3 Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Tue, 18 Oct 2011 13:06:32 +0200 Subject: [PATCH] Adjustments (refs #117). --- src/rptprint.c | 8 +++++++- src/rptreport.c | 21 +++++++++++++++++---- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/src/rptprint.c b/src/rptprint.c index e0fbac7..89a3e6d 100644 --- a/src/rptprint.c +++ b/src/rptprint.c @@ -431,6 +431,9 @@ rpt_print_print (RptPrint *rpt_print, GtkWindow *transient) setlocale (LC_NUMERIC, locale_num); setlocale (LC_ALL, locale_old); + g_free (locale_old); + g_free (locale_num); + if (priv->output_type == RPT_OUTPUT_GTK && res == GTK_PRINT_OPERATION_RESULT_CANCEL) { @@ -505,6 +508,7 @@ rpt_print_print (RptPrint *rpt_print, GtkWindow *transient) g_warning ("Unable to write to the output file."); return; } + g_free (new_out_filename); priv->surface = cairo_svg_surface_create (new_out_filename, width, height); } @@ -537,6 +541,7 @@ rpt_print_print (RptPrint *rpt_print, GtkWindow *transient) new_out_filename); cairo_surface_destroy (priv->surface); cairo_destroy (priv->cr); + g_free (new_out_filename); } else { @@ -1212,7 +1217,7 @@ rpt_print_image_xml (RptPrint *rpt_print, xmlNode *xnode) adapt = xmlGetProp (xnode, (const xmlChar *)"adapt"); if (adapt == NULL) { - adapt = "none"; + adapt = g_strdup ("none"); } else { @@ -1274,6 +1279,7 @@ rpt_print_image_xml (RptPrint *rpt_print, xmlNode *xnode) g_free (size); g_free (rotation); g_free (border); + g_free (adapt); } static void diff --git a/src/rptreport.c b/src/rptreport.c index 577b372..0396fc9 100644 --- a/src/rptreport.c +++ b/src/rptreport.c @@ -406,21 +406,25 @@ RptReport if (prop != NULL) { margin_top = g_strtod (prop, NULL); + xmlFree (prop); } prop = xmlGetProp (xnodeset->nodeTab[0], "margin-right"); if (prop != NULL) { margin_right = g_strtod (prop, NULL); + xmlFree (prop); } prop = xmlGetProp (xnodeset->nodeTab[0], "margin-bottom"); if (prop != NULL) { margin_bottom = g_strtod (prop, NULL); + xmlFree (prop); } prop = xmlGetProp (xnodeset->nodeTab[0], "margin-left"); if (prop != NULL) { margin_left = g_strtod (prop, NULL); + xmlFree (prop); } rpt_report_set_page_margins (rpt_report, margin_top, margin_right, margin_bottom, margin_left); } @@ -566,7 +570,7 @@ RptReport pango_font = pango_font_description_new (); pango_font_description_set_family (pango_font, "Arial"); - pango_font_description_set_size (pango_font, 10); + pango_font_description_set_size (pango_font, 10 * PANGO_SCALE); } ret = rpt_report_new (); @@ -2124,7 +2128,6 @@ static void rpt_report_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec) { RptReport *rpt_report = RPT_REPORT (object); - RptReportPrivate *priv = RPT_REPORT_GET_PRIVATE (rpt_report); switch (property_id) @@ -2143,7 +2146,6 @@ static void rpt_report_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec) { RptReport *rpt_report = RPT_REPORT (object); - RptReportPrivate *priv = RPT_REPORT_GET_PRIVATE (rpt_report); switch (property_id) @@ -2506,6 +2508,7 @@ rpt_report_xml_parse_section (RptReport *rpt_report, xmlNode *xnode, RptReportSe { priv->report_header->new_page_after = TRUE; } + xmlFree (prop); } break; @@ -2519,6 +2522,7 @@ rpt_report_xml_parse_section (RptReport *rpt_report, xmlNode *xnode, RptReportSe { priv->report_footer->new_page_before = TRUE; } + xmlFree (prop); } break; @@ -2532,6 +2536,7 @@ rpt_report_xml_parse_section (RptReport *rpt_report, xmlNode *xnode, RptReportSe { priv->page_header->first_page = TRUE; } + xmlFree (prop); } prop = xmlGetProp (xnode, "last-page"); if (prop != NULL) @@ -2540,6 +2545,7 @@ rpt_report_xml_parse_section (RptReport *rpt_report, xmlNode *xnode, RptReportSe { priv->page_header->last_page = TRUE; } + xmlFree (prop); } break; @@ -2553,6 +2559,7 @@ rpt_report_xml_parse_section (RptReport *rpt_report, xmlNode *xnode, RptReportSe { priv->page_footer->first_page = TRUE; } + xmlFree (prop); } prop = xmlGetProp (xnode, "last-page"); if (prop != NULL) @@ -2574,6 +2581,7 @@ rpt_report_xml_parse_section (RptReport *rpt_report, xmlNode *xnode, RptReportSe { priv->body->new_page_after = TRUE; } + xmlFree (prop); } break; } @@ -2679,14 +2687,16 @@ rpt_report_rptprint_section (RptReport *rpt_report, prop = g_strdup ("0.0"); } xmlSetProp (xnode, "x", g_strdup_printf ("%f", g_strtod (prop, NULL) + priv->page->margin->left)); + xmlFree (prop); } - + prop = (gchar *)xmlGetProp (xnode, "y"); if (prop == NULL) { prop = g_strdup ("0.0"); } xmlSetProp (xnode, "y", g_strdup_printf ("%f", g_strtod (prop, NULL) + *cur_y)); + xmlFree (prop); if (IS_RPT_OBJ_TEXT (rptobj)) { @@ -2796,6 +2806,7 @@ rpt_report_change_specials (RptReport *rpt_report, xmlDoc *xdoc) NULL); } xmlNodeSetContent (cur, cont); + g_free (cont); } } } @@ -3050,6 +3061,7 @@ gchar } ret = g_strdup_printf ("%s", rpt_report_get_str_from_tm (tm, format)); + g_free (format); } else if (strncmp (real_special, "@Time", 5) == 0) { @@ -3070,6 +3082,7 @@ gchar } ret = g_strdup_printf ("%s", rpt_report_get_str_from_tm (tm, format)); + g_free (format); } return ret; -- 2.49.0