]> git.pld-linux.org Git - packages/dx.git/blob - dx-narrowing.patch
- fixed more C++ issues (added narrowing,conversion patches)
[packages/dx.git] / dx-narrowing.patch
1 --- dx-4.4.4/src/uipp/dxuilib/ticks_in.bm.orig  1999-03-24 16:17:49.000000000 +0100
2 +++ dx-4.4.4/src/uipp/dxuilib/ticks_in.bm       2018-05-15 22:10:49.143478556 +0200
3 @@ -1,6 +1,6 @@
4  #define ticks_in_width 18
5  #define ticks_in_height 16
6 -static char ticks_in_bits[] = {
7 +static unsigned char ticks_in_bits[] = {
8     0x02, 0x00, 0x00, 0x02, 0x00, 0x00, 0x02, 0x00, 0x00, 0x02, 0x00, 0x00,
9     0x02, 0x00, 0x00, 0x02, 0x00, 0x00, 0x02, 0x00, 0x00, 0x82, 0x20, 0x00,
10     0x82, 0x20, 0x00, 0x92, 0x24, 0x01, 0x92, 0x24, 0x01, 0x92, 0x24, 0x01,
11 --- dx-4.4.4/src/uipp/dxuilib/ticks_out.bm.orig 1999-03-24 16:17:49.000000000 +0100
12 +++ dx-4.4.4/src/uipp/dxuilib/ticks_out.bm      2018-05-15 22:11:12.988070732 +0200
13 @@ -1,6 +1,6 @@
14  #define ticks_out_width 18
15  #define ticks_out_height 16
16 -static char ticks_out_bits[] = {
17 +static unsigned char ticks_out_bits[] = {
18     0x02, 0x00, 0x00, 0x02, 0x00, 0x00, 0x02, 0x00, 0x00, 0x02, 0x00, 0x00,
19     0x02, 0x00, 0x00, 0x02, 0x00, 0x00, 0x02, 0x00, 0x00, 0x02, 0x00, 0x00,
20     0x02, 0x00, 0x00, 0x02, 0x00, 0x00, 0xfe, 0xff, 0x03, 0x24, 0x49, 0x02,
21 --- dx-4.4.4/src/uipp/dxuilib/ticks_in_ins.bm.orig      1999-03-24 16:17:49.000000000 +0100
22 +++ dx-4.4.4/src/uipp/dxuilib/ticks_in_ins.bm   2018-05-15 22:11:28.128870621 +0200
23 @@ -1,6 +1,6 @@
24  #define ticks_in_ins_width 18
25  #define ticks_in_ins_height 16
26 -static char ticks_in_ins_bits[] = {
27 +static unsigned char ticks_in_ins_bits[] = {
28     0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,
29     0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,
30     0x82, 0x20, 0x00, 0x10, 0x04, 0x01, 0x82, 0x20, 0x00, 0x10, 0x04, 0x01,
31 --- dx-4.4.4/src/uipp/dxuilib/ticks_out_ins.bm.orig     1999-03-24 16:17:49.000000000 +0100
32 +++ dx-4.4.4/src/uipp/dxuilib/ticks_out_ins.bm  2018-05-15 22:11:40.539526276 +0200
33 @@ -1,6 +1,6 @@
34  #define ticks_out_ins_width 18
35  #define ticks_out_ins_height 16
36 -static char ticks_out_ins_bits[] = {
37 +static unsigned char ticks_out_ins_bits[] = {
38     0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,
39     0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,
40     0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0xaa, 0xaa, 0x02, 0x04, 0x41, 0x00,
41 --- dx-4.4.4/src/uipp/dxuilib/AutoAxesDialog.C.orig     2003-09-26 17:49:12.000000000 +0200
42 +++ dx-4.4.4/src/uipp/dxuilib/AutoAxesDialog.C  2018-05-15 22:15:05.863706893 +0200
43 @@ -1791,16 +1791,16 @@
44             XmNdepth, &depth, XmNscreen, &scr, NULL);
45         Pixel fg = BlackPixelOfScreen(scr);
46         AutoAxesDialog::TicksIn = XCreatePixmapFromBitmapData (XtDisplay(root), 
47 -           XtWindow(root), ticks_in_bits, ticks_in_width, ticks_in_height,
48 +           XtWindow(root), (char *)ticks_in_bits, ticks_in_width, ticks_in_height,
49             fg, bg, depth);
50         AutoAxesDialog::TicksOut = XCreatePixmapFromBitmapData (XtDisplay(root), 
51 -           XtWindow(root), ticks_out_bits, ticks_out_width, ticks_out_height,
52 +           XtWindow(root), (char *)ticks_out_bits, ticks_out_width, ticks_out_height,
53             fg, bg, depth);
54         AutoAxesDialog::TicksInGrey = XCreatePixmapFromBitmapData (XtDisplay(root), 
55 -           XtWindow(root), ticks_in_ins_bits, ticks_in_ins_width, ticks_in_ins_height,
56 +           XtWindow(root), (char *)ticks_in_ins_bits, ticks_in_ins_width, ticks_in_ins_height,
57             fg, bg, depth);
58         AutoAxesDialog::TicksOutGrey = XCreatePixmapFromBitmapData (XtDisplay(root), 
59 -           XtWindow(root),ticks_out_ins_bits, ticks_out_ins_width, ticks_out_ins_height,
60 +           XtWindow(root), (char *)ticks_out_ins_bits, ticks_out_ins_width, ticks_out_ins_height,
61             fg, bg, depth);
62  
63  
64 --- dx-4.4.4/src/uipp/dxuilib/anchor.bm.orig    1999-03-24 16:17:49.000000000 +0100
65 +++ dx-4.4.4/src/uipp/dxuilib/anchor.bm 2018-05-16 05:25:49.102454052 +0200
66 @@ -2,7 +2,7 @@
67  #define anchor_height 17
68  #define anchor_x_hot -1
69  #define anchor_y_hot -1
70 -static char anchor_bits[] = {
71 +static unsigned char anchor_bits[] = {
72     0x80, 0x03, 0x00, 0x40, 0x05, 0x00, 0xc0, 0x02, 0x00, 0x40, 0x05, 0x00,
73     0x80, 0x02, 0x00, 0x10, 0x11, 0x00, 0x30, 0x09, 0x00, 0x50, 0x15, 0x00,
74     0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x83, 0x82, 0x00, 0x85, 0x41, 0x01,
75 --- dx-4.4.4/src/uipp/dxuilib/DXWindow.C.orig   2006-06-29 20:21:22.000000000 +0200
76 +++ dx-4.4.4/src/uipp/dxuilib/DXWindow.C        2018-05-16 05:26:29.241236789 +0200
77 @@ -245,7 +245,7 @@
78              XCreatePixmapFromBitmapData
79                  (XtDisplay(this->menuBar),
80                   wind,
81 -                 anchor_bits,
82 +                 (char *)anchor_bits,
83                   anchor_width,
84                   anchor_height,
85                   foreground,
86 --- dx-4.4.4/src/uipp/dxuilib/pagedrag.bm.orig  1999-03-24 16:17:49.000000000 +0100
87 +++ dx-4.4.4/src/uipp/dxuilib/pagedrag.bm       2018-05-16 15:54:28.201914729 +0200
88 @@ -1,6 +1,6 @@
89  #define pagedrag_width 32
90  #define pagedrag_height 32
91 -static char pagedrag_bits[] = {
92 +static unsigned char pagedrag_bits[] = {
93     0x00, 0x00, 0x00, 0x00, 0xfc, 0x3f, 0x00, 0x00, 0x04, 0x30, 0x00, 0x00,
94     0x04, 0xf0, 0x01, 0x00, 0x04, 0xb0, 0x01, 0x00, 0x07, 0xf0, 0xff, 0x0f,
95     0x01, 0x00, 0x00, 0x0c, 0x01, 0x00, 0x00, 0x0c, 0x01, 0x00, 0x00, 0x7c,
96 --- dx-4.4.4/src/uipp/dxuilib/pagedragmask.bm.orig      1999-03-24 16:17:49.000000000 +0100
97 +++ dx-4.4.4/src/uipp/dxuilib/pagedragmask.bm   2018-05-16 15:55:52.433030968 +0200
98 @@ -1,6 +1,6 @@
99  #define pagedragmask_width 32
100  #define pagedragmask_height 32
101 -static char pagedragmask_bits[] = {
102 +static unsigned char pagedragmask_bits[] = {
103     0x00, 0x00, 0x00, 0x00, 0xfc, 0x3f, 0x00, 0x00, 0xfc, 0x3f, 0x00, 0x00,
104     0x5c, 0xf5, 0x01, 0x00, 0xac, 0xfa, 0x01, 0x00, 0x5f, 0xf5, 0xff, 0x0f,
105     0xaf, 0xfa, 0xff, 0x0f, 0x57, 0x55, 0x55, 0x0d, 0xab, 0xaa, 0xaa, 0x7e,
106 --- dx-4.4.4/src/uipp/dxuilib/animation.bm.orig 1999-03-24 16:17:49.000000000 +0100
107 +++ dx-4.4.4/src/uipp/dxuilib/animation.bm      2018-05-16 15:54:44.996135230 +0200
108 @@ -1,6 +1,6 @@
109  #define animation_width 90
110  #define animation_height 23
111 -static char animation_bits[] = {
112 +static unsigned char animation_bits[] = {
113     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
114     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
115     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
116 --- dx-4.4.4/src/uipp/dxuilib/anim_mask.bm.orig 1999-03-24 16:17:49.000000000 +0100
117 +++ dx-4.4.4/src/uipp/dxuilib/anim_mask.bm      2018-05-16 15:56:11.617377728 +0200
118 @@ -1,6 +1,6 @@
119  #define anim_mask_width 90
120  #define anim_mask_height 23
121 -static char anim_mask_bits[] = {
122 +static unsigned char anim_mask_bits[] = {
123     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
124     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
125     0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x00,
126 --- dx-4.4.4/src/uipp/dxuilib/PageTab.C.orig    2003-07-12 02:12:22.000000000 +0200
127 +++ dx-4.4.4/src/uipp/dxuilib/PageTab.C 2018-05-16 15:55:41.449117401 +0200
128 @@ -96,9 +96,9 @@
129          PageTab::DragIcon = this->createDragIcon(pagedrag_width, pagedrag_height,
130              (char *)pagedrag_bits, (char *)pagedragmask_bits);
131         PageTab::AnimationPixmap = XCreateBitmapFromData(XtDisplay(p),
132 -             XtWindow(p), animation_bits, animation_width, animation_height);
133 +             XtWindow(p), (char *)animation_bits, animation_width, animation_height);
134               PageTab::AnimationMaskPixmap = XCreateBitmapFromData(XtDisplay(p),
135 -             XtWindow(p), anim_mask_bits, anim_mask_width, anim_mask_height);
136 +             XtWindow(p), (char *)anim_mask_bits, anim_mask_width, anim_mask_height);
137         PageTab::ClassInitialized = TRUE;
138      }
139  
140 --- dx-4.4.4/src/uipp/dxuilib/postit.bm.orig    1999-03-24 16:17:49.000000000 +0100
141 +++ dx-4.4.4/src/uipp/dxuilib/postit.bm 2018-05-16 16:28:36.143418469 +0200
142 @@ -2,7 +2,7 @@
143  #define postit_height 24
144  #define postit_x_hot 11
145  #define postit_y_hot 0
146 -static char postit_bits[] = {
147 +static unsigned char postit_bits[] = {
148     0x00, 0x00, 0x00, 0xaa, 0xaa, 0xaa, 0x54, 0x55, 0xd5, 0xaa, 0xaa, 0xaa,
149     0x54, 0x41, 0xd5, 0xaa, 0xa8, 0xaa, 0x54, 0x75, 0xd5, 0xaa, 0xbc, 0xaa,
150     0x54, 0x55, 0xd5, 0xaa, 0xaa, 0xaa, 0x54, 0x41, 0xd5, 0xaa, 0xa8, 0xaa,
151 --- dx-4.4.4/src/uipp/dxuilib/VPEPostIt.C.orig  2002-10-24 06:37:59.000000000 +0200
152 +++ dx-4.4.4/src/uipp/dxuilib/VPEPostIt.C       2018-05-16 16:28:53.697678894 +0200
153 @@ -213,7 +213,7 @@
154         XFreePixmap(d, this->bg_pixmap);
155         this->bg_pixmap = NUL(Pixmap);
156      }
157 -    this->bg_pixmap = XCreatePixmapFromBitmapData(d, w, postit_bits,
158 +    this->bg_pixmap = XCreatePixmapFromBitmapData(d, w, (char *)postit_bits,
159         postit_width, postit_height, fg, bg, depth);
160      XtVaSetValues (this->customPart,
161         XmNlabelType, XmPIXMAP,
162 --- dx-4.4.4/src/uipp/base/plus.bm.orig 2003-07-12 02:12:15.000000000 +0200
163 +++ dx-4.4.4/src/uipp/base/plus.bm      2018-05-16 17:04:42.001187910 +0200
164 @@ -1,6 +1,6 @@
165  #define plus_width 12
166  #define plus_height 14
167 -static char plus_bits[] = {
168 +static unsigned char plus_bits[] = {
169     0x00, 0x00, 0x00, 0x00, 0xfe, 0x0f, 0x02, 0x08, 0x42, 0x08, 0x42, 0x08,
170     0x42, 0x08, 0xfa, 0x0b, 0x42, 0x08, 0x42, 0x08, 0x42, 0x08, 0x02, 0x08,
171     0xfe, 0x0f, 0x00, 0x00};
172 --- dx-4.4.4/src/uipp/base/minus.bm.orig        2003-07-12 02:12:15.000000000 +0200
173 +++ dx-4.4.4/src/uipp/base/minus.bm     2018-05-16 17:04:53.428458615 +0200
174 @@ -1,6 +1,6 @@
175  #define minus_width 12
176  #define minus_height 14
177 -static char minus_bits[] = {
178 +static unsigned char minus_bits[] = {
179     0x00, 0x00, 0x00, 0x00, 0xfe, 0x0f, 0x02, 0x08, 0x02, 0x08, 0x02, 0x08,
180     0x02, 0x08, 0xfa, 0x0b, 0x02, 0x08, 0x02, 0x08, 0x02, 0x08, 0x02, 0x08,
181     0xfe, 0x0f, 0x00, 0x00};
182 --- dx-4.4.4/src/uipp/base/TreeView.C.orig      2003-07-12 02:12:15.000000000 +0200
183 +++ dx-4.4.4/src/uipp/base/TreeView.C   2018-05-16 17:05:15.929648011 +0200
184 @@ -316,9 +316,9 @@
185      }
186  
187      if (TreeView::Plus == XmUNSPECIFIED_PIXMAP) {
188 -       TreeView::Plus = XCreatePixmapFromBitmapData(d,win,plus_bits,plus_width,
189 +       TreeView::Plus = XCreatePixmapFromBitmapData(d,win,(char *)plus_bits,plus_width,
190             plus_height,this->line_color,bg,depth);
191 -       TreeView::Minus = XCreatePixmapFromBitmapData(d,win,minus_bits,minus_width,
192 +       TreeView::Minus = XCreatePixmapFromBitmapData(d,win,(char *)minus_bits,minus_width,
193             minus_height,this->line_color,bg,depth);
194      }
195  
196 --- dx-4.4.4/src/uipp/prompter/row_sens.bm.orig 1999-04-05 15:33:51.000000000 +0200
197 +++ dx-4.4.4/src/uipp/prompter/row_sens.bm      2018-05-16 17:11:23.349069001 +0200
198 @@ -1,6 +1,6 @@
199  #define row_sens_width 20
200  #define row_sens_height 20
201 -static char row_sens_bits[] = {
202 +static unsigned char row_sens_bits[] = {
203     0x82, 0xc1, 0x00, 0x82, 0xc1, 0x00, 0x42, 0xa1, 0x00, 0x42, 0xa1, 0x00,
204     0x42, 0xa1, 0x00, 0x42, 0xa1, 0x00, 0x22, 0x91, 0x00, 0x22, 0x91, 0x00,
205     0x22, 0x91, 0x00, 0x22, 0x91, 0x00, 0x12, 0x89, 0x00, 0x12, 0x89, 0x00,
206 --- dx-4.4.4/src/uipp/prompter/col_sens.bm.orig 1999-04-05 15:33:50.000000000 +0200
207 +++ dx-4.4.4/src/uipp/prompter/col_sens.bm      2018-05-16 17:11:38.299859234 +0200
208 @@ -1,6 +1,6 @@
209  #define col_sens_width 20
210  #define col_sens_height 20
211 -static char col_sens_bits[] = {
212 +static unsigned char col_sens_bits[] = {
213     0x00, 0x00, 0x00, 0xff, 0xff, 0x0f, 0x00, 0x00, 0x0c, 0x00, 0xc0, 0x03,
214     0x00, 0x3c, 0x00, 0xc0, 0x03, 0x00, 0x3c, 0x00, 0x00, 0x03, 0x00, 0x00,
215     0xff, 0xff, 0x0f, 0x00, 0x00, 0x0c, 0x00, 0xc0, 0x03, 0x00, 0x3c, 0x00,
216 --- dx-4.4.4/src/uipp/prompter/row_insens.bm.orig       1999-04-05 15:33:51.000000000 +0200
217 +++ dx-4.4.4/src/uipp/prompter/row_insens.bm    2018-05-16 17:11:54.267369873 +0200
218 @@ -1,6 +1,6 @@
219  #define row_insens_width 20
220  #define row_insens_height 20
221 -static char row_insens_bits[] = {
222 +static unsigned char row_insens_bits[] = {
223     0x02, 0x81, 0x00, 0x80, 0x40, 0x00, 0x02, 0x81, 0x00, 0x40, 0x20, 0x00,
224     0x02, 0x81, 0x00, 0x40, 0x20, 0x00, 0x02, 0x81, 0x00, 0x20, 0x10, 0x00,
225     0x02, 0x81, 0x00, 0x20, 0x10, 0x00, 0x02, 0x81, 0x00, 0x10, 0x08, 0x00,
226 --- dx-4.4.4/src/uipp/prompter/col_insens.bm.orig       1999-04-05 15:33:49.000000000 +0200
227 +++ dx-4.4.4/src/uipp/prompter/col_insens.bm    2018-05-16 17:12:11.441610961 +0200
228 @@ -1,6 +1,6 @@
229  #define col_insens_width 20
230  #define col_insens_height 20
231 -static char col_insens_bits[] = {
232 +static unsigned char col_insens_bits[] = {
233     0x00, 0x00, 0x00, 0x55, 0x55, 0x05, 0x00, 0x00, 0x08, 0x00, 0x80, 0x02,
234     0x00, 0x28, 0x00, 0x80, 0x02, 0x00, 0x28, 0x00, 0x00, 0x02, 0x00, 0x00,
235     0x55, 0x55, 0x05, 0x00, 0x00, 0x08, 0x00, 0x80, 0x02, 0x00, 0x28, 0x00,
236 --- dx-4.4.4/src/uipp/prompter/grid1.bm.orig    1999-04-05 15:33:50.000000000 +0200
237 +++ dx-4.4.4/src/uipp/prompter/grid1.bm 2018-05-16 17:14:01.830778982 +0200
238 @@ -1,6 +1,6 @@
239  #define grid1_width 37
240  #define grid1_height 37
241 -static char grid1_bits[] = {
242 +static unsigned char grid1_bits[] = {
243     0xff, 0xff, 0xff, 0xff, 0x1f, 0x41, 0x10, 0x04, 0x41, 0x10, 0x41, 0x10,
244     0x04, 0x41, 0x10, 0x41, 0x10, 0x04, 0x41, 0x10, 0x41, 0x10, 0x04, 0x41,
245     0x10, 0x41, 0x10, 0x04, 0x41, 0x10, 0xff, 0xff, 0xff, 0xff, 0x1f, 0x41,
246 --- dx-4.4.4/src/uipp/prompter/grid2.bm.orig    1999-04-05 15:33:50.000000000 +0200
247 +++ dx-4.4.4/src/uipp/prompter/grid2.bm 2018-05-16 17:14:13.634736221 +0200
248 @@ -1,6 +1,6 @@
249  #define grid2_width 37
250  #define grid2_height 37
251 -static char grid2_bits[] = {
252 +static unsigned char grid2_bits[] = {
253     0xff, 0xff, 0xff, 0xff, 0x1f, 0x41, 0x0a, 0x40, 0x02, 0x10, 0x41, 0x0a,
254     0x40, 0x02, 0x10, 0x41, 0x0a, 0x40, 0x02, 0x10, 0xff, 0xff, 0xff, 0xff,
255     0x1f, 0x41, 0x0a, 0x40, 0x02, 0x10, 0x41, 0x0a, 0x40, 0x02, 0x10, 0xff,
256 --- dx-4.4.4/src/uipp/prompter/grid3.bm.orig    1999-04-05 15:33:50.000000000 +0200
257 +++ dx-4.4.4/src/uipp/prompter/grid3.bm 2018-05-16 17:14:25.632037013 +0200
258 @@ -1,6 +1,6 @@
259  #define grid3_width 37
260  #define grid3_height 37
261 -static char grid3_bits[] = {
262 +static unsigned char grid3_bits[] = {
263     0x00, 0xf0, 0xff, 0x01, 0x00, 0x00, 0x0f, 0x04, 0x1e, 0x00, 0xe0, 0x00,
264     0x04, 0xe0, 0x00, 0x98, 0x00, 0x04, 0x20, 0x03, 0x86, 0x00, 0x04, 0x20,
265     0x0c, 0x01, 0x01, 0x04, 0x10, 0x10, 0x01, 0x01, 0x04, 0x10, 0x10, 0x02,
266 --- dx-4.4.4/src/uipp/prompter/grid4.bm.orig    1999-04-05 15:33:51.000000000 +0200
267 +++ dx-4.4.4/src/uipp/prompter/grid4.bm 2018-05-16 17:14:44.203018593 +0200
268 @@ -1,6 +1,6 @@
269  #define grid4_width 37
270  #define grid4_height 37
271 -static char grid4_bits[] = {
272 +static unsigned char grid4_bits[] = {
273     0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x06, 0x18, 0x00,
274     0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00,
275     0x00, 0x00, 0x30, 0x18, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00,
This page took 0.114633 seconds and 4 git commands to generate.