From 5d291dae7d6e036b4c67986f94cfcfe66ddf0905 Mon Sep 17 00:00:00 2001
From: Hermann Kraus <hermr2d2@gmail.com>
Date: Sat, 12 Oct 2013 02:34:07 +0200
Subject: [PATCH] Proper bounds checking for line break positions. Closes
 #2037.

---
 src/text/layout.cpp                           |  16 ++--
 ...xt-bug2037-800-300-1.0-grid-reference.json |  87 ++++++++++++++++++
 ...text-bug2037-800-300-1.0-agg-reference.png | Bin 0 -> 3474 bytes
 ...xt-bug2037-800-300-1.0-cairo-reference.png | Bin 0 -> 2721 bytes
 ...text-bug2037-800-300-2.0-agg-reference.png | Bin 0 -> 9074 bytes
 ...xt-bug2037-800-300-2.0-cairo-reference.png | Bin 0 -> 7797 bytes
 tests/visual_tests/styles/text-bug2037.xml    |  16 +++-
 7 files changed, 109 insertions(+), 10 deletions(-)
 create mode 100644 tests/visual_tests/grids/text-bug2037-800-300-1.0-grid-reference.json
 create mode 100644 tests/visual_tests/images/text-bug2037-800-300-1.0-agg-reference.png
 create mode 100644 tests/visual_tests/images/text-bug2037-800-300-1.0-cairo-reference.png
 create mode 100644 tests/visual_tests/images/text-bug2037-800-300-2.0-agg-reference.png
 create mode 100644 tests/visual_tests/images/text-bug2037-800-300-2.0-cairo-reference.png

diff --git a/src/text/layout.cpp b/src/text/layout.cpp
index 732cef1f7..61b99387b 100644
--- a/src/text/layout.cpp
+++ b/src/text/layout.cpp
@@ -95,7 +95,7 @@ void text_layout::break_line(text_line_ptr line, double wrap_width, unsigned tex
     breakitr->setText(text);
 
     double current_line_length = 0;
-    unsigned last_break_position = 0;
+    unsigned last_break_position = line->first_char();
     for (unsigned i=line->first_char(); i<line->last_char(); i++)
     {
         //TODO: character_spacing
@@ -109,11 +109,8 @@ void text_layout::break_line(text_line_ptr line, double wrap_width, unsigned tex
 
 
         unsigned break_position = wrap_before ? breakitr->preceding(i) : breakitr->following(i);
-        /* Break iterator operates on the whole string, while we only look at one line. So we need to
-         * clamp break values. */
-        if (break_position < line->first_char()) break_position = line->first_char();
-        if (break_position > line->last_char()) break_position = line->last_char();
-
+        /* following() returns a break position after the last word. So DONE should only be returned
+         * when calling preceding. */
         if (break_position <= last_break_position || break_position == BreakIterator::DONE)
         {
             //A single word is longer than the maximum line width.
@@ -125,6 +122,11 @@ void text_layout::break_line(text_line_ptr line, double wrap_width, unsigned tex
                 MAPNIK_LOG_WARN(text_layout) << "Unexpected result in break_line. Trying to recover...\n";
             }
         }
+        /* Break iterator operates on the whole string, while we only look at one line. So we need to
+         * clamp break values. */
+        if (break_position < line->first_char()) break_position = line->first_char();
+        if (break_position > line->last_char()) break_position = line->last_char();
+
         text_line_ptr new_line = boost::make_shared<text_line>(last_break_position, break_position);
         clear_cluster_widths(last_break_position, break_position);
         shape_text(new_line);
@@ -133,7 +135,7 @@ void text_layout::break_line(text_line_ptr line, double wrap_width, unsigned tex
         i = break_position - 1;
         current_line_length = 0;
     }
-    if (last_break_position == 0)
+    if (last_break_position == line->first_char())
     {
         //No line breaks => no reshaping required
         add_line(line);
diff --git a/tests/visual_tests/grids/text-bug2037-800-300-1.0-grid-reference.json b/tests/visual_tests/grids/text-bug2037-800-300-1.0-grid-reference.json
new file mode 100644
index 000000000..270ee2c4b
--- /dev/null
+++ b/tests/visual_tests/grids/text-bug2037-800-300-1.0-grid-reference.json
@@ -0,0 +1,87 @@
+{
+ "keys": [
+  "", 
+  "7", 
+  "3", 
+  "4", 
+  "8"
+ ], 
+ "data": {}, 
+ "grid": [
+  "                                                                                                                                                                                                        ", 
+  "                                                                                                                                                                                                        ", 
+  "                                                                                                                                                                                                        ", 
+  "                                                                                                                                                                                                        ", 
+  "                                                                                                                                                                                                        ", 
+  "                                                                                                                                                                                                        ", 
+  "                                                                                                                                                                                                        ", 
+  "                                                                                                                                                                                                        ", 
+  "                                                                                                                                                                                                        ", 
+  "                                                                                                                                                                                                        ", 
+  "                                                                                                                                                                                                        ", 
+  "                                                                                                                                                                                                        ", 
+  "                                                                                                                                                                                                        ", 
+  "                                                                                                                                                                                                        ", 
+  "                                                                                                                                                                                                        ", 
+  "                                                                                                                                                                                                        ", 
+  "                                                                                                                                                                                                        ", 
+  "                                                                                                                                                                                                        ", 
+  "                                                                                                                                                                                                        ", 
+  "                                                                                                                                                                                                        ", 
+  "                                                                                                                                                                                                        ", 
+  "                                                                                                                                                                                                        ", 
+  "                                                                                                                                                                                                        ", 
+  "                                                                                                                                                                                                        ", 
+  "                                                                                                                                                                                                        ", 
+  "                                                                                                                                                                                                        ", 
+  "                                                                                                                                                                                                        ", 
+  "                                                                                                                                                                                                        ", 
+  "                                                                                                                                                                                                        ", 
+  "                                                                                                                                                                                                        ", 
+  "                                                                                                                                                                                                        ", 
+  "                                                                                                                            ! !!!!!!!!!!                                                                ", 
+  "                                               ## ####             $$ $$$$                                                  !!!!  !  !!!                                                                ", 
+  "                                               ######              $$$$$$                                                          !            %%     %                                                ", 
+  "                                                  #                   $                                                          !!!             % % %%%%%%                                             ", 
+  "                                               ## #                $$ $                                                                                                                                 ", 
+  "                                                #                   $                                                            !!!!            %%%%% %%%%                                             ", 
+  "                                               # ## ##             $ $$ $$                                                      !! !!              %%%  %%                                              ", 
+  "                                               ## # ##             $$ $ $$                                                     !     !             %     %                                              ", 
+  "                                                                                                                                 ! !!!               % %%%                                              ", 
+  "                                                ### #               $$$ $                                                                                                                               ", 
+  "                                                                                                                                !!!!            % %% % %%%%%                                            ", 
+  "                                                ### #               $$$ $                                                       !!!!            % %% %  %%%%                                            ", 
+  "                                                 ####                $$$$                                                                                                                               ", 
+  "                                                                                                                                !!!!!!                                                                  ", 
+  "                                                                                                                                                                                                        ", 
+  "                                                                                                                                                                                                        ", 
+  "                                                                                                                                                                                                        ", 
+  "                                                                                                                                                                                                        ", 
+  "                                                                                                                                                                                                        ", 
+  "                                                                                                                                                                                                        ", 
+  "                                                                                                                                                                                                        ", 
+  "                                                                                                                                                                                                        ", 
+  "                                                                                                                                                                                                        ", 
+  "                                                                                                                                                                                                        ", 
+  "                                                                                                                                                                                                        ", 
+  "                                                                                                                                                                                                        ", 
+  "                                                                                                                                                                                                        ", 
+  "                                                                                                                                                                                                        ", 
+  "                                                                                                                                                                                                        ", 
+  "                                                                                                                                                                                                        ", 
+  "                                                                                                                                                                                                        ", 
+  "                                                                                                                                                                                                        ", 
+  "                                                                                                                                                                                                        ", 
+  "                                                                                                                                                                                                        ", 
+  "                                                                                                                                                                                                        ", 
+  "                                                                                                                                                                                                        ", 
+  "                                                                                                                                                                                                        ", 
+  "                                                                                                                                                                                                        ", 
+  "                                                                                                                                                                                                        ", 
+  "                                                                                                                                                                                                        ", 
+  "                                                                                                                                                                                                        ", 
+  "                                                                                                                                                                                                        ", 
+  "                                                                                                                                                                                                        ", 
+  "                                                                                                                                                                                                        "
+ ]
+}
\ No newline at end of file
diff --git a/tests/visual_tests/images/text-bug2037-800-300-1.0-agg-reference.png b/tests/visual_tests/images/text-bug2037-800-300-1.0-agg-reference.png
new file mode 100644
index 0000000000000000000000000000000000000000..35327336b4aac492ab4b683bf0b1eb96231970ab
GIT binary patch
literal 3474
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

literal 0
HcmV?d00001

diff --git a/tests/visual_tests/images/text-bug2037-800-300-1.0-cairo-reference.png b/tests/visual_tests/images/text-bug2037-800-300-1.0-cairo-reference.png
new file mode 100644
index 0000000000000000000000000000000000000000..5fdc79f4abf86cc68735d3f5448c9771c18b7c16
GIT binary patch
literal 2721
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
R**UGkjz=78{_Evi{{)};=QIES

literal 0
HcmV?d00001

diff --git a/tests/visual_tests/images/text-bug2037-800-300-2.0-agg-reference.png b/tests/visual_tests/images/text-bug2037-800-300-2.0-agg-reference.png
new file mode 100644
index 0000000000000000000000000000000000000000..67d0adb3e7f82595f67886b1f2d3e0982fa567f7
GIT binary patch
literal 9074
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
avir_yPUmgFBtOsWxp@tIwes@skNzKwR%2EG

literal 0
HcmV?d00001

diff --git a/tests/visual_tests/images/text-bug2037-800-300-2.0-cairo-reference.png b/tests/visual_tests/images/text-bug2037-800-300-2.0-cairo-reference.png
new file mode 100644
index 0000000000000000000000000000000000000000..f8aa12c284277a8c31465882536ca3ff2c5d6026
GIT binary patch
literal 7797
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
PrL3<)elEXqEAhVpZb0yx

literal 0
HcmV?d00001

diff --git a/tests/visual_tests/styles/text-bug2037.xml b/tests/visual_tests/styles/text-bug2037.xml
index 8244ff0d9..5e95076a6 100644
--- a/tests/visual_tests/styles/text-bug2037.xml
+++ b/tests/visual_tests/styles/text-bug2037.xml
@@ -10,11 +10,21 @@
     </Layer>
     <Style name="My Style">
         <Rule>
-            <PointSymbolizer/>
+            <Filter>[nr] = 3</Filter>
+            <TextSymbolizer wrap-width="20" face-name="DejaVu Sans Book" size="9"  wrap-before="true">"abcdef&#10;ghijkl&#10;mnopq&#10;stuv&#10;wxyz"</TextSymbolizer>
         </Rule>
         <Rule>
-            <Filter>[nr] = 5</Filter>
-            <TextSymbolizer wrap-width="20" face-name="DejaVu Sans Book" size="9" allow-overlap="true">"xxxxxx&#10;xxxxxx"</TextSymbolizer>
+            <Filter>[nr] = 4</Filter>
+            <TextSymbolizer wrap-width="20" face-name="DejaVu Sans Book" size="9" wrap-before="false">"abcdef&#10;ghijkl&#10;mnopq&#10;stuv&#10;wxyz"</TextSymbolizer>
         </Rule>
+        <Rule>
+            <Filter>[nr] = 7</Filter>
+            <TextSymbolizer wrap-width="30" face-name="DejaVu Sans Book" size="9" wrap-before="true">"Some test text with&#10;forced&#10;line breaks"</TextSymbolizer>
+        </Rule>
+        <Rule>
+            <Filter>[nr] = 8</Filter>
+            <TextSymbolizer wrap-width="30" face-name="DejaVu Sans Book" size="9" wrap-before="false">"Some test text with&#10;forced&#10;line breaks"</TextSymbolizer>
+        </Rule>
+
     </Style>
 </Map>
\ No newline at end of file