Hi Ticker, I am not sure what to do with NodConvert. I think the code is wrong, it fails on NOD with restrictions, but I never use the program so I don't want to invest the time to fix it. @Steve: What do you think? Gerd ________________________________________ Von: mkgmap-dev <mkgmap-dev-bounces@lists.mkgmap.org.uk> im Auftrag von Ticker Berkin <rwb-mkgmap@jagit.co.uk> Gesendet: Montag, 14. Mai 2018 13:29:18 An: Development list for mkgmap Betreff: Re: [mkgmap-dev] methods to write signed / unsigned integers Hi Gerd Another patch I've had hanging around is this. You've already taken a couple of fixes from it and there have been some unrelated changes that impact the same files and a fix to a mistake I made in the previous set of changes (sorry), so I can do another patch if you want. I've tested all the Display main entry points and get the same output. Looking thorough the patch I don't see any mistakes but do see the odd fix, mainly relating to changing signed 3 byte offsets to be unsigned; some of these won't ever have caused a problem because the top bits are used as flags and so get masked out. So, I hope it won't cause any additional problems. Regards Ticker On Tue, 2018-04-24 at 11:37 +0100, Ticker Berkin wrote:
Hi Gerd & Steve
I've done another pass through Display to remove lots of casts and masking.
This required removed the overloading of Displayer.setBytes(byte/char/short/int) by having setBytes1/2/4() to match the existing setBytes3()
DisplayItem.getValue() now returns the same value as fed in with setBytesX(), which also returns this value.
I think Displayer.byteValue(), sByteValue, charValue should be changed to return this same int value, this will allow more casts/masks to be removed.
In this pass I've tried to keep the exact same final output as the version before any of the IO changes. There are a few places that I've marked with %%% where I think the code is wrong, treating something as signed when it isn't.
I don't have any DEM data for testing test.display.DemDisplay but I've done all the other sections.
NodConvert gives Exception in thread "main" java.lang.AssertionError at test.display.NodConvert.pointerPart(NodConvert.java:274) if (first) { assert !newdir; but it did this for me with the pre-io-change version
Regards Ticker
_______________________________________________ mkgmap-dev mailing list mkgmap-dev@lists.mkgmap.org.uk http://www.mkgmap.org.uk/mailman/listinfo/mkgmap-dev
mkgmap-dev mailing list mkgmap-dev@lists.mkgmap.org.uk http://www.mkgmap.org.uk/mailman/listinfo/mkgmap-dev