mirror of
https://github.com/tumic0/GPXSee.git
synced 2025-02-20 09:40:49 +01:00
Compare commits
3 Commits
ed638bb5fc
...
108444d29b
Author | SHA1 | Date | |
---|---|---|---|
108444d29b | |||
6e2c0472c6 | |||
c0a1054a54 |
8
.github/workflows/osx.yml
vendored
8
.github/workflows/osx.yml
vendored
@ -15,7 +15,9 @@ jobs:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v3
|
||||
- name: Install dependencies
|
||||
run: brew install qt5
|
||||
run: |
|
||||
brew update
|
||||
brew install qt5
|
||||
- name: Create localization
|
||||
run: lrelease gpxsee.pro
|
||||
- name: Configure build
|
||||
@ -39,7 +41,9 @@ jobs:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v3
|
||||
- name: Install dependencies
|
||||
run: brew install qt6
|
||||
run: |
|
||||
brew update
|
||||
brew install qt6
|
||||
- name: Create localization
|
||||
run: lrelease gpxsee.pro
|
||||
- name: Configure build
|
||||
|
@ -26,7 +26,6 @@ INCLUDEPATH += ./src
|
||||
HEADERS += src/common/config.h \
|
||||
src/GUI/crosshairitem.h \
|
||||
src/GUI/motioninfoitem.h \
|
||||
src/GUI/navigationwidget.h \
|
||||
src/GUI/pluginparameters.h \
|
||||
src/common/garmin.h \
|
||||
src/common/coordinates.h \
|
||||
@ -262,7 +261,6 @@ HEADERS += src/common/config.h \
|
||||
SOURCES += src/main.cpp \
|
||||
src/GUI/crosshairitem.cpp \
|
||||
src/GUI/motioninfoitem.cpp \
|
||||
src/GUI/navigationwidget.cpp \
|
||||
src/GUI/pluginparameters.cpp \
|
||||
src/GUI/settings.cpp \
|
||||
src/common/coordinates.cpp \
|
||||
@ -560,6 +558,9 @@ unix:!macx:!android {
|
||||
}
|
||||
|
||||
android {
|
||||
HEADERS += src/GUI/navigationwidget.h
|
||||
SOURCES += src/GUI/navigationwidget.cpp
|
||||
|
||||
defineReplace(versionCode) {
|
||||
segments = $$split(1, ".")
|
||||
for (segment, segments): \
|
||||
|
@ -45,7 +45,7 @@ static void setAreaProperties(Area &area, const QJsonValue &properties)
|
||||
if (o["fill-opacity"].isDouble())
|
||||
fillColor.setAlphaF(o["fill-opacity"].toDouble());
|
||||
else
|
||||
fillColor.setAlphaF(0.6);
|
||||
fillColor.setAlphaF(0.6f);
|
||||
}
|
||||
|
||||
area.setStyle(PolygonStyle(fillColor, strokeColor, strokeWidth));
|
||||
|
@ -21,7 +21,7 @@ bool HuffmanText::decode(const SubFile *file, SubFile::Handle &hdl,
|
||||
quint32 sym;
|
||||
|
||||
while (hs.readSymbol(sym)) {
|
||||
for (quint32 i = 0; i < (_table.symbolBits() >> 3); i++) {
|
||||
for (int i = 0; i < (_table.symbolBits() >> 3); i++) {
|
||||
str.append((quint8)sym);
|
||||
if (((quint8)sym == '\0'))
|
||||
return true;
|
||||
|
@ -24,7 +24,7 @@ public:
|
||||
if (!subFile)
|
||||
return;
|
||||
|
||||
_data.resize(1U<<subFile->blockBits());
|
||||
_data.resize(subFile->blockSize());
|
||||
_file.setFileName(subFile->fileName());
|
||||
_file.open(QIODevice::ReadOnly | QIODevice::Unbuffered);
|
||||
}
|
||||
@ -144,7 +144,10 @@ public:
|
||||
bool readVBitfield32(Handle &hdl, quint32 &bitfield) const;
|
||||
|
||||
const QString &fileName() const {return _path ? *_path : _img->fileName();}
|
||||
unsigned blockBits() const {return _path ? BLOCK_BITS : _img->blockBits();}
|
||||
int blockSize() const
|
||||
{
|
||||
return _path ? 1U<<BLOCK_BITS : 1U<<_img->blockBits();
|
||||
}
|
||||
|
||||
protected:
|
||||
quint32 _gmpOffset;
|
||||
|
Loading…
x
Reference in New Issue
Block a user