forked from gentoo/gentoo
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
media-gfx/nomacs: Add USE=jpeg, fix build with !opencv
Gentoo-bug: 592118, 592134 Package-Manager: portage-2.3.0
- Loading branch information
1 parent
871be69
commit 8a158a4
Showing
2 changed files
with
15 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
--- a/src/DkLoader/DkBasicLoader.h | ||
+++ b/src/DkLoader/DkBasicLoader.h | ||
@@ -258,7 +258,7 @@ class DllLoaderExport DkBasicLoader : public QObject { | ||
bool readHeader(const unsigned char** dataPtr, int& fileCount, int& vecSize) const; | ||
void getPatchSizeFromFileName(const QString& fileName, int& width, int& height) const; | ||
#else | ||
- bool loadOpenCVVecFile(const QString&, QSharedPointer<QByteArray> = QSharedPointer<QByteArray>(), QSize = QSize()) { return false; }; | ||
+ bool loadOpenCVVecFile(const QString&, QImage&, QSharedPointer<QByteArray> = QSharedPointer<QByteArray>(), QSize = QSize()) { return false; }; | ||
int mergeVecFiles(const QStringList&, QString&) const { return 0; }; | ||
bool readHeader(const unsigned char**, int&, int&) const { return false; }; | ||
void getPatchSizeFromFileName(const QString&, int&, int&) const {}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters