Fix lost hard linebreaks in libass by repeating the loop when both soft and

hard linebreaks are about to be added.

Original message:
http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/2007-April/050876.html

Patch by Jindrich Makovicka /makovick gmail com/

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22931 b3059339-0415-0410-9bf9-f77b7e298cf2

diff --git a/libass/ass_render.c b/libass/ass_render.c
index 4532cab9717b411a5814fd6b1cef519883bc3950..a757c2d4dac1fffaa7e396de5e6a2798f7eb5666 100644 (file)
--- a/libass/ass_render.c
+++ b/libass/ass_render.c
@@ -1385,6 +1385,11 @@ static void wrap_lines_smart(int max_text_width)
                
                if (cur->symbol == ' ')
                        last_space = i;
+
+               // make sure the hard linebreak is not forgotten when
+               // there was a new soft linebreak just inserted
+               if (cur->symbol == '\n' && break_type == 1)
+                       i--;
        }
 #define DIFF(x,y) (((x) < (y)) ? (y - x) : (x - y))
        exit = 0;