Merge from default. Hope I did it right...

This commit is contained in:
Emil Martinec
2012-03-08 20:27:30 -06:00
parent 380728e1f0
commit f47b4b5bb0
262 changed files with 41736 additions and 37104 deletions

View File

@@ -63,7 +63,7 @@ class Crop : public DetailedCrop {
public:
Crop (ImProcCoordinator* parent);
~Crop ();
virtual ~Crop ();
bool hasListener () { return cropImageListener; }
void update (int todo);
@@ -73,7 +73,7 @@ class Crop : public DetailedCrop {
void fullUpdate (); // called via thread
void setListener (DetailedCropListener* il);
void destroy () { delete this; }
void destroy () {}
int get_skip () { return skip;}
};
}