Package: nautic
Version: 1.5-1.1
Followup-For: Bug #811740
Dear Maintainer,
I'm just a passer, but because I also solves the same problem
in another project, I prepared a draft patch.
Maybe it could be useful.
Cheers
--
Slavek
-- System Information:
Debian Release: stretch/sid
APT prefers testing
APT policy: (500, 'testing')
Architecture: amd64 (x86_64)
Kernel: Linux 3.16.0-4-amd64 (SMP w/6 CPU cores)
Locale: LANG=C, LC_CTYPE=C (charmap=ANSI_X3.4-1968) (ignored: LC_ALL set to C)
Shell: /bin/sh linked to /bin/dash
Init: unable to detect
Index: b/moon.h
===================================================================
--- a/moon.h
+++ b/moon.h
@@ -1,5 +1,5 @@
/*
-
+
moon.h bitmaps of moon and cursors
Copyright (C) 2011 Enas Giovanni <[email protected]>
@@ -23,7 +23,7 @@
#ifndef __MOON_H
#define __MOON_H
- static char full_moon_bits[] = {
+static unsigned char full_moon_bits[] = {
0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0xf8,0xff,0xff,0x03,
0xe0,0xff,0xff,0x01,0xc0,0xff,0xff,0x00,0x80,0xff,0x7f,0x00,0x01,0xff,0x7f,
@@ -34,8 +34,8 @@
0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff };
-static char full_moon_mask[] = {
-0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+static unsigned char full_moon_mask[] = {
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0xf8,0xff,0xff,0x03,0xe0,0xff,0xff,0x01,
0xc0,0xff,0xff,0x00,0x80,0xff,0x7f,0x00,0x00,0xff,0x3f,0x00,0x00,0xfe,0x3f,
0x00,0x00,0xfe,0x1f,0x00,0x00,0xfc,0x1f,0x00,0x00,0xfc,0x1f,0x00,0x00,0xfc,
@@ -45,8 +45,8 @@
0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff };
- static char moon_1_bits[] = {
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+static unsigned char moon_1_bits[] = {
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00,
0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x24, 0x00, 0x00, 0x00, 0x48, 0x00,
0x00, 0x00, 0x88, 0x00, 0x00, 0x00, 0x10, 0x01, 0x00, 0x00, 0x30, 0x01,
@@ -58,7 +58,7 @@
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
-static char moon_1_mask[] = {
+static unsigned char moon_1_mask[] = {
0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xf8,0xff,0xff,0xff,0xe1,0xff,0xff,0xff,
0xc3,0xff,0xff,0xff,0x87,0xff,0xff,0xff,0x07,0xff,0xff,0xff,0x0f,0xfe,0xff,
@@ -71,7 +71,7 @@
-static char moon_half_bits[] = {
+static unsigned char moon_half_bits[] = {
0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xf8,0xff,0xff,0xff,
0xe0,0xff,0xff,0xff,0xc0,0xff,0xff,0xff,0x80,0xff,0xff,0xff,0x01,0xff,0xff,
@@ -82,7 +82,7 @@
0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff };
-static char moon_half_mask[] = {
+static unsigned char moon_half_mask[] = {
0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
0xff,0xff,0xff,0xff,0xff,0xff,0x7f,0xf8,0xff,0xff,0x7f,0xe0,0xff,0xff,0x7f,
0xc0,0xff,0xff,0x7f,0x80,0xff,0xff,0x7f,0x00,0xff,0xff,0x7f,0x00,0xfe,0xff,
@@ -93,7 +93,7 @@
0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff };
-static char moon_ebb_bits[] = {
+static unsigned char moon_ebb_bits[] = {
0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0xf8,0xff,0xff,0x1f,
0xe0,0xff,0xff,0x0f,0xc0,0xff,0xff,0x07,0x80,0xff,0xff,0x07,0x01,0xff,0xff,
@@ -104,7 +104,7 @@
0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff };
-static char moon_ebb_mask[] = {
+static unsigned char moon_ebb_mask[] = {
0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0xf8,0xff,0xff,0x1f,0xe0,0xff,0xff,0x0f,
0xc0,0xff,0xff,0x07,0x80,0xff,0xff,0x03,0x00,0xff,0xff,0x03,0x00,0xfe,0xff,
@@ -115,8 +115,8 @@
0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff };
- static char moon_ebb_C_bits[] = {
-0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+static unsigned char moon_ebb_C_bits[] = {
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0xff,0xff,0xff,0x03,
0xfe,0xff,0xff,0x01,0xfc,0xff,0xff,0x00,0xfc,0xff,0x7f,0x00,0xf9,0xff,0x7f,
0x08,0xf9,0xff,0x3f,0x00,0xf8,0xff,0x3f,0x00,0xf0,0xff,0x3f,0x00,0xf0,0xff,
@@ -127,8 +127,8 @@
0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff };
- static char moon_ebb_C_mask[] = {
-0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+static unsigned char moon_ebb_C_mask[] = {
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0xfe,0xff,0xff,0x03,0xfe,0xff,0xff,0x01,
0xfc,0xff,0xff,0x00,0xf8,0xff,0x7f,0x00,0xf8,0xff,0x3f,0x00,0xf0,0xff,0x3f,
0x00,0xf0,0xff,0x1f,0x00,0xe0,0xff,0x1f,0x00,0xe0,0xff,0x1f,0x00,0xe0,0xff,
@@ -138,7 +138,7 @@
0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff };
- static char moon_half_C_bits[] = {
+static unsigned char moon_half_C_bits[] = {
0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x8f,0xff,0xff,0xff,0x83,
0xff,0xff,0xff,0x81,0xff,0xff,0xff,0x80,0xff,0xff,0x7f,0x80,0xff,0xff,0x7f,
@@ -149,7 +149,7 @@
0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff };
-static char moon_half_C_mask[] = {
+static unsigned char moon_half_C_mask[] = {
0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0xff,0xff,0xff,0x03,0xff,0xff,0xff,0x01,
0xff,0xff,0xff,0x00,0xff,0xff,0x7f,0x00,0xff,0xff,0x3f,0x00,0xff,0xff,0x3f,
@@ -160,8 +160,8 @@
0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff };
-static char moon_last_bits[] = {
-0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+static unsigned char moon_last_bits[] = {
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xef,0xff,0xff,0xff,0xf3,
0xff,0xff,0xff,0xf9,0xff,0xff,0xff,0xf8,0xff,0xff,0x7f,0xfc,0xff,0xff,0x7f,
0xfc,0xff,0xff,0x3f,0xfe,0xff,0xff,0x3f,0xfe,0xff,0xff,0x3f,0xfe,0xff,0xff,
@@ -172,8 +172,8 @@
0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff };
-static char moon_last_mask[] = {
-0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+static unsigned char moon_last_mask[] = {
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
0xff,0xff,0xff,0xff,0xff,0xff,0x8f,0xff,0xff,0xff,0xc3,0xff,0xff,0xff,0xe1,
0xff,0xff,0xff,0xf0,0xff,0xff,0x7f,0xf0,0xff,0xff,0x3f,0xf8,0xff,0xff,0x3f,
0xf8,0xff,0xff,0x1f,0xfc,0xff,0xff,0x1f,0xfc,0xff,0xff,0x1f,0xfc,0xff,0xff,
@@ -184,8 +184,8 @@
0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff };
-static char moon_new_bits[] = {
-0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+static unsigned char moon_new_bits[] = {
+ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0xf8,0xff,0xff,0xf3,0xe7,0xff,0xff,0xfd,
0xdf,0xff,0xff,0xfe,0xbf,0xff,0x7f,0xff,0x7f,0xff,0xbf,0xff,0xff,0xfe,0xbf,
0xff,0xff,0xfe,0xdf,0xff,0xff,0xfd,0xdf,0xff,0xff,0xfd,0xdf,0xff,0xff,0xfd,
@@ -196,7 +196,7 @@
0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff };
-static char moon_new_mask[] = {
+static unsigned char moon_new_mask[] = {
0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0xf8,0xff,0xff,0xf3,0xe7,0xff,0xff,0xfd,
0xdf,0xff,0xff,0xfe,0xbf,0xff,0x7f,0xff,0x7f,0xff,0xbf,0xff,0xff,0xfe,0xbf,
@@ -208,8 +208,8 @@
0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff };
-static char close_hand_bits[] = {
-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+static unsigned char close_hand_bits[] = {
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1b,0x00,0x00,0xe0,
0x24,0x00,0x00,0x90,0x64,0x00,0x00,0x10,0xa0,0x00,0x00,0x20,0x80,0x00,0x00,
0x30,0x80,0x00,0x00,0x08,0x80,0x00,0x00,0x08,0x40,0x00,0x00,0x10,0x40,0x00,
@@ -220,7 +220,7 @@
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 };
-static char close_hand_mask[] = {
+static unsigned char close_hand_mask[] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1b,0x00,0x00,0xe0,
0x3f,0x00,0x00,0xf0,0x7f,0x00,0x00,0xf0,0xff,0x00,0x00,0xe0,0xff,0x00,0x00,
@@ -234,8 +234,8 @@
-static char open_hand_bits[] = {
-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+static unsigned char open_hand_bits[] = {
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x96,0x03,0x00,0x00,0x99,
0x04,0x00,0x00,0x99,0x14,0x00,0x00,0x92,0x2c,0x00,0x00,0x92,0x24,0x00,0x80,
0x05,0x24,0x00,0x40,0x06,0x20,0x00,0x40,0x04,0x10,0x00,0x80,0x00,0x10,0x00,
@@ -246,8 +246,8 @@
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 };
- static char open_hand_mask[] = {
-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+static unsigned char open_hand_mask[] = {
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0xf6,0x03,0x00,0x00,0xff,
0x07,0x00,0x00,0xff,0x17,0x00,0x00,0xfe,0x3f,0x00,0x00,0xfe,0x3f,0x00,0x80,
0xfd,0x3f,0x00,0xc0,0xff,0x3f,0x00,0xc0,0xff,0x1f,0x00,0x80,0xff,0x1f,0x00,
@@ -258,4 +258,4 @@
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 };
- #endif
+#endif
Index: b/src/plot_dialog.cpp
===================================================================
--- a/src/plot_dialog.cpp
+++ b/src/plot_dialog.cpp
@@ -1,5 +1,5 @@
/*
-
+
Plot_dialog.cpp implementation of plotting dialog
Copyright (C) 2011 Enas Giovanni <[email protected]>
@@ -62,10 +62,10 @@
//////////////////cursors/////////////////////////////////////
#ifdef __WXMSW__
- wxBitmap open_bitmap(open_hand_bits, 32, 32);
- wxBitmap open_mask_bitmap(open_hand_mask, 32, 32);
- wxBitmap close_bitmap(close_hand_bits, 32, 32);
- wxBitmap close_mask_bitmap(close_hand_mask, 32, 32);
+ wxBitmap open_bitmap((char*)open_hand_bits, 32, 32);
+ wxBitmap open_mask_bitmap((char*)open_hand_mask, 32, 32);
+ wxBitmap close_bitmap((char*)close_hand_bits, 32, 32);
+ wxBitmap close_mask_bitmap((char*)close_hand_mask, 32, 32);
open_bitmap.SetMask(new wxMask(open_mask_bitmap));
close_bitmap.SetMask(new wxMask(close_mask_bitmap));
@@ -80,10 +80,10 @@
open_cursor = wxCursor(open_hand_image);
close_cursor = wxCursor(close_hand_image);
#else
- open_cursor = wxCursor(open_hand_bits, 32, 32,
- 6, 14, open_hand_mask,wxBLACK, wxWHITE);
- close_cursor = wxCursor(close_hand_bits, 32, 32,
- 6, 14, close_hand_mask,wxBLACK, wxWHITE);
+ open_cursor = wxCursor((char*)open_hand_bits, 32, 32,
+ 6, 14, (char*)open_hand_mask,wxBLACK, wxWHITE);
+ close_cursor = wxCursor((char*)close_hand_bits, 32, 32,
+ 6, 14, (char*)close_hand_mask,wxBLACK, wxWHITE);
#endif
// Connect Events
@@ -327,29 +327,29 @@
void Plot_dialog::Draw_moon(wxPaintDC * dc, wxPoint point, double altitude, double GHA)
{
- wxBitmap full_btm(full_moon_bits, 32, 32);
- wxBitmap full_mask(full_moon_mask, 32, 32);
+ wxBitmap full_btm((char*)full_moon_bits, 32, 32);
+ wxBitmap full_mask((char*)full_moon_mask, 32, 32);
full_btm.SetMask(new wxMask(full_mask));
- wxBitmap moon_1(moon_1_bits, 32, 32);
- wxBitmap mask_1(moon_1_mask, 32, 32);
+ wxBitmap moon_1((char*)moon_1_bits, 32, 32);
+ wxBitmap mask_1((char*)moon_1_mask, 32, 32);
moon_1.SetMask(new wxMask(mask_1));
- wxBitmap moon_half(moon_half_bits, 32, 32);
- wxBitmap mask_half(moon_half_mask, 32, 32);
+ wxBitmap moon_half((char*)moon_half_bits, 32, 32);
+ wxBitmap mask_half((char*)moon_half_mask, 32, 32);
moon_half.SetMask(new wxMask(mask_half));
- wxBitmap moon_ebb(moon_ebb_bits, 32, 32);
- wxBitmap ebb_mask(moon_ebb_mask, 32, 32);
+ wxBitmap moon_ebb((char*)moon_ebb_bits, 32, 32);
+ wxBitmap ebb_mask((char*)moon_ebb_mask, 32, 32);
moon_ebb.SetMask(new wxMask(ebb_mask));
- wxBitmap moon_ebb_C(moon_ebb_C_bits, 32, 32);
- wxBitmap ebb_mask_C(moon_ebb_C_mask, 32, 32);
+ wxBitmap moon_ebb_C((char*)moon_ebb_C_bits, 32, 32);
+ wxBitmap ebb_mask_C((char*)moon_ebb_C_mask, 32, 32);
moon_ebb_C.SetMask(new wxMask(ebb_mask_C));
- wxBitmap moon_half_C(moon_half_C_bits, 32, 32);
- wxBitmap half_mask_C(moon_half_C_mask, 32, 32);
+ wxBitmap moon_half_C((char*)moon_half_C_bits, 32, 32);
+ wxBitmap half_mask_C((char*)moon_half_C_mask, 32, 32);
moon_half_C.SetMask(new wxMask(half_mask_C));
- wxBitmap moon_last(moon_last_bits, 32, 32);
- wxBitmap last_mask(moon_last_mask, 32, 32);
+ wxBitmap moon_last((char*)moon_last_bits, 32, 32);
+ wxBitmap last_mask((char*)moon_last_mask, 32, 32);
moon_last.SetMask(new wxMask(last_mask));
- wxBitmap moon_new(moon_new_bits, 32, 32);
- wxBitmap new_mask(moon_new_mask, 32, 32);
+ wxBitmap moon_new((char*)moon_new_bits, 32, 32);
+ wxBitmap new_mask((char*)moon_new_mask, 32, 32);
moon_new.SetMask(new wxMask(new_mask));
/////////////////difference of GHA moon and sun///////////for elongation////////////
