liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'imdim_cleanup-dev' into dev

Browse Source
This commit is contained in:
Flössie
2017-02-19 12:32:52 +01:00
parent eb9aee64b3 e9b5f42a9f
commit 6daf5f6011
17 changed files with 318 additions and 280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rtgui/bqentryupdater.cc
View File

@@ -120,11 +120,11 @@ void BatchQueueEntryUpdater::processThread ()
int prevh = img->getHeight();
#ifndef NDEBUG
if (current.ow != img->getW() || current.oh != img->getH()) {
printf("WARNING! Expected image size: %dx%d ; image size is: %dx%d\n", current.ow, current.oh, img->getW(), img->getH());
if (current.ow != img->getWidth() || current.oh != img->getHeight()) {
printf("WARNING! Expected image size: %dx%d ; image size is: %dx%d\n", current.ow, current.oh, img->getWidth(), img->getHeight());
}
assert ((current.ow + 1)*current.oh >= img->getW()*img->getH());
assert ((current.ow + 1)*current.oh >= img->getWidth()*img->getHeight());
#endif
current.ow = prevw;
current.oh = prevh;