From 21fbb1d7ed23de67f3a8237139ff154d5da16b08 Mon Sep 17 00:00:00 2001
From: auroux <auroux>
Date: Thu, 27 Mar 2008 22:34:26 +0000
Subject: [PATCH] Bugfixes: release 0.4.2.1.

---
 ChangeLog            | 4 ++++
 NEWS                 | 2 +-
 README               | 2 +-
 configure.in         | 2 +-
 html-doc/manual.html | 9 ++++++++-
 src/TODO             | 9 +++++++++
 src/xo-callbacks.c   | 8 ++++----
 src/xo-paint.c       | 3 ++-
 8 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3d65b56..b7b94e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Version 0.4.2.1 (Mar 27, 2008):
+  - bugfix for #1926757 (crash upon pasting variable-width stroke)
+  - bugfix: set ruler/recognizer setting to default upon switching tools
+
 Version 0.4.2 (Mar 25, 2008):
   - bugfixes for X.org 7.3; allow XInput and core events in reverse order
   - resize selection (patch contributed by Andy Neitzke)
diff --git a/NEWS b/NEWS
index 8adf320..89600d4 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-Version 0.4.2 (March 25, 2008)
+Version 0.4.2.1 (March 27, 2008)
 
 Installation:  see INSTALL
 User's manual: see html-doc/manual.html
diff --git a/README b/README
index 8adf320..89600d4 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-Version 0.4.2 (March 25, 2008)
+Version 0.4.2.1 (March 27, 2008)
 
 Installation:  see INSTALL
 User's manual: see html-doc/manual.html
diff --git a/configure.in b/configure.in
index 66c9057..b85ae36 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 
 AC_INIT(configure.in)
-AM_INIT_AUTOMAKE(xournal, 0.4.2)
+AM_INIT_AUTOMAKE(xournal, 0.4.2.1)
 AM_CONFIG_HEADER(config.h)
 AM_MAINTAINER_MODE
 
diff --git a/html-doc/manual.html b/html-doc/manual.html
index f043617..ce3edc1 100644
--- a/html-doc/manual.html
+++ b/html-doc/manual.html
@@ -24,7 +24,7 @@
   Xournal User's Manual
 </h2>
 <p style="font-size: 0.95em; text-align: center; color: rgb(0,0,0)">
- Version 0.4.2
+ Version 0.4.2.1
 </p>
 <hr />
 <p>
@@ -580,6 +580,13 @@ Bug reports and suggestions can also be submitted on Xournal's
 <a name="changelog"></a>
 <h2 class="subtitle">Version history</h2>
 <p>
+Version 0.4.2.1 (Mar 27, 2008):
+<ul>
+ <li>bugfix for #1926757 (crash upon pasting variable-width stroke)</li>
+ <li>bugfix: set ruler/recognizer setting to default upon switching tools</li>
+</ul>
+</p>
+<p>
 Version 0.4.2 (Mar 25, 2008):
 <ul>
  <li>bugfixes for X.org 7.3; allow XInput and core events in reverse order</li>
diff --git a/src/TODO b/src/TODO
index 0cff969..d73e6dd 100644
--- a/src/TODO
+++ b/src/TODO
@@ -5,6 +5,15 @@ List of features to be implemented (not in any particular order)
 - porting to Win32 and MacOS
 - multiple-scenario undo history
 
+- improve recognizer: two passes for polygons (low tolerance, then higher)
+  to better detect elongated rectangles? (if low tolerance recognizer
+  doesn't get a rectangle, then use higher tolerance for everything else,
+  since otherwise there's too much risk of splitting a segment into 2)
+- snap-to-grid (also for ruler & recognizer vertices)
+  and maybe also snap-to-vertices (option for ruler and recognizer)?
+- allow broken PDF with some 19-byte xref entries (LF instead of CRLF).??
+  (Phil Rhoades 3/25/08)
+
 - render page to bitmap: for export, preview, and copy-paste
     (render using libart, see how gnomecanvas does it?)
     (copy-paste: config option to render only current layer or all below?)
diff --git a/src/xo-callbacks.c b/src/xo-callbacks.c
index 9b1e85b..d52b476 100644
--- a/src/xo-callbacks.c
+++ b/src/xo-callbacks.c
@@ -1698,8 +1698,8 @@ on_toolsPen_activate                   (GtkMenuItem     *menuitem,
   reset_selection();
   ui.toolno[0] = TOOL_PEN;
   ui.cur_brush = &(ui.brushes[0][TOOL_PEN]);
-  ui.cur_brush->ruler = FALSE;
-  ui.cur_brush->recognizer = FALSE;
+  ui.cur_brush->ruler = ui.default_brushes[TOOL_PEN].ruler;
+  ui.cur_brush->recognizer = ui.default_brushes[TOOL_PEN].recognizer;
   update_mapping_linkings(TOOL_PEN);
   update_tool_buttons();
   update_tool_menu();
@@ -1756,8 +1756,8 @@ on_toolsHighlighter_activate           (GtkMenuItem     *menuitem,
   reset_selection();
   ui.toolno[0] = TOOL_HIGHLIGHTER;
   ui.cur_brush = &(ui.brushes[0][TOOL_HIGHLIGHTER]);
-  ui.cur_brush->ruler = FALSE;
-  ui.cur_brush->recognizer = FALSE;
+  ui.cur_brush->ruler = ui.default_brushes[TOOL_HIGHLIGHTER].ruler;
+  ui.cur_brush->recognizer = ui.default_brushes[TOOL_HIGHLIGHTER].recognizer;
   update_mapping_linkings(TOOL_HIGHLIGHTER);
   update_tool_buttons();
   update_tool_menu();
diff --git a/src/xo-paint.c b/src/xo-paint.c
index 7909941..47fd613 100644
--- a/src/xo-paint.c
+++ b/src/xo-paint.c
@@ -608,6 +608,7 @@ gboolean start_resizesel(GdkEvent *event)
     ui.selection->new_x1 = ui.selection->bbox.left;
     ui.selection->new_x2 = ui.selection->bbox.right;
     gnome_canvas_item_set(ui.selection->canvas_item, "dash", NULL, NULL);
+    update_cursor_for_resize(pt);
     return TRUE;
   }
   return FALSE;
@@ -1045,7 +1046,7 @@ void clipboard_paste(void)
       }
       p+= 2*item->path->num_points*sizeof(double);
       if (item->brush.variable_width) {
-        g_memmove(p, item->widths, (item->path->num_points-1)*sizeof(double));
+        item->widths = g_memdup(p, (item->path->num_points-1)*sizeof(double));
         p+= (item->path->num_points-1)*sizeof(double);
       }
       else item->widths = NULL;
-- 
2.39.5