Skip to content
This repository was archived by the owner on Aug 31, 2021. It is now read-only.

Commit d288e25

Browse files
runrevmarkrunrevmark
committed
Merge branch 'release-6.6.3' into develop
2 parents 5544bb9 + df41ce5 commit d288e25

5 files changed

Lines changed: 11 additions & 10 deletions

File tree

‎docs/notes/bugfix-12594.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# NUL bytes in fields will cause printing to pdf to fail silently.

‎engine/include/customprinter.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@ class MCCustomPrintingDevice
383383
// should be considered to map to the text 'in one piece'. The clusters
384384
// array maps each byte of the text to the index of the first glyph in
385385
// its cluster.
386-
virtual bool DrawText(const MCCustomPrinterGlyph *glyphs, uint32_t glyph_count, const char *text, const uint32_t *clusters, const MCCustomPrinterFont& font, const MCCustomPrinterPaint& paint, const MCCustomPrinterTransform& transform, const MCCustomPrinterRectangle& clip) = 0;
386+
virtual bool DrawText(const MCCustomPrinterGlyph *glyphs, uint32_t glyph_count, const char *text_bytes, uint32_t text_byte_count, const uint32_t *clusters, const MCCustomPrinterFont& font, const MCCustomPrinterPaint& paint, const MCCustomPrinterTransform& transform, const MCCustomPrinterRectangle& clip) = 0;
387387

388388
// Make an anchor with the given name at the specified position - the name must
389389
// not have the form of a URI.

‎engine/src/customprinter.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1037,7 +1037,7 @@ static bool dotextmark_callback(void *p_context, const MCTextLayoutSpan *p_span)
10371037
t_font . handle = t_font_handle;
10381038

10391039
bool t_success;
1040-
t_success = context -> device -> DrawText((const MCCustomPrinterGlyph *)p_span -> glyphs, p_span -> glyph_count, (const char *)t_bytes, t_clusters, t_font, context -> paint, context -> transform, context -> clip);
1040+
t_success = context -> device -> DrawText((const MCCustomPrinterGlyph *)p_span -> glyphs, p_span -> glyph_count, (const char *)t_bytes, t_byte_count, t_clusters, t_font, context -> paint, context -> transform, context -> clip);
10411041

10421042
MCMemoryDeleteArray(t_clusters);
10431043

@@ -1727,9 +1727,9 @@ class MCLoggingPrintingDevice: public MCCustomPrintingDevice
17271727
return true;
17281728
}
17291729

1730-
bool DrawText(const MCCustomPrinterGlyph *glyphs, uint32_t glyph_count, const char *text, const uint32_t *clusters, const MCCustomPrinterFont& font, const MCCustomPrinterPaint& paint, const MCCustomPrinterTransform& transform, const MCCustomPrinterRectangle& p_clip)
1730+
bool DrawText(const MCCustomPrinterGlyph *glyphs, uint32_t glyph_count, const char *text_bytes, uint32_t text_byte_count, const uint32_t *clusters, const MCCustomPrinterFont& font, const MCCustomPrinterPaint& paint, const MCCustomPrinterTransform& transform, const MCCustomPrinterRectangle& p_clip)
17311731
{
1732-
if (!m_target -> DrawText(glyphs, glyph_count, text, clusters, font, paint, transform, p_clip))
1732+
if (!m_target -> DrawText(glyphs, glyph_count, text_bytes, text_byte_count, clusters, font, paint, transform, p_clip))
17331733
return Failed("DrawText");
17341734
return true;
17351735
}
@@ -1916,9 +1916,9 @@ class MCDebugPrintingDevice: public MCCustomPrintingDevice
19161916
return true;
19171917
}
19181918

1919-
bool DrawText(const MCCustomPrinterGlyph *glyphs, uint32_t glyph_count, const char *text, const uint32_t *clusters, const MCCustomPrinterFont& font, const MCCustomPrinterPaint& paint, const MCCustomPrinterTransform& transform, const MCCustomPrinterRectangle& p_clip)
1919+
bool DrawText(const MCCustomPrinterGlyph *glyphs, uint32_t glyph_count, const char *text_bytes, uint32_t text_byte_count, const uint32_t *clusters, const MCCustomPrinterFont& font, const MCCustomPrinterPaint& paint, const MCCustomPrinterTransform& transform, const MCCustomPrinterRectangle& p_clip)
19201920
{
1921-
Enter("begin text '%s' with clip (%f, %f)-(%f, %f)", text,
1921+
Enter("begin text '%s' with clip (%f, %f)-(%f, %f)", text_bytes,
19221922
p_clip . left, p_clip . top, p_clip . right, p_clip . bottom);
19231923
for(uint32_t i = 0; i < glyph_count; i++)
19241924
Print("glyph %d at (%f, %f)", glyphs[i] . id, glyphs[i] . x, glyphs[i] . y);

‎revpdfprinter/src/revpdfprinter.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -521,7 +521,7 @@ bool MCPDFPrintingDevice::DrawImage(const MCCustomPrinterImage& image, const MCC
521521
return t_success;
522522
}
523523

524-
bool MCPDFPrintingDevice::DrawText(const MCCustomPrinterGlyph *glyphs, uint32_t glyph_count, const char *text, const uint32_t *clusters, const MCCustomPrinterFont& font, const MCCustomPrinterPaint& paint, const MCCustomPrinterTransform& transform, const MCCustomPrinterRectangle& clip)
524+
bool MCPDFPrintingDevice::DrawText(const MCCustomPrinterGlyph *glyphs, uint32_t glyph_count, const char *text_bytes, uint32_t text_byte_count, const uint32_t *clusters, const MCCustomPrinterFont& font, const MCCustomPrinterPaint& paint, const MCCustomPrinterTransform& transform, const MCCustomPrinterRectangle& clip)
525525
{
526526
bool t_success = true;
527527
cairo_save(m_context);
@@ -574,7 +574,7 @@ bool MCPDFPrintingDevice::DrawText(const MCCustomPrinterGlyph *glyphs, uint32_t
574574
uint32_t t_cluster_count;
575575
bool t_reverse_clusters;
576576
if (t_success)
577-
t_success = custom_printer_clusters_to_cairo_clusters(clusters, MCCStringLength(text), glyph_count, t_clusters, t_cluster_count, t_reverse_clusters);
577+
t_success = custom_printer_clusters_to_cairo_clusters(clusters, text_byte_count, glyph_count, t_clusters, t_cluster_count, t_reverse_clusters);
578578

579579
if (t_success)
580580
t_success = apply_paint(paint);
@@ -584,7 +584,7 @@ bool MCPDFPrintingDevice::DrawText(const MCCustomPrinterGlyph *glyphs, uint32_t
584584
cairo_set_font_face(m_context, t_font);
585585
cairo_set_font_size(m_context, font . size);
586586

587-
cairo_show_text_glyphs(m_context, text, MCCStringLength(text), t_glyphs, glyph_count, t_clusters, t_cluster_count, t_reverse_clusters ? CAIRO_TEXT_CLUSTER_FLAG_BACKWARD : (cairo_text_cluster_flags_t)0);
587+
cairo_show_text_glyphs(m_context, text_bytes, text_byte_count, t_glyphs, glyph_count, t_clusters, t_cluster_count, t_reverse_clusters ? CAIRO_TEXT_CLUSTER_FLAG_BACKWARD : (cairo_text_cluster_flags_t)0);
588588
cairo_restore(m_context);
589589
t_success = (m_status = cairo_status(m_context)) == CAIRO_STATUS_SUCCESS;
590590
}

‎revpdfprinter/src/revpdfprinter.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ class MCPDFPrintingDevice: public MCCustomPrintingDevice
5959
bool FillPath(const MCCustomPrinterPath& path, MCCustomPrinterFillRule rule, const MCCustomPrinterPaint& paint, const MCCustomPrinterTransform& transform, const MCCustomPrinterRectangle& clip);
6060
bool StrokePath(const MCCustomPrinterPath& path, const MCCustomPrinterStroke& stroke, const MCCustomPrinterPaint& paint, const MCCustomPrinterTransform& transform, const MCCustomPrinterRectangle& clip);
6161
bool DrawImage(const MCCustomPrinterImage& image, const MCCustomPrinterTransform& transform, const MCCustomPrinterRectangle& clip);
62-
bool DrawText(const MCCustomPrinterGlyph *glyphs, uint32_t glyph_count, const char *text, const uint32_t *clusters, const MCCustomPrinterFont& font, const MCCustomPrinterPaint& paint, const MCCustomPrinterTransform& transform, const MCCustomPrinterRectangle& clip);
62+
bool DrawText(const MCCustomPrinterGlyph *glyphs, uint32_t glyph_count, const char *text_bytes, uint32_t text_byte_count, const uint32_t *clusters, const MCCustomPrinterFont& font, const MCCustomPrinterPaint& paint, const MCCustomPrinterTransform& transform, const MCCustomPrinterRectangle& clip);
6363

6464
bool MakeAnchor(const MCCustomPrinterPoint& position, const char *name);
6565
bool MakeLink(const MCCustomPrinterRectangle& area, const char *link, MCCustomPrinterLinkType type);

0 commit comments

Comments
 (0)