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

Merge master into gtk3

Browse Source
This commit is contained in:
heckflosse
2016-10-28 17:59:47 +02:00
parent 5244c44420 3a346d919d
commit b16ef8d1f5
259 changed files with 5061 additions and 3654 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
rtgui/crophandler.cc
View File

@@ -32,10 +32,10 @@ using namespace rtengine;
CropHandler::CropHandler ()
: zoom(10), ww(0), wh(0), imx(-1), imy(-1), imw(0), imh(0), cax(-1), cay(-1),
cx(0), cy(0), cw(0), ch(0), cropX(0), cropY(0), cropW(0), cropH(0), enabled(false),
cropimg(NULL), cropimgtrue(NULL), cropimg_width(0), cropimg_height(0),
cropimg(nullptr), cropimgtrue(nullptr), cropimg_width(0), cropimg_height(0),
cix(0), ciy(0), ciw(0), cih(0), cis(1),
initial(false), isLowUpdatePriority(false), ipc(NULL), crop(NULL),
displayHandler(NULL)
initial(false), isLowUpdatePriority(false), ipc(nullptr), crop(nullptr),
displayHandler(nullptr)
{
chi = new CropHandlerIdleHelper;
@@ -56,7 +56,7 @@ CropHandler::~CropHandler ()
if (crop) {
//crop->destroy ();
delete crop; // will do the same than destroy, plus delete the object
crop = NULL;
crop = nullptr;
}
cimg.lock ();
@@ -86,8 +86,8 @@ void CropHandler::newImage (StagedImageProcessor* ipc_, bool isDetailWindow)
return;
}
EditDataProvider *editDataProvider = NULL;
CropWindow *cropWin = displayHandler ? static_cast<CropWindow*>(displayHandler) : NULL;
EditDataProvider *editDataProvider = nullptr;
CropWindow *cropWin = displayHandler ? static_cast<CropWindow*>(displayHandler) : nullptr;
if (cropWin) {
editDataProvider = cropWin->getImageArea();
@@ -95,7 +95,7 @@ void CropHandler::newImage (StagedImageProcessor* ipc_, bool isDetailWindow)
crop = ipc->createCrop (editDataProvider, isDetailWindow);
ipc->setSizeListener (this);
crop->setListener (enabled ? this : NULL);
crop->setListener (enabled ? this : nullptr);
initial = true;
}
@@ -110,6 +110,16 @@ void CropHandler::sizeChanged (int x, int y, int ow, int oh) // the ipc notif
*/
}
bool CropHandler::isFullDisplay ()
{
int w, h;
getFullImageSize(w, h);
if (!w) {
return false;
}
return cropW == w && cropH == h;
}
double CropHandler::getFitCropZoom ()
{
double z1 = (double) wh / cropParams.h;
@@ -304,9 +314,9 @@ int createpixbufs (void* data)
if (!ch->enabled) {
delete [] ch->cropimg;
ch->cropimg = NULL;
ch->cropimg = nullptr;
delete [] ch->cropimgtrue;
ch->cropimgtrue = NULL;
ch->cropimgtrue = nullptr;
ch->cimg.unlock ();
return 0;
}
@@ -338,9 +348,9 @@ int createpixbufs (void* data)
}
delete [] ch->cropimg;
ch->cropimg = NULL;
ch->cropimg = nullptr;
delete [] ch->cropimgtrue;
ch->cropimgtrue = NULL;
ch->cropimgtrue = nullptr;
}
ch->cimg.unlock ();
@@ -378,13 +388,13 @@ void CropHandler::setDetailedCrop (IImage8* im, IImage8* imtrue, rtengine::procp
delete [] cropimg;
}
cropimg = NULL;
cropimg = nullptr;
if (cropimgtrue) {
delete [] cropimgtrue;
}
cropimgtrue = NULL;
cropimgtrue = nullptr;
if (ax == cropX && ay == cropY && aw == cropW && ah == cropH && askip == (zoom >= 1000 ? 1 : zoom)) {
cropimg_width = im->getWidth ();
@@ -453,14 +463,14 @@ void CropHandler::setEnabled (bool e)
if (!enabled) {
if (crop) {
crop->setListener (NULL);
crop->setListener (nullptr);
}
cimg.lock ();
delete [] cropimg;
cropimg = NULL;
cropimg = nullptr;
delete [] cropimgtrue;
cropimgtrue = NULL;
cropimgtrue = nullptr;
cropPixbuf.clear ();
cimg.unlock ();
} else {