Your message dated Sun, 25 Oct 2020 14:48:49 +0000 with message-id <[email protected]> and subject line Bug#878060: fixed in diffpdf 2.1.3-2 has caused the Debian Bug report #878060, regarding diffpdf: OpenMP parallelized comparison of two PDF`s to be marked as done.
This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact [email protected] immediately.) -- 878060: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=878060 Debian Bug Tracking System Contact [email protected] with problems
--- Begin Message ---Package: diffpdf Version: 2.1.3-1+b1 Severity: wishlist Tags: patch Dear Maintainer, * What led up to the situation? Comparison of two testsuitereports lasts more then a minute * What exactly did you do I wrote a patch to minimize the time of comparison * What was the outcome of this action? Now it only takes a few seconds to compare two testsuitereports -- System Information: Debian Release: 8.9 APT prefers oldstable-updates APT policy: (500, 'oldstable-updates'), (500, 'oldstable') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 3.16.0-4-amd64 (SMP w/16 CPU cores) Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) Versions of packages diffpdf depends on: ii libc6 2.19-18+deb8u10 ii libgcc1 1:4.9.2-10 ii libpoppler-qt4-4 0.26.5-2+deb8u1 ii libqtcore4 4:4.8.6+git64-g5dc8b2b+dfsg-3+deb8u1 ii libqtgui4 4:4.8.6+git64-g5dc8b2b+dfsg-3+deb8u1 ii libstdc++6 4.9.2-10 diffpdf recommends no packages. diffpdf suggests no packages. -- no debconf informationIndex: diffpdf-2.1.3/mainwindow.cpp =================================================================== --- diffpdf-2.1.3.orig/mainwindow.cpp 2017-10-04 15:30:55.579372153 +0200 +++ diffpdf-2.1.3/mainwindow.cpp 2017-10-04 15:46:18.675949547 +0200 @@ -44,6 +44,7 @@ #include <QSettings> #include <QSpinBox> #include <QSplitter> +#include <omp.h> MainWindow::MainWindow(const Debug debug, @@ -1415,40 +1416,62 @@ QList<int> pages1 = getPageList(1, pdf1); QList<int> pages2 = getPageList(2, pdf2); int total = qMin(pages1.count(), pages2.count()); - int number = 0; + int index = 0; - while (!pages1.isEmpty() && !pages2.isEmpty()) { - int p1 = pages1.takeFirst(); - PdfPage page1(pdf1->page(p1)); - if (!page1) { - writeError(tr("Failed to read page %1 from '%2'.") - .arg(p1 + 1).arg(filename1)); - continue; - } - int p2 = pages2.takeFirst(); - PdfPage page2(pdf2->page(p2)); - if (!page2) { - writeError(tr("Failed to read page %1 from '%2'.") - .arg(p2 + 1).arg(filename2)); - continue; - } - writeLine(tr("Comparing: %1 vs. %2.").arg(p1 + 1).arg(p2 + 1)); - QApplication::processEvents(); - if (cancel) { - writeError(tr("Cancelled.")); - break; - } - Difference difference = getTheDifference(page1, page2); - if (difference != NoDifference) { - QVariant v; - v.setValue(PagePair(p1, p2, difference == VisualDifference)); - viewDiffComboBox->addItem(tr("%1 vs. %2 %3 %4") - .arg(p1 + 1).arg(p2 + 1).arg(QChar(0x2022)) - .arg(++index), v); - } - statusLabel->setText(tr("Comparing %1/%2").arg(++number) - .arg(total)); + int number = 0; + int processed = 0; + + Difference difference[total]; + +#pragma omp parallel for schedule(dynamic) + for (number = 0; number < total; number++) { + + int p1 = pages1[number]; + int p2 = pages2[number]; + +#pragma omp critical + { + processed++; + statusLabel->setText(tr("Comparing %1/%2").arg(processed).arg(total)); + writeLine(tr("Comparing: %1 vs. %2.").arg(p1 + 1).arg(p2 + 1)); + QApplication::processEvents(); + } + + if (!cancel) { + + PdfPage page1(pdf1->page(p1)); + if (!page1) { +#pragma omp critical + writeError(tr("Failed to read page %1 from '%2'.").arg(p1 + 1).arg(filename1)); + continue; + } + + PdfPage page2(pdf2->page(p2)); + if (!page2) { +#pragma omp critical + writeError(tr("Failed to read page %1 from '%2'.").arg(p2 + 1).arg(filename2)); + continue; + } + + difference[number] = getTheDifference(page1, page2); + } } + + if (!cancel) { + + for (number = 0; number < total; number++) { + + int p1 = pages1.takeFirst(); + int p2 = pages2.takeFirst(); + + if (difference[number] != NoDifference) { + QVariant v; + v.setValue(PagePair(p1, p2, difference[number] == VisualDifference)); + viewDiffComboBox->addItem(tr("%1 vs. %2 %3 %4").arg(p1 + 1).arg(p2 + 1).arg(QChar(0x2022)).arg(++index), v); + } + } + } + return qMakePair(number, total); } Index: diffpdf-2.1.3/diffpdf.pro =================================================================== --- diffpdf-2.1.3.orig/diffpdf.pro 2013-10-15 09:01:22.000000000 +0200 +++ diffpdf-2.1.3/diffpdf.pro 2017-10-04 15:35:13.152649399 +0200 @@ -32,6 +32,9 @@ TRANSLATIONS += diffpdf_es.ts CODECFORTR = UTF-8 LIBS += -lpoppler-qt4 +QMAKE_CFLAGS += -fopenmp +QMAKE_CXXFLAGS += -fopenmp +QMAKE_LFLAGS += -fopenmp win32 { CONFIG += release }
--- End Message ---
--- Begin Message ---Source: diffpdf Source-Version: 2.1.3-2 Done: [email protected] (Barak A. Pearlmutter) We believe that the bug you reported is fixed in the latest version of diffpdf, which is due to be installed in the Debian FTP archive. A summary of the changes between this version and the previous one is attached. Thank you for reporting the bug, which will now be closed. If you have further comments please address them to [email protected], and the maintainer will reopen the bug report if appropriate. Debian distribution maintenance software pp. Barak A. Pearlmutter <[email protected]> (supplier of updated diffpdf package) (This message was generated automatically at their request; if you believe that there is a problem with it please contact the archive administrators by mailing [email protected]) -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 Format: 1.8 Date: Sat, 24 Oct 2020 20:43:14 +0100 Source: diffpdf Architecture: source Version: 2.1.3-2 Distribution: unstable Urgency: medium Maintainer: David Paleino <[email protected]> Changed-By: Barak A. Pearlmutter <[email protected]> Closes: 776833 776837 878060 901267 Changes: diffpdf (2.1.3-2) unstable; urgency=medium . [ Helmut Grohne ] * Fix FTCBFS: (Closes: #901267) + Don't call qmake twice (dh_auto_configure and explicitly). + Build-Depends: qt5-qmake:native for using lrelease. . [ Barak A. Pearlmutter ] * Use secure copyright file specification URI. * Bump debhelper from deprecated 9 to 13. * Set debhelper-compat version in Build-Depends. * Fix field name typo in debian/copyright (X-Comment => Comment). * Update Vcs-* headers to use salsa repository. * Add dates to quilt patches * Bump policy * Add self as co-maintainer * Patch some spelling errors * Use dh13 facilities in debian/rules * OpenML parallel comparison patch by Sebastian Gerke (closes: #878060) * Move homepage to upstream "FOSS" disclaimer page (closes: #776833) * Update debian/watch uscan support file * Do not check extensions patch by Johannes Schauer (closes: #776837) * Remove obsolete debian/dirs * Override a few more stray lintian spelling false alarms. * Add some keywords to desktop file to placate lintian. * Draw and install scalable SVG icon instead of lo-res one. * Don't complicate things, just invoke lrelease on the .pro file. * Rules-Requires-Root: no Checksums-Sha1: 625a1c0f1c33d69898ff682b9436f74ea5e916de 1979 diffpdf_2.1.3-2.dsc ac1e9b0d250c9af6e39e054b79cfcb1b8ee46078 11368 diffpdf_2.1.3-2.debian.tar.xz 7455f0f109cf3547e13cecef177bc11f0dedcd0b 11419 diffpdf_2.1.3-2_source.buildinfo Checksums-Sha256: 2b8e165eabe5e2641dcab36feaad55c11fa82529b4b6d6dd142015a02c4a8191 1979 diffpdf_2.1.3-2.dsc 34b6d61c668b0a17e4a562c9e7c465a50184bd9b629b3a269df80c1e88ee8615 11368 diffpdf_2.1.3-2.debian.tar.xz 1fee3cfe8bcd57db8d54cd8768929c79126cff609209e026ccbd7a0212d6eee2 11419 diffpdf_2.1.3-2_source.buildinfo Files: 67e439e34650b582f839743992dbed0f 1979 utils optional diffpdf_2.1.3-2.dsc 43ac20a1f6539e078730477ff11d2705 11368 utils optional diffpdf_2.1.3-2.debian.tar.xz 03040218f7a8d3a947730badd2f8dc6f 11419 utils optional diffpdf_2.1.3-2_source.buildinfo -----BEGIN PGP SIGNATURE----- iQJDBAEBCgAtFiEE+nZaz+JE7Dn2AefCmesepNIze4gFAl+Vie8PHGJhcEBkZWJp YW4ub3JnAAoJEJnrHqTSM3uIIxwP/ivzKiL+gb7c27YpEJ6n+2D9VfXfT4j4wvvI WO4sM9+AFeWBVMaMXGcgYis49V6nliuwOswUaL86X+R5pdkHULBAB0jHflTTQAPT 7ln6RReRlqi+uIaFrnd5Le5ii0688yyGOXvhV6OCD03qY3DfXoUxFzivNo2vm4k6 s4STdKLbOypb/BIdn7YPChU8VVGbrVMDz3NJTyJD7gjftLIPjdwxb/Dl/5kfqBjD GRrUEmrusQctAOKEdm2M6GJVPGYmRgjwsU9CBAJV+cLQsmd5KHPtDDdyzoc1Oo0I wgIo1Z5WUO8o+8taVgoUHwLxWQkIO5uqvBJ0PMz5eqe9j37zrRY/ttbi2ZgstXOA vs/lobeziHEMFIHeEdLCiJA3D8qLyWD6+OoOqwboCzDm7MDX/p6maZsFL0JCXg9F vHit3xbBd6tErEdrNdUwMIZmhhqJnPxIWLe6PDE8JzatDZMD18bWBK2Apye3sxEG 630IAfnR1g6a7zHFZJHx1WpxWUHnpWE7cY04aia21a+tVTbTAN2Psh/9dBZba/rp BnSPvRrNCg+lmTxu/K2XO6yorqcpitQOogPeseu4IOGL1hwHep1jc6qtI3NHiP22 appoVUid77Bot9nYzFf/jQlqM5jv5YwUFqv2sUYwh0gXXeHnu9rXsKrK2/VE2iWm bJi+dukY =H06m -----END PGP SIGNATURE-----
--- End Message ---
