MFH: fixed bug #48555 (ImageFTBBox() differs from previous versions for texts with...

diff --git a/ext/gd/libgd/gdft.c b/ext/gd/libgd/gdft.c
index 9c4b9b5293b2f3fa51f75dfd883543de3b74046e..73cbb8dce050a5209a0b4ad87e7042384581aa36 100644 (file)
--- a/ext/gd/libgd/gdft.c
+++ b/ext/gd/libgd/gdft.c
@@ -784,6 +784,7 @@ gdImageStringFTEx (gdImage * im, int *brect, int fg, char *fontlist, double ptsi
        double cos_a = cos (angle);
        int len, i = 0, ch;
        int x1 = 0, y1 = 0;
+       int xb = x, yb = y;
        font_t *font;
        fontkey_t fontkey;
        char *next;
@@ -924,8 +925,8 @@ gdImageStringFTEx (gdImage * im, int *brect, int fg, char *fontlist, double ptsi
                /* carriage returns */
                if (ch == '\r') {
                        penf.x = 0;
-                       x1 = (int)(penf.x * cos_a - penf.y * sin_a + 32) / 64;
-                       y1 = (int)(penf.x * sin_a + penf.y * cos_a + 32) / 64;
+                       x1 = (int)(- penf.y * sin_a + 32) / 64;
+                       y1 = (int)(- penf.y * cos_a + 32) / 64;
                        pen.x = pen.y = 0;
                        previous = 0;           /* clear kerning flag */
                        next++;
@@ -937,8 +938,10 @@ gdImageStringFTEx (gdImage * im, int *brect, int fg, char *fontlist, double ptsi
                        penf.x = 0;
                          penf.y -= (long)(face->size->metrics.height * linespace);
                          penf.y = (penf.y - 32) & -64;         /* round to next pixel row */
-                         x1 = (int)(penf.x * cos_a - penf.y * sin_a + 32) / 64;
-                         y1 = (int)(penf.x * sin_a + penf.y * cos_a + 32) / 64;
+                         x1 = (int)(- penf.y * sin_a + 32) / 64;
+                         y1 = (int)(- penf.y * cos_a + 32) / 64;
+                         xb = x + x1;
+                         yb = y + y1;
                          pen.x = pen.y = 0;
                          previous = 0;         /* clear kerning flag */
                          next++;
@@ -1088,7 +1091,7 @@ gdImageStringFTEx (gdImage * im, int *brect, int fg, char *fontlist, double ptsi
 
                        /* now, draw to our target surface */
                        bm = (FT_BitmapGlyph) image;
-                       gdft_draw_bitmap(tc_cache, im, fg, bm->bitmap, x + x1 + ((pen.x + 31) >> 6) + bm->left, y - y1 + ((pen.y + 31) >> 6) - bm->top);
+                       gdft_draw_bitmap(tc_cache, im, fg, bm->bitmap, x + x1 + ((pen.x + 31) >> 6) + bm->left, y + y1 + ((pen.y + 31) >> 6) - bm->top);
                }
 
                /* record current glyph index for kerning */
@@ -1127,14 +1130,14 @@ gdImageStringFTEx (gdImage * im, int *brect, int fg, char *fontlist, double ptsi
                brect[7] = (int) (normbox.xMin * sin_a + normbox.yMax * cos_a);
 
                /* scale, round and offset brect */
-               brect[0] = x + gdroundupdown(brect[0], d2 > 0);
-               brect[1] = y - gdroundupdown(brect[1], d1 < 0);
-               brect[2] = x + gdroundupdown(brect[2], d1 > 0);
-               brect[3] = y - gdroundupdown(brect[3], d2 > 0);
-               brect[4] = x + gdroundupdown(brect[4], d2 < 0);
-               brect[5] = y - gdroundupdown(brect[5], d1 > 0);
-               brect[6] = x + gdroundupdown(brect[6], d1 < 0);
-               brect[7] = y - gdroundupdown(brect[7], d2 < 0);
+               brect[0] = xb + gdroundupdown(brect[0], d2 > 0);
+               brect[1] = yb - gdroundupdown(brect[1], d1 < 0);
+               brect[2] = xb + gdroundupdown(brect[2], d1 > 0);
+               brect[3] = yb - gdroundupdown(brect[3], d2 > 0);
+               brect[4] = xb + gdroundupdown(brect[4], d2 < 0);
+               brect[5] = yb - gdroundupdown(brect[5], d1 > 0);
+               brect[6] = xb + gdroundupdown(brect[6], d1 < 0);
+               brect[7] = yb - gdroundupdown(brect[7], d2 < 0);
        }
 
        if (tmpstr) {

diff --git a/ext/gd/tests/Tuffy.ttf b/ext/gd/tests/Tuffy.ttf
new file mode 100755 (executable)
index 0000000..8ea6470
Binary files /dev/null and b/ext/gd/tests/Tuffy.ttf differ

diff --git a/ext/gd/tests/bug48555.phpt b/ext/gd/tests/bug48555.phpt
new file mode 100644 (file)
index 0000000..a505f00
--- /dev/null
+++ b/ext/gd/tests/bug48555.phpt
@@ -0,0 +1,18 @@
+--TEST--
+Bug #48555 (ImageFTBBox() differs from previous versions for texts with new lines)
+--SKIPIF--
+<?php
+       if(!extension_loaded('gd')){ die('skip gd extension not available'); }
+?>
+--FILE--
+<?php
+$cwd = dirname(__FILE__);
+$font = "$cwd/Tuffy.ttf";
+$box = ImageFTBBox(13, 0, $font, "Text without line-break");
+echo 'Top without line-break: ' . $box[7] . "\n";
+$box = ImageFTBBox(13, 0, $font, "Text with\nline-break\none more");
+echo 'Top with line-break: ' . $box[7] . "\n";
+?>
+--EXPECTF--
+Top without line-break: -15
+Top with line-break: -15