Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qt6-qtpbfimageformat for openSUSE:Factory checked in at 2025-01-09 15:11:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-qtpbfimageformat (Old) and /work/SRC/openSUSE:Factory/.qt6-qtpbfimageformat.new.1881 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "qt6-qtpbfimageformat" Thu Jan 9 15:11:54 2025 rev:3 rq:1236099 version:4.0 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-qtpbfimageformat/qt6-qtpbfimageformat.changes 2024-10-06 17:53:18.352430806 +0200 +++ /work/SRC/openSUSE:Factory/.qt6-qtpbfimageformat.new.1881/qt6-qtpbfimageformat.changes 2025-01-09 15:12:43.953477191 +0100 @@ -1,0 +2,7 @@ +Wed Jan 8 01:07:27 CET 2025 - tumic@cbox.cz + +- Update to version 4.0 + * Removed Google Protocol buffers dependency. + * Removed the related pkgconfig.patch + +------------------------------------------------------------------- Old: ---- QtPBFImagePlugin-3.2.tar.gz pkgconfig.patch New: ---- QtPBFImagePlugin-4.0.tar.gz BETA DEBUG BEGIN: Old: * Removed Google Protocol buffers dependency. * Removed the related pkgconfig.patch BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-qtpbfimageformat.spec ++++++ --- /var/tmp/diff_new_pack.wWFDGp/_old 2025-01-09 15:12:44.657506461 +0100 +++ /var/tmp/diff_new_pack.wWFDGp/_new 2025-01-09 15:12:44.657506461 +0100 @@ -19,22 +19,19 @@ # See also http://en.opensuse.org/openSUSE:Specfile_guidelines Name: qt6-qtpbfimageformat -Version: 3.2 +Version: 4.0 Release: 1 Summary: Qt6 PBF Image Format Plugin License: LGPL-3.0-only Group: Development/Libraries/X11 Url: https://github.com/tumic0/QtPBFImagePlugin Source0: https://github.com/tumic0/QtPBFImagePlugin/archive/%{version}/QtPBFImagePlugin-%{version}.tar.gz -# PATCH-FIX-OPENSUSE pkgconfig.patch - fix for broken OpenSUSE linker -Patch0: pkgconfig.patch BuildRequires: gcc-c++ BuildRequires: make %if 0%{?suse_version} BuildRequires: qt6-core-devel BuildRequires: qt6-gui-devel -BuildRequires: protobuf-devel BuildRequires: zlib-devel %else %if 0%{?fedora_version} @@ -42,16 +39,13 @@ BuildRequires: qt6-qtbase-gui BuildRequires: qt6-qtbase-devel BuildRequires: zlib-devel -BuildRequires: protobuf-lite-devel %else # Mageia BuildRequires: libqt6core-devel BuildRequires: libqt6gui-devel %ifarch x86_64 -BuildRequires: lib64protobuf-devel BuildRequires: lib64zlib-devel %else -BuildRequires: libprotobuf-devel BuildRequires: libzlib-devel %endif %endif ++++++ QtPBFImagePlugin-3.2.tar.gz -> QtPBFImagePlugin-4.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPBFImagePlugin-3.2/.appveyor.yml new/QtPBFImagePlugin-4.0/.appveyor.yml --- old/QtPBFImagePlugin-3.2/.appveyor.yml 2024-10-06 13:24:08.000000000 +0200 +++ new/QtPBFImagePlugin-4.0/.appveyor.yml 2025-01-08 00:36:27.000000000 +0100 @@ -1,4 +1,4 @@ -version: 3.2.{build} +version: 4.0.{build} configuration: - Release @@ -7,26 +7,25 @@ - Visual Studio 2022 environment: - VCPKGDIR: C:\tools\vcpkg\installed\x64-windows-static-md + VCPKGDIR: C:\tools\vcpkg\installed\x64-windows-static-md-release matrix: - QTDIR: C:\Qt\5.15\msvc2019_64 - - QTDIR: C:\Qt\6.7\msvc2019_64 + - QTDIR: C:\Qt\6.8\msvc2022_64 install: - cmd: |- - set PATH=%QTDIR%\bin;%VCPKGDIR%\tools\protobuf;%PATH% + set PATH=%QTDIR%\bin;%PATH% call "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars64.bat - vcpkg install protobuf:x64-windows-static-md - vcpkg install zlib:x64-windows-static-md + vcpkg install zlib:x64-windows-static-md-release copy /y %VCPKGDIR%\lib\zlib.lib %VCPKGDIR%\lib\zlibstatic.lib build_script: - cmd: |- - qmake PROTOBUF=%VCPKGDIR% ZLIB=%VCPKGDIR% pbfplugin.pro + qmake ZLIB=%VCPKGDIR% pbfplugin.pro nmake release artifacts: -- path: release\pbf3.dll +- path: release\pbf4.dll cache: - C:\tools\vcpkg\installed\ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPBFImagePlugin-3.2/.github/workflows/android.yml new/QtPBFImagePlugin-4.0/.github/workflows/android.yml --- old/QtPBFImagePlugin-3.2/.github/workflows/android.yml 2024-10-06 13:24:08.000000000 +0200 +++ new/QtPBFImagePlugin-4.0/.github/workflows/android.yml 2025-01-08 00:36:27.000000000 +0100 @@ -12,10 +12,6 @@ steps: - name: Checkout uses: actions/checkout@v4 - - name: Install protobuf compiler - run: | - sudo apt-get update - sudo apt-get install protobuf-compiler - name: set up JDK 11 uses: actions/setup-java@v4 with: @@ -41,10 +37,8 @@ version: '6.4.0' target: 'android' arch: 'android_arm64_v8a' - - name: Install Android Google Protocol Buffers - run: git clone https://github.com/tumic0/android_protobuf.git - name: Configure build - run: qmake pbfplugin.pro PROTOBUF=android_protobuf + run: qmake pbfplugin.pro - name: Build project run: make -j2 - name: Upload artifacts diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPBFImagePlugin-3.2/.github/workflows/linux.yml new/QtPBFImagePlugin-4.0/.github/workflows/linux.yml --- old/QtPBFImagePlugin-3.2/.github/workflows/linux.yml 2024-10-06 13:24:08.000000000 +0200 +++ new/QtPBFImagePlugin-4.0/.github/workflows/linux.yml 2025-01-08 00:36:27.000000000 +0100 @@ -15,7 +15,7 @@ - name: Install dependencies run: | sudo apt-get update - sudo apt-get install qtbase5-dev qtbase5-dev-tools qt5-qmake libprotobuf-dev protobuf-compiler zlib1g-dev + sudo apt-get install qtbase5-dev qtbase5-dev-tools qt5-qmake zlib1g-dev - name: Configure build run: qmake pbfplugin.pro - name: Build project diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPBFImagePlugin-3.2/.github/workflows/osx.yml new/QtPBFImagePlugin-4.0/.github/workflows/osx.yml --- old/QtPBFImagePlugin-3.2/.github/workflows/osx.yml 2024-10-06 13:24:08.000000000 +0200 +++ new/QtPBFImagePlugin-4.0/.github/workflows/osx.yml 2025-01-08 00:36:27.000000000 +0100 @@ -6,36 +6,22 @@ - master jobs: - qt5: - name: QtPBFImagePlugin Qt5 build + build: + name: QtPBFImagePlugin runs-on: macos-latest steps: - - name: Set environment variables - run: echo "PATH=/opt/homebrew/opt/qt@5/bin:/opt/homebrew/opt/protobuf@21/bin:$PATH" >> $GITHUB_ENV - name: Checkout uses: actions/checkout@v4 - - name: Install dependencies - run: | - brew update - brew install qt@5 protobuf@21 + - name: Install Qt + uses: jurplel/install-qt-action@v4 + with: + version: '6.8.1' - name: Configure build - run: qmake PROTOBUF=/opt/homebrew/opt/protobuf@21 pbfplugin.pro - - name: Build project - run: make -j3 - - qt6: - name: QtPBFImagePlugin Qt6 build - runs-on: macos-latest - steps: - - name: Set environment variables - run: echo "PATH=/opt/homebrew/opt/qt@6/bin:/opt/homebrew/opt/protobuf@21/bin:$PATH" >> $GITHUB_ENV - - name: Checkout - uses: actions/checkout@v4 - - name: Install dependencies - run: | - brew update - brew install qt@6 protobuf@21 - - name: Configure build - run: qmake PROTOBUF=/opt/homebrew/opt/protobuf@21 pbfplugin.pro + run: qmake pbfplugin.pro QMAKE_APPLE_DEVICE_ARCHS="x86_64h arm64" - name: Build project run: make -j3 + - name: Upload artifacts + uses: actions/upload-artifact@v4 + with: + path: libpbf.dylib + name: libpbf.dylib diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPBFImagePlugin-3.2/.gitignore new/QtPBFImagePlugin-4.0/.gitignore --- old/QtPBFImagePlugin-3.2/.gitignore 2024-10-06 13:24:08.000000000 +0200 +++ new/QtPBFImagePlugin-4.0/.gitignore 2025-01-08 00:36:27.000000000 +0100 @@ -1,10 +1,6 @@ # Object files *.o -# Protobuf stuff -protobuf/vector_tile.pb.cc -protobuf/vector_tile.pb.h - # Qt stuff /.qmake.stash moc_*.cpp @@ -14,4 +10,4 @@ # lib libpbf.so -pbf.dylib +libpbf.dylib diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPBFImagePlugin-3.2/README.md new/QtPBFImagePlugin-4.0/README.md --- old/QtPBFImagePlugin-3.2/README.md 2024-10-06 13:24:08.000000000 +0200 +++ new/QtPBFImagePlugin-4.0/README.md 2025-01-08 00:36:27.000000000 +0100 @@ -68,41 +68,38 @@ ## Build ### Requirements * Qt5 >= 5.11 or Qt6 -* Google Protocol Buffers (protobuf-lite) * Zlib ### Build steps -#### Linux +#### Linux, OS X and Android ```shell qmake pbfplugin.pro make ``` #### Windows ```shell -qmake PROTOBUF=path/to/protobuf ZLIB=path/to/zlib pbfplugin.pro +qmake ZLIB=path/to/zlib pbfplugin.pro nmake ``` -#### OS X -```shell -qmake PROTOBUF=path/to/protobuf pbfplugin.pro -make -``` ## Install Copy the plugin to the system Qt image plugins path to make it work. You may -also set the QT_PLUGIN_PATH system variable before starting the application. For -Linux, there are RPM and DEB [packages](https://build.opensuse.org/project/show/home:tumic:QtPBFImagePlugin) +also set the QT_PLUGIN_PATH system variable before starting the application. +For Linux, there are RPM and DEB [packages](https://build.opensuse.org/project/show/home:tumic:QtPBFImagePlugin) for most common distros available on OBS. ## Limitations -* Only data that is part of the PBF file is displayed. External layers defined in the -style are ignored. -* Text PBF features must have a unique id (OpenMapTiles >= v3.7) for the text layout -algorithm to work properly. -* Expressions are not supported in the styles, only property functions are implemented. +* Only data that is part of the PBF file is displayed. External layers defined +in the style are ignored. +* Text PBF features must have a unique id (OpenMapTiles >= v3.7) for the text +layout algorithm to work properly. Additionally, the tile buffer must be large +enough to contain all neighboring text features overlapping to the tile bounds +(only data from the tile itself can be drawn to the resulting image). +* Expressions are not supported in the styles, only property functions are +implemented. ## Changelog -[Changelog](https://build.opensuse.org/package/view_file/home:tumic:QtPBFImagePlugin/QtP...) +[Changelog](https://build.opensuse.org/projects/home:tumic:QtPBFImagePlugin/packages/QtP...) ## Status A picture is worth a thousand words. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPBFImagePlugin-3.2/pbfplugin.pro new/QtPBFImagePlugin-4.0/pbfplugin.pro --- old/QtPBFImagePlugin-3.2/pbfplugin.pro 2024-10-06 13:24:08.000000000 +0200 +++ new/QtPBFImagePlugin-4.0/pbfplugin.pro 2025-01-08 00:36:27.000000000 +0100 @@ -2,13 +2,10 @@ TEMPLATE = lib CONFIG += plugin QT += gui -VERSION = 3.2 +VERSION = 4.0 -PROTOS = protobuf/vector_tile.proto -include(protobuf/vector_tile.pri) - -INCLUDEPATH += ./protobuf HEADERS += src/pbfhandler.h \ + src/data.h \ src/pbfplugin.h \ src/gzip.h \ src/pbf.h \ @@ -23,6 +20,7 @@ src/textitem.h \ src/sprites.h SOURCES += src/pbfplugin.cpp \ + src/data.cpp \ src/pbfhandler.cpp \ src/gzip.cpp \ src/pbf.cpp \ @@ -40,31 +38,24 @@ DEFINES += QT_NO_DEPRECATED_WARNINGS unix:!macx:!android { - LIBS += -lprotobuf-lite \ - -lz + LIBS += -lz target.path += $$[QT_INSTALL_PLUGINS]/imageformats INSTALLS += target } win32 { - INCLUDEPATH += $$PROTOBUF/include \ - $$ZLIB/include - LIBS += $$PROTOBUF/lib/libprotobuf-lite.lib \ - $$ZLIB/lib/zlibstatic.lib + INCLUDEPATH += $$ZLIB/include + LIBS += $$ZLIB/lib/zlibstatic.lib QMAKE_TARGET_PRODUCT = QtPBFImagePlugin QMAKE_TARGET_DESCRIPTION = Qt $$QT_VERSION MVT/PBF image plugin - QMAKE_TARGET_COPYRIGHT = Copyright (c) 2018-2024 Martin Tuma + QMAKE_TARGET_COPYRIGHT = Copyright (c) 2018-2025 Martin Tuma } macx { - INCLUDEPATH += $$PROTOBUF/include - LIBS += $$PROTOBUF/lib/libprotobuf-lite.a \ - -lz + LIBS += -lz } android { - INCLUDEPATH += $$PROTOBUF/include - LIBS += $$PROTOBUF/$$ANDROID_TARGET_ARCH/libprotobuf-lite.a \ - -lz + LIBS += -lz top_builddir=$$shadowed($$PWD) DESTDIR = $$top_builddir/plugins diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPBFImagePlugin-3.2/protobuf/vector_tile.pri new/QtPBFImagePlugin-4.0/protobuf/vector_tile.pri --- old/QtPBFImagePlugin-3.2/protobuf/vector_tile.pri 2024-10-06 13:24:08.000000000 +0200 +++ new/QtPBFImagePlugin-4.0/protobuf/vector_tile.pri 1970-01-01 01:00:00.000000000 +0100 @@ -1,17 +0,0 @@ -INCLUDEPATH += $$PWD -DEPENDPATH += $$PWD - -protobuf_decl.name = protobuf headers -protobuf_decl.input = PROTOS -protobuf_decl.output = ${QMAKE_FILE_IN_PATH}/${QMAKE_FILE_BASE}.pb.h -protobuf_decl.commands = protoc --cpp_out=${QMAKE_FILE_IN_PATH} --proto_path=${QMAKE_FILE_IN_PATH} ${QMAKE_FILE_NAME} -protobuf_decl.variable_out = HEADERS -QMAKE_EXTRA_COMPILERS += protobuf_decl - -protobuf_impl.name = protobuf sources -protobuf_impl.input = PROTOS -protobuf_impl.output = ${QMAKE_FILE_IN_PATH}/${QMAKE_FILE_BASE}.pb.cc -protobuf_impl.depends = ${QMAKE_FILE_IN_PATH}/${QMAKE_FILE_BASE}.pb.h -protobuf_impl.commands = $$escape_expand(\n) -protobuf_impl.variable_out = SOURCES -QMAKE_EXTRA_COMPILERS += protobuf_impl diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPBFImagePlugin-3.2/protobuf/vector_tile.proto new/QtPBFImagePlugin-4.0/protobuf/vector_tile.proto --- old/QtPBFImagePlugin-3.2/protobuf/vector_tile.proto 2024-10-06 13:24:08.000000000 +0200 +++ new/QtPBFImagePlugin-4.0/protobuf/vector_tile.proto 1970-01-01 01:00:00.000000000 +0100 @@ -1,78 +0,0 @@ -package vector_tile; - -option optimize_for = LITE_RUNTIME; - -message Tile { - - // GeomType is described in section 4.3.4 of the specification - enum GeomType { - UNKNOWN = 0; - POINT = 1; - LINESTRING = 2; - POLYGON = 3; - } - - // Variant type encoding - // The use of values is described in section 4.1 of the specification - message Value { - // Exactly one of these values must be present in a valid message - optional string string_value = 1; - optional float float_value = 2; - optional double double_value = 3; - optional int64 int_value = 4; - optional uint64 uint_value = 5; - optional sint64 sint_value = 6; - optional bool bool_value = 7; - - extensions 8 to max; - } - - // Features are described in section 4.2 of the specification - message Feature { - optional uint64 id = 1 [ default = 0 ]; - - // Tags of this feature are encoded as repeated pairs of - // integers. - // A detailed description of tags is located in sections - // 4.2 and 4.4 of the specification - repeated uint32 tags = 2 [ packed = true ]; - - // The type of geometry stored in this feature. - optional GeomType type = 3 [ default = UNKNOWN ]; - - // Contains a stream of commands and parameters (vertices). - // A detailed description on geometry encoding is located in - // section 4.3 of the specification. - repeated uint32 geometry = 4 [ packed = true ]; - } - - // Layers are described in section 4.1 of the specification - message Layer { - // Any compliant implementation must first read the version - // number encoded in this message and choose the correct - // implementation for this version number before proceeding to - // decode other parts of this message. - required uint32 version = 15 [ default = 1 ]; - - required string name = 1; - - // The actual features in this tile. - repeated Feature features = 2; - - // Dictionary encoding for keys - repeated string keys = 3; - - // Dictionary encoding for values - repeated Value values = 4; - - // Although this is an "optional" field it is required by the specification. - // See https://github.com/mapbox/vector-tile-spec/issues/47 - optional uint32 extent = 5 [ default = 4096 ]; - - extensions 16 to max; - } - - repeated Layer layers = 3; - - extensions 16 to 8191; -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPBFImagePlugin-3.2/src/data.cpp new/QtPBFImagePlugin-4.0/src/data.cpp --- old/QtPBFImagePlugin-3.2/src/data.cpp 1970-01-01 01:00:00.000000000 +0100 +++ new/QtPBFImagePlugin-4.0/src/data.cpp 2025-01-08 00:36:27.000000000 +0100 @@ -0,0 +1,347 @@ +#include "data.h" + +#define TYPE(tag) (tag & 0x07) +#define FIELD(tag) (tag >> 3) + +#define VARINT 0 +#define I64 1 +#define LEN 2 +#define I32 5 + +struct CTX +{ + CTX(const QByteArray &ba) + : bp(ba.constData()), be(bp + ba.size()) {} + + const char *bp; + const char *be; + quint32 tag; +}; + +static inline qint64 zigzag64decode(quint64 value) +{ + return static_cast<qint64>((value >> 1u) ^ static_cast<quint64>( + -static_cast<qint64>(value & 1u))); +} + +template<typename T> +static bool varint(CTX &ctx, T &val) +{ + unsigned int shift = 0; + val = 0; + + while (ctx.bp < ctx.be) { + val |= ((quint8)*ctx.bp & 0x7F) << shift; + shift += 7; + if (!((quint8)*ctx.bp++ & 0x80)) + return true; + } + + return false; +} + +static bool length(CTX &ctx, qint32 &val) +{ + if (TYPE(ctx.tag) != LEN) + return false; + + if (!varint(ctx, val)) + return false; + + return (val >= 0); +} + +static bool str(CTX &ctx, QByteArray &val) +{ + qint32 len; + + if (!length(ctx, len)) + return false; + if (ctx.bp + len > ctx.be) + return false; + + val = QByteArray::fromRawData(ctx.bp, len); + ctx.bp += len; + + return true; +} + +static bool dbl(CTX &ctx, double &val) +{ + if (TYPE(ctx.tag) != I64) + return false; + if (ctx.bp + sizeof(val) > ctx.be) + return false; + + memcpy(&val, ctx.bp, sizeof(val)); + ctx.bp += sizeof(val); + + return true; +} + +static bool flt(CTX &ctx, float &val) +{ + if (TYPE(ctx.tag) != I32) + return false; + if (ctx.bp + sizeof(val) > ctx.be) + return false; + + memcpy(&val, ctx.bp, sizeof(val)); + ctx.bp += sizeof(val); + + return true; +} + +static bool packed(CTX &ctx, QVector<quint32> &vals) +{ + quint32 v; + + if (TYPE(ctx.tag) == LEN) { + qint32 len; + if (!varint(ctx, len) || len < 0) + return false; + const char *ee = ctx.bp + len; + if (ee > ctx.be) + return false; + while (ctx.bp < ee) { + if (!varint(ctx, v)) + return false; + vals.append(v); + } + return (ctx.bp == ee); + } else if (TYPE(ctx.tag) == VARINT) { + if (!varint(ctx, v)) + return false; + vals.append(v); + return true; + } else + return false; +} + +static bool skip(CTX &ctx) +{ + qint32 len = 0; + + switch (TYPE(ctx.tag)) { + case VARINT: + return varint(ctx, len); + case I64: + len = 8; + break; + case LEN: + if (!varint(ctx, len) || len < 0) + return false; + break; + case I32: + len = 4; + break; + default: + return false; + } + + if (ctx.bp + len > ctx.be) + return false; + ctx.bp += len; + + return true; +} + +static bool value(CTX &ctx, QVariant &val) +{ + QByteArray ba; + quint64 num; + double dnum; + float fnum; + qint32 len; + + if (!length(ctx, len)) + return false; + + const char *ee = ctx.bp + len; + if (ee > ctx.be) + return false; + + while (ctx.bp < ee) { + if (!varint(ctx, ctx.tag)) + return false; + + switch (FIELD(ctx.tag)) { + case 1: + if (!str(ctx, ba)) + return false; + val = QVariant(ba); + break; + case 2: + if (!flt(ctx, fnum)) + return false; + val = QVariant(fnum); + break; + case 3: + if (!dbl(ctx, dnum)) + return false; + val = QVariant(dnum); + break; + case 4: + if (TYPE(ctx.tag) != VARINT) + return false; + if (!varint(ctx, num)) + return false; + val = QVariant(static_cast<qint64>(num)); + break; + case 5: + if (TYPE(ctx.tag) != VARINT) + return false; + if (!varint(ctx, num)) + return false; + val = QVariant(num); + break; + case 6: + if (TYPE(ctx.tag) != VARINT) + return false; + if (!varint(ctx, num)) + return false; + val = QVariant(zigzag64decode(num)); + break; + case 7: + if (TYPE(ctx.tag) != VARINT) + return false; + if (!varint(ctx, num)) + return false; + val = QVariant(num ? true : false); + break; + default: + if (!skip(ctx)) + return false; + } + } + + return (ctx.bp == ee); +} + +static bool feature(CTX &ctx, Data::Feature &f) +{ + qint32 len; + quint32 e; + + if (!length(ctx, len)) + return false; + + const char *ee = ctx.bp + len; + if (ee > ctx.be) + return false; + + while (ctx.bp < ee) { + if (!varint(ctx, ctx.tag)) + return false; + + switch (FIELD(ctx.tag)) { + case 1: + if (TYPE(ctx.tag) != VARINT) + return false; + if (!varint(ctx, f.id)) + return false; + break; + case 2: + if (!packed(ctx, f.tags)) + return false; + break; + case 3: + if (TYPE(ctx.tag) != VARINT) + return false; + if (!varint(ctx, e)) + return false; + if (e > Data::GeomType::POLYGON) + return false; + f.type = static_cast<Data::GeomType>(e); + break; + case 4: + if (!packed(ctx, f.geometry)) + return false; + break; + default: + if (!skip(ctx)) + return false; + } + } + + return (ctx.bp == ee); +} + +static bool layer(CTX &ctx, Data::Layer &l) +{ + qint32 len; + + if (!length(ctx, len)) + return false; + + const char *ee = ctx.bp + len; + if (ee > ctx.be) + return false; + + while (ctx.bp < ee) { + if (!varint(ctx, ctx.tag)) + return false; + + switch (FIELD(ctx.tag)) { + case 1: + if (!str(ctx, l.name)) + return false; + break; + case 2: + l.features.append(Data::Feature()); + if (!feature(ctx, l.features.last())) + return false; + break; + case 3: + l.keys.append(QByteArray()); + if (!str(ctx, l.keys.last())) + return false; + break; + case 4: + l.values.append(QVariant()); + if (!value(ctx, l.values.last())) + return false; + break; + case 5: + if (TYPE(ctx.tag) != VARINT) + return false; + if (!varint(ctx, l.extent)) + return false; + break; + case 15: + if (TYPE(ctx.tag) != VARINT) + return false; + if (!varint(ctx, l.version)) + return false; + break; + default: + if (!skip(ctx)) + return false; + } + } + + return (ctx.bp == ee); +} + +bool Data::load(const QByteArray &ba) +{ + CTX ctx(ba); + + while (ctx.bp < ctx.be) { + if (!varint(ctx, ctx.tag)) + return false; + + switch (FIELD(ctx.tag)) { + case 3: + _layers.append(Layer()); + if (!layer(ctx, _layers.last())) + return false; + break; + default: + if (!skip(ctx)) + return false; + } + } + + return (ctx.bp == ctx.be); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPBFImagePlugin-3.2/src/data.h new/QtPBFImagePlugin-4.0/src/data.h --- old/QtPBFImagePlugin-3.2/src/data.h 1970-01-01 01:00:00.000000000 +0100 +++ new/QtPBFImagePlugin-4.0/src/data.h 2025-01-08 00:36:27.000000000 +0100 @@ -0,0 +1,47 @@ +#ifndef DATA_H +#define DATA_H + +#include <QByteArray> +#include <QVector> +#include <QVariant> + +class Data +{ +public: + enum GeomType { + UNKNOWN = 0, + POINT = 1, + LINESTRING = 2, + POLYGON = 3 + }; + + struct Feature + { + Feature() : id(0), type(UNKNOWN) {} + + quint64 id; + QVector<quint32> tags; + GeomType type; + QVector<quint32> geometry; + }; + + struct Layer + { + Layer() : version(1), extent(4096) {} + + quint32 version; + QByteArray name; + QVector<Feature> features; + QVector<QByteArray> keys; + QVector<QVariant> values; + quint32 extent; + }; + + bool load(const QByteArray &ba); + const QVector<Layer> &layers() const {return _layers;} + +private: + QVector<Layer> _layers; +}; + +#endif // DATA_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPBFImagePlugin-3.2/src/pbf.cpp new/QtPBFImagePlugin-4.0/src/pbf.cpp --- old/QtPBFImagePlugin-3.2/src/pbf.cpp 2024-10-06 13:24:08.000000000 +0200 +++ new/QtPBFImagePlugin-4.0/src/pbf.cpp 2025-01-08 00:36:27.000000000 +0100 @@ -4,7 +4,6 @@ #define LINE_TO 2 #define CLOSE_PATH 7 - static inline qint32 zigzag32decode(quint32 value) { return static_cast<qint32>((value >> 1u) ^ static_cast<quint32>( @@ -16,26 +15,6 @@ return QPoint(zigzag32decode(v1), zigzag32decode(v2)); } -static QVariant value(const vector_tile::Tile_Value &val) -{ - if (val.has_bool_value()) - return QVariant(val.bool_value()); - else if (val.has_int_value()) - return QVariant((qlonglong)val.int_value()); - else if (val.has_sint_value()) - return QVariant((qlonglong)val.sint_value()); - else if (val.has_uint_value()) - return QVariant((qulonglong)val.uint_value()); - else if (val.has_float_value()) - return QVariant(val.float_value()); - else if (val.has_double_value()) - return QVariant(val.double_value()); - else if (val.has_string_value()) - return QVariant(QByteArray::fromStdString(val.string_value())); - else - return QVariant(); -} - const QVariant *PBF::Feature::value(const QByteArray &key) const { const KeyHash &keys(_layer->keys()); @@ -43,10 +22,10 @@ if (it == keys.constEnd()) return 0; - google::protobuf::uint32 index = *it; - for (int i = 0; i < _data->tags_size(); i = i + 2) - if (_data->tags(i) == index) - return &(_layer->values().at(_data->tags(i+1))); + quint32 index = *it; + for (int i = 0; i < _data->tags.size(); i = i + 2) + if (_data->tags.at(i) == index) + return &(_layer->values().at(_data->tags.at(i+1))); return 0; } @@ -56,15 +35,15 @@ QPoint cursor; QPainterPath path; - for (int i = 0; i < _data->geometry_size(); i++) { - quint32 g = _data->geometry(i); + for (int i = 0; i < _data->geometry.size(); i++) { + quint32 g = _data->geometry.at(i); unsigned cmdId = g & 0x7; unsigned cmdCount = g >> 3; if (cmdId == MOVE_TO) { for (unsigned j = 0; j < cmdCount; j++) { - QPoint offset = parameters(_data->geometry(i+1), - _data->geometry(i+2)); + QPoint offset = parameters(_data->geometry.at(i+1), + _data->geometry.at(i+2)); i += 2; cursor += offset; path.moveTo(QPointF(cursor.x() * factor.width(), @@ -72,8 +51,8 @@ } } else if (cmdId == LINE_TO) { for (unsigned j = 0; j < cmdCount; j++) { - QPoint offset = parameters(_data->geometry(i+1), - _data->geometry(i+2)); + QPoint offset = parameters(_data->geometry.at(i+1), + _data->geometry.at(i+2)); i += 2; cursor += offset; path.lineTo(QPointF(cursor.x() * factor.width(), @@ -88,27 +67,23 @@ return path; } -PBF::Layer::Layer(const vector_tile::Tile_Layer *data) : _data(data) +PBF::Layer::Layer(const Data::Layer *layer) : _data(layer) { - _keys.reserve(data->keys_size()); - for (int i = 0; i < data->keys_size(); i++) - _keys.insert(QByteArray::fromStdString(data->keys(i)), i); - _values.reserve(data->values_size()); - for (int i = 0; i < data->values_size(); i++) - _values.append(value(data->values(i))); - - _features.reserve(data->features_size()); - for (int i = 0; i < data->features_size(); i++) - _features.append(Feature(&(data->features(i)), this)); + _keys.reserve(layer->keys.size()); + for (int i = 0; i < layer->keys.size(); i++) + _keys.insert(layer->keys.at(i), i); + + _features.reserve(layer->features.size()); + for (int i = 0; i < layer->features.size(); i++) + _features.append(Feature(&(layer->features.at(i)), this)); std::sort(_features.begin(), _features.end()); } -PBF::PBF(const vector_tile::Tile &tile) +PBF::PBF(const Data &data) { - for (int i = 0; i < tile.layers_size(); i++) { - const vector_tile::Tile_Layer &layer = tile.layers(i); - _layers.insert(QByteArray::fromStdString(layer.name()), - new Layer(&layer)); + for (int i = 0; i < data.layers().size(); i++) { + const Data::Layer &layer = data.layers().at(i); + _layers.insert(layer.name, new Layer(&layer)); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPBFImagePlugin-3.2/src/pbf.h new/QtPBFImagePlugin-4.0/src/pbf.h --- old/QtPBFImagePlugin-3.2/src/pbf.h 2024-10-06 13:24:08.000000000 +0200 +++ new/QtPBFImagePlugin-4.0/src/pbf.h 2025-01-08 00:36:27.000000000 +0100 @@ -5,10 +5,10 @@ #include <QVector> #include <QHash> #include <QPainterPath> -#include "vector_tile.pb.h" +#include "data.h" -typedef QHash<QByteArray, google::protobuf::uint32> KeyHash; +typedef QHash<QByteArray, quint32> KeyHash; class PBF { @@ -19,17 +19,17 @@ { public: Feature() : _data(0), _layer(0) {} - Feature(const vector_tile::Tile_Feature *data, const Layer *layer) + Feature(const Data::Feature *data, const Layer *layer) : _data(data), _layer(layer) {} const QVariant *value(const QByteArray &key) const; - vector_tile::Tile_GeomType type() const {return _data->type();} + Data::GeomType type() const {return _data->type;} QPainterPath path(const QSizeF &factor) const; friend bool operator<(const Feature &f1, const Feature &f2); private: - const vector_tile::Tile_Feature *_data; + const Data::Feature *_data; const Layer *_layer; }; @@ -37,22 +37,21 @@ { public: - Layer(const vector_tile::Tile_Layer *data); + Layer(const Data::Layer *layer); const QVector<Feature> &features() const {return _features;} - const QVector<QVariant> &values() const {return _values;} + const QVector<QVariant> &values() const {return _data->values;} const KeyHash &keys() const {return _keys;} - const vector_tile::Tile_Layer *data() const {return _data;} + const Data::Layer *data() const {return _data;} private: - const vector_tile::Tile_Layer *_data; + const Data::Layer *_data; QVector<Feature> _features; - QVector<QVariant> _values; KeyHash _keys; }; - PBF(const vector_tile::Tile &tile); + PBF(const Data &data); ~PBF(); const QHash<QByteArray, Layer*> &layers() const {return _layers;} @@ -62,6 +61,6 @@ }; inline bool operator<(const PBF::Feature &f1, const PBF::Feature &f2) - {return f1._data->id() < f2._data->id();} + {return f1._data->id < f2._data->id;} #endif // PBF_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPBFImagePlugin-3.2/src/pbfhandler.cpp new/QtPBFImagePlugin-4.0/src/pbfhandler.cpp --- old/QtPBFImagePlugin-3.2/src/pbfhandler.cpp 2024-10-06 13:24:08.000000000 +0200 +++ new/QtPBFImagePlugin-4.0/src/pbfhandler.cpp 2025-01-08 00:36:27.000000000 +0100 @@ -3,6 +3,7 @@ #include <QtEndian> #include <QDebug> #include "gzip.h" +#include "data.h" #include "tile.h" #include "style.h" #include "pbfhandler.h" @@ -73,8 +74,8 @@ } } else if (isPlainPBF(magic)) ba = device()->readAll(); - vector_tile::Tile data; - if (!data.ParseFromArray(ba.constData(), ba.size())) { + Data data; + if (!data.load(ba)) { qCritical() << "Invalid PBF data"; return false; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtPBFImagePlugin-3.2/src/style.cpp new/QtPBFImagePlugin-4.0/src/style.cpp --- old/QtPBFImagePlugin-3.2/src/style.cpp 2024-10-06 13:24:08.000000000 +0200 +++ new/QtPBFImagePlugin-4.0/src/style.cpp 2025-01-08 00:36:27.000000000 +0100 @@ -14,16 +14,16 @@ #include "style.h" -static vector_tile::Tile_GeomType geometryType(const QString &str) +static Data::GeomType geometryType(const QString &str) { if (str == "Point") - return vector_tile::Tile_GeomType_POINT; + return Data::GeomType::POINT; else if (str == "LineString") - return vector_tile::Tile_GeomType_LINESTRING; + return Data::GeomType::LINESTRING; else if (str == "Polygon") - return vector_tile::Tile_GeomType_POLYGON; + return Data::GeomType::POLYGON; else - return vector_tile::Tile_GeomType_UNKNOWN; + return Data::GeomType::UNKNOWN; } static QVariant variant(const QJsonValue &val) @@ -680,15 +680,15 @@ void Style::drawLayer(const PBF::Layer &pbfLayer, const Layer &styleLayer, Tile &tile) { - if (pbfLayer.data()->version() > 2) + if (pbfLayer.data()->version > 2) return; if (!styleLayer.isVisible()) return; QSizeF factor(tile.size().width() / tile.scale().x() / - (qreal)pbfLayer.data()->extent(), tile.size().height() / tile.scale().y() - / (qreal)pbfLayer.data()->extent()); + (qreal)pbfLayer.data()->extent, tile.size().height() / tile.scale().y() + / (qreal)pbfLayer.data()->extent); tile.painter().save(); setupLayer(tile, styleLayer); ++++++ debian.changelog ++++++ --- /var/tmp/diff_new_pack.wWFDGp/_old 2025-01-09 15:12:44.757510619 +0100 +++ /var/tmp/diff_new_pack.wWFDGp/_new 2025-01-09 15:12:44.761510785 +0100 @@ -1,3 +1,9 @@ +qt5-pbf-image-plugin (4.0) stable; urgency=low + + * Removed Google Protocol buffers dependency. + + -- Martin Tuma <tumic@cbox.cz> Wed, 08 Jan 2025 01:10:03 +0100 + qt5-pbf-image-plugin (3.2) stable; urgency=low * Improved rendering performance. ++++++ debian.control ++++++ --- /var/tmp/diff_new_pack.wWFDGp/_old 2025-01-09 15:12:44.805512614 +0100 +++ /var/tmp/diff_new_pack.wWFDGp/_new 2025-01-09 15:12:44.809512781 +0100 @@ -2,7 +2,7 @@ Section: libs Priority: optional Maintainer: Martin Tuma <tumic@cbox.cz> -Build-Depends: debhelper (>= 9), qtbase5-dev, qtbase5-dev-tools, qt5-qmake, libprotobuf-dev, protobuf-compiler, zlib1g-dev +Build-Depends: debhelper (>= 9), qtbase5-dev, qtbase5-dev-tools, qt5-qmake, zlib1g-dev Homepage: https://github.com/tumic0/QtPBFImagePlugin Package: qt5-pbf-image-plugin ++++++ qtpbfplugin.dsc ++++++ --- /var/tmp/diff_new_pack.wWFDGp/_old 2025-01-09 15:12:44.841514111 +0100 +++ /var/tmp/diff_new_pack.wWFDGp/_new 2025-01-09 15:12:44.845514277 +0100 @@ -1,10 +1,10 @@ Format: 1.0 Source: qt5-pbf-image-plugin -Version: 3.2-1 +Version: 4.0-1 Binary: qt5-pbf-image-plugin Maintainer: Martin Tuma <tumic@cbox.cz> Architecture: any -Build-Depends: debhelper (>= 9), qtbase5-dev, qtbase5-dev-tools, qt5-qmake, libprotobuf-dev, protobuf-compiler, zlib1g-dev +Build-Depends: debhelper (>= 9), qtbase5-dev, qtbase5-dev-tools, qt5-qmake, zlib1g-dev Files: - 00000000000000000000000000000000 0 QtPBFImagePlugin-3.2.tar.gz + 00000000000000000000000000000000 0 QtPBFImagePlugin-4.0.tar.gz