Added support Qt version 5.12.4 (relevant for ubuntu 19.10)
Remove excess tesseract header file for compability with new tesseract and ubuntu Added MAX_INT16 as predefined value
This commit is contained in:
parent
fa89460466
commit
ee43f0f90c
@ -2,11 +2,11 @@
|
|||||||
|
|
||||||
#include <leptonica/allheaders.h>
|
#include <leptonica/allheaders.h>
|
||||||
|
|
||||||
#include <tesseract/host.h>
|
|
||||||
|
|
||||||
#include "ImageProcessing.h"
|
#include "ImageProcessing.h"
|
||||||
#include "StAssert.h"
|
#include "StAssert.h"
|
||||||
|
|
||||||
|
#define MAX_INT16 32767
|
||||||
|
|
||||||
#if defined(Q_OS_LINUX)
|
#if defined(Q_OS_LINUX)
|
||||||
# include <fstream>
|
# include <fstream>
|
||||||
# include <limits>
|
# include <limits>
|
||||||
|
10
Manager.cpp
10
Manager.cpp
@ -246,8 +246,18 @@ void Manager::capture () {
|
|||||||
QList<QScreen *> screens = QApplication::screens ();
|
QList<QScreen *> screens = QApplication::screens ();
|
||||||
foreach (QScreen * screen, screens) {
|
foreach (QScreen * screen, screens) {
|
||||||
QRect geometry = screen->availableGeometry ();
|
QRect geometry = screen->availableGeometry ();
|
||||||
|
#if QT_VERSION >= QT_VERSION_CHECK(5,10,0)
|
||||||
|
QPixmap pixmap = screen->grabWindow (0, 0, 0,
|
||||||
|
geometry.width (), geometry.height ());
|
||||||
|
#else
|
||||||
|
#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
|
||||||
QPixmap pixmap = screen->grabWindow (0, geometry.x (), geometry.y (),
|
QPixmap pixmap = screen->grabWindow (0, geometry.x (), geometry.y (),
|
||||||
geometry.width (), geometry.height ());
|
geometry.width (), geometry.height ());
|
||||||
|
#else
|
||||||
|
assert c(0 && "Qt version is too small");
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
QString name = screen->name ();
|
QString name = screen->name ();
|
||||||
if (!selections_.contains (name)) {
|
if (!selections_.contains (name)) {
|
||||||
SelectionDialog *selection = new SelectionDialog (*dictionary_);
|
SelectionDialog *selection = new SelectionDialog (*dictionary_);
|
||||||
|
Loading…
Reference in New Issue
Block a user