mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-07-18 21:14:33 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #43 from mytskine/fix-gcc8-warnings-develop

Browse Source 
Fix gcc8 warnings
This commit is contained in:
Luis Ángel San Martín
2019-04-19 16:56:56 +02:00
committed by GitHub
parent ad46d9089c 8c8521a8dc
commit 14f1609ffa
27 changed files with 123 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
YACReader/render.cpp
View File

@ -361,12 +361,12 @@ PageRender::PageRender()
}
PageRender::PageRender(Render * r,int np, const QByteArray & rd, QImage * p,unsigned int d, QVector<ImageFilter *> f)
:QThread(),
render(r),
numPage(np),
data(rd),
page(p),
degrees(d),
filters(f)
filters(f),
render(r)
{
}
@ -398,7 +398,7 @@ void PageRender::run()
//-----------------------------------------------------------------------------
Render::Render()
:currentIndex(0),doublePage(false),doubleMangaPage(false),comic(0),loadedComic(false),imageRotation(0),numLeftPages(4),numRightPages(4)
:comic(0),doublePage(false),doubleMangaPage(false),currentIndex(0),numLeftPages(4),numRightPages(4),loadedComic(false),imageRotation(0)
{
int size = numLeftPages+numRightPages+1;
currentPageBufferedIndex = numLeftPages;
@ -734,20 +734,26 @@ void Render::load(const QString & path, const ComicDB & comicDB)
for(int i = 0; i < filters.count(); i++)
{
if(typeid(*filters[i]) == typeid(BrightnessFilter))
{
if(comicDB.info.brightness == -1)
filters[i]->setLevel(0);
else
filters[i]->setLevel(comicDB.info.brightness);
}
if(typeid(*filters[i]) == typeid(ContrastFilter))
{
if(comicDB.info.contrast == -1)
filters[i]->setLevel(100);
else
filters[i]->setLevel(comicDB.info.contrast);
}
if(typeid(*filters[i]) == typeid(GammaFilter))
{
if(comicDB.info.gamma == -1)
filters[i]->setLevel(100);
else
filters[i]->setLevel(comicDB.info.gamma);
}
}
createComic(path);
if (comic!=0)
@ -857,7 +863,7 @@ void Render::nextPage()
update();
emit pageChanged(currentIndex);
}
else if (hasLoadedComic() && (currentIndex == numPages()-1))
else if (hasLoadedComic() && ((unsigned int)currentIndex == numPages()-1))
{
emit isLast();
}

8
YACReader/viewer.cpp
View File

@ -24,20 +24,20 @@
Viewer::Viewer(QWidget * parent)
:QScrollArea(parent),
currentPage(0),
magnifyingGlassShowed(false),
fullscreen(false),
information(false),
doublePage(false),
doubleMangaPage(false),
zoom(100),
currentPage(0),
wheelStop(false),
direction(1),
restoreMagnifyingGlass(false),
drag(false),
numScrollSteps(22),
shouldOpenNext(false),
shouldOpenPrevious(false),
zoom(100)
magnifyingGlassShowed(false),
restoreMagnifyingGlass(false)
{
translator = new YACReaderTranslator(this);
translator->hide();

2
YACReader/yacreader_local_client.cpp
View File

@ -69,7 +69,7 @@ bool YACReaderLocalClient::requestComicInfo(quint64 libraryId, ComicDB & comic,
int dataAvailable = 0;
QByteArray packageSize;
localSocket->waitForReadyRead(1000);
while(packageSize.size() < sizeof(quint32) && tries < 20)
while(packageSize.size() < (int)sizeof(quint32) && tries < 20)
{
packageSize.append(localSocket->read(sizeof(quint32) - packageSize.size()));
localSocket->waitForReadyRead(100);