creyD/intelliphoto
1
0
Fork 0
mirror of https://github.com/creyD/intelliphoto.git synced 2026-04-13 03:40:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into 'dev-stupidrenderer'

Browse Source 
# Conflicts:
#   src/Image/IntelliImage.cpp
#   src/Image/IntelliRasterImage.cpp
#   src/Image/IntelliShapedImage.cpp
#   src/Layer/PaintingArea.cpp
This commit is contained in:
Jan Schuffenhauer
2020-01-09 09:39:38 +00:00
parent 67b623a63a c319302fc0
commit 18aec48e4c
23 changed files with 549 additions and 454 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Image/IntelliImage.cpp
View File

@@ -24,7 +24,7 @@ bool IntelliImage::loadImage(const QString &filePath){
QImage loadedImage;
// If the image wasn't loaded leave this function
if (!loadedImage.load(filePath))
if (!loadedImage.load(filePath))
return false;
// scaled Image to size of Layer