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

Fix issue #407

Browse Source
This commit is contained in:
Hombre
2010-12-27 21:49:16 +01:00
parent 3a82636562
commit ed48eb4547
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
rtgui/crop.cc
View File

@@ -352,11 +352,6 @@ void Crop::trim (ProcParams* pp, int ow, int oh) {
int xmin = pp->crop.x; int xmin = pp->crop.x;
int ymin = pp->crop.y; int ymin = pp->crop.y;
if (pp->coarse.rotate == 90 || pp->coarse.rotate == 270) {
int tmp = oh;
oh = ow;
ow = tmp;
}
if (xmin > ow || ymin > oh) { if (xmin > ow || ymin > oh) {
// the crop is completely out of the image, so we disable the crop // the crop is completely out of the image, so we disable the crop
pp->crop.enabled = false; pp->crop.enabled = false;

12
rtgui/toolpanelcoord.cc
View File

@@ -20,6 +20,7 @@
#include <toolpanelcoord.h> #include <toolpanelcoord.h>
#include <ilabel.h> #include <ilabel.h>
#include <options.h> #include <options.h>
#include <imagesource.h>
using namespace rtengine::procparams; using namespace rtengine::procparams;
@@ -217,12 +218,21 @@ void ToolPanelCoordinator::panelChanged (rtengine::ProcEvent event, const Glib::
void ToolPanelCoordinator::profileChange (const ProcParams *nparams, rtengine::ProcEvent event, const Glib::ustring& descr, const ParamsEdited* paramsEdited) { void ToolPanelCoordinator::profileChange (const ProcParams *nparams, rtengine::ProcEvent event, const Glib::ustring& descr, const ParamsEdited* paramsEdited) {
int fw, fh, tr;
if (!ipc) return; if (!ipc) return;
ProcParams *params = ipc->getParamsForUpdate (event); ProcParams *params = ipc->getParamsForUpdate (event);
*params = *nparams; *params = *nparams;
tr = TR_NONE;
if (params->coarse.rotate==90) tr |= TR_R90;
if (params->coarse.rotate==180) tr |= TR_R180;
if (params->coarse.rotate==270) tr |= TR_R270;
// trimming overflowing cropped area // trimming overflowing cropped area
crop->trim(params, ipc->getFullWidth(), ipc->getFullHeight()); rtengine::ImageSource *ii = (rtengine::ImageSource*)ipc->getInitialImage();
ii->getFullSize (fw, fh, tr);
crop->trim(params, fw, fh);
// updating the GUI with updated values // updating the GUI with updated values
for (unsigned int i=0; i<toolPanels.size(); i++) for (unsigned int i=0; i<toolPanels.size(); i++)