Le 04/03/2016 00:14, Jean-Marc Lasgouttes a écrit :
Nope.
The attached patch does the trick for me.
THe warnings you see are not the same as Uwe's warnings.
In the meantime I pushed (and then reverted) my patch by mistake.
What about this one?
JMarc
>From 6aad5f2430d8bbeab1a0f5773aadd8646d3af5c0 Mon Sep 17 00:00:00 2001
From: Jean-Marc Lasgouttes <lasgout...@lyx.org>
Date: Mon, 29 Feb 2016 13:06:23 +0100
Subject: [PATCH] Better handling of different int sizes when computing row crc
---
src/ParagraphMetrics.cpp | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/ParagraphMetrics.cpp b/src/ParagraphMetrics.cpp
index ad217cf..5666091 100644
--- a/src/ParagraphMetrics.cpp
+++ b/src/ParagraphMetrics.cpp
@@ -100,13 +100,14 @@ size_t ParagraphMetrics::computeRowSignature(Row const & row,
}
}
+ pos_type const b1[] = { row.sel_beg, row.sel_end };
+ crc.process_bytes(b1, sizeof(b1));
+
Dimension const & d = row.dimension();
- char_type const b[] = { static_cast<char_type>(row.sel_beg),
- static_cast<char_type>(row.sel_end),
- row.begin_margin_sel,
- row.end_margin_sel,
- d.wid, d.asc, d.des };
- crc.process_bytes(b, sizeof(b));
+ int const b2[] = { row.begin_margin_sel,
+ row.end_margin_sel,
+ d.wid, d.asc, d.des };
+ crc.process_bytes(b2, sizeof(b2));
crc.process_bytes(&row.separator, sizeof(row.separator));
return crc.checksum();
--
2.5.0
