Skip to content

Commit a7be1f9

Browse files
More work on warnings
1 parent d9698f1 commit a7be1f9

File tree

6 files changed

+4842
-4840
lines changed

6 files changed

+4842
-4840
lines changed

.coverity/coverity.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ echo -e "\033[33;1mExtracting Coverity Scan Analysis Tool...\033[0m"
6464
tar xzf coverity_tool.tgz
6565

6666

67-
TOOL_DIR=$(find -type d -name 'cov-analysis*')
67+
TOOL_DIR=$(find . -type d -name 'cov-analysis*')
6868
export PATH=$TOOL_DIR/bin:$PATH
6969

7070
# Build

.mdlrc

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
rules "~MD003" "~MD004" "~MD007" "~MD025" "~MD032"

NEWS.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151

5252
# 23.05.1
5353
* Updated the Russian and Italian translation.
54-
* Process the command line option --maxima=<str>.
54+
* Process the command line option `--maxima=<str>`.
5555
* Resolved several possibilities to crash the config dialogue
5656
(#1774, #1766)
5757
* Correctly calculate the worksheet size in the background (#1766)
@@ -302,5 +302,5 @@
302302
* A Russian translation update by OlesyaGerasimenko
303303
* Many small bugfixes including a crash on loading files with images.
304304

305-
# Changes in older wxMaxima versions you can find here:
305+
# Changes in older wxMaxima versions you can find here
306306
<https://github.com/wxMaxima-developers/wxmaxima/blob/Version-21.02.0/NEWS.md>

locales/README.md

+10-9
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,16 @@ The subdirectories of this folder contain the translations of
1313
### Translating wxMaxima to a new language
1414

1515
In order to translate wxMaxima to a entirely new language two things have to be done:
16-
- Translate the .pot files to your language. If you don't want to translate
17-
everything in one go that is completely fine: Quality is more important than
18-
quantity here and getmessage is able to work with a partially-translated program
19-
just fine; If the .pot files in the repository change whilst translation is
20-
ongoing that is not the end of the world, neither: msgmerge will be able to
21-
sort this out, too.
22-
- For Linux desktop integration additionally
23-
data/io.github.wxmaxima_developers.wxMaxima.desktop needs to be equipped with
24-
a translation.
16+
17+
* Translate the .pot files to your language. If you don't want to translate
18+
everything in one go that is completely fine: Quality is more important than
19+
quantity here and getmessage is able to work with a partially-translated program
20+
just fine; If the .pot files in the repository change whilst translation is
21+
* ongoing that is not the end of the world, neither: msgmerge will be able to
22+
sort this out, too.
23+
* For Linux desktop integration additionally
24+
data/io.github.wxmaxima_developers.wxMaxima.desktop needs to be equipped with
25+
a translation.
2526

2627
### Improving an existing translation
2728

src/ArtProvider.cpp

+26-26
Original file line numberDiff line numberDiff line change
@@ -35,45 +35,45 @@
3535

3636
wxBitmap ArtProvider::GetImage(wxWindow *win, wxString name, int width,
3737
unsigned const char *data, std::size_t dataLen) {
38-
wxBitmap bmp = wxArtProvider::GetBitmap(name, wxART_TOOLBAR,
39-
wxSize(width * 4, width * 4));
40-
wxImage img;
38+
wxBitmap bmp = wxArtProvider::GetBitmap(name, wxART_TOOLBAR,
39+
wxSize(width * 4, width * 4));
40+
wxImage img;
4141

42-
if (bmp.IsOk()) {
43-
img = bmp.ConvertToImage();
44-
}
45-
if (img.IsOk())
42+
if (bmp.IsOk()) {
43+
img = bmp.ConvertToImage();
44+
}
45+
if (img.IsOk())
4646
{
47-
img.Rescale(width, width, wxIMAGE_QUALITY_BICUBIC);
47+
img.Rescale(width, width, wxIMAGE_QUALITY_BICUBIC);
4848
#if defined __WXOSX__
49-
int scaleFactor = win->GetContentScaleFactor();
50-
if(scaleFactor < 1)
51-
scaleFactor = 1;
52-
if(scaleFactor > 16)
53-
scaleFactor = 16;
49+
int scaleFactor = win->GetContentScaleFactor();
50+
if(scaleFactor < 1)
51+
scaleFactor = 1;
52+
if(scaleFactor > 16)
53+
scaleFactor = 16;
5454

55-
bmp = wxBitmap(img, wxBITMAP_SCREEN_DEPTH, scaleFactor);
55+
bmp = wxBitmap(img, wxBITMAP_SCREEN_DEPTH, scaleFactor);
5656
#else
57-
bmp = wxBitmap(img, wxBITMAP_SCREEN_DEPTH);
57+
bmp = wxBitmap(img, wxBITMAP_SCREEN_DEPTH);
5858
#endif
5959
}
60-
if(!bmp.IsOk())
61-
bmp = SvgBitmap(win, data, dataLen, width, width);
60+
if(!bmp.IsOk())
61+
bmp = SvgBitmap(win, data, dataLen, width, width);
6262

6363
#if defined __WXOSX__
64-
int scaleFactor = win->GetContentScaleFactor();
65-
if(scaleFactor < 1)
66-
scaleFactor = 1;
67-
if(scaleFactor > 16)
68-
scaleFactor = 16;
64+
int scaleFactor = win->GetContentScaleFactor();
65+
if(scaleFactor < 1)
66+
scaleFactor = 1;
67+
if(scaleFactor > 16)
68+
scaleFactor = 16;
6969
#endif
7070

71-
if(!bmp.IsOk())
71+
if(!bmp.IsOk())
7272
#if defined __WXOSX__
7373

74-
bmp = wxBitmap(wxSize(width, width), wxBITMAP_SCREEN_DEPTH, scaleFactor);
74+
bmp = wxBitmap(wxSize(width, width), wxBITMAP_SCREEN_DEPTH, scaleFactor);
7575
#else
76-
bmp = wxBitmap(wxSize(width, width), wxBITMAP_SCREEN_DEPTH);
76+
bmp = wxBitmap(wxSize(width, width), wxBITMAP_SCREEN_DEPTH);
7777
#endif
78-
return bmp;
78+
return bmp;
7979
}

0 commit comments

Comments
 (0)