#define VERSION_CHANGE "$Change: 6329 $" #define VERSION_DATE "$Date: 2008/05/07 $"
| # | Change | User | Description | Committed | |
|---|---|---|---|---|---|
| #8 | 6329 | Sam Stafford | Get the app icon working again. | ||
| #7 | 6281 | Sam Stafford | CALAMARI now builds with VS2005 and Qt 4.3.3. | ||
| #6 | 5552 | Sam Stafford |
Use a QImageReader when reading in the two "leg" images, and send errorString() to the user if the image fails to load. |
||
| #5 | 5549 | Sam Stafford |
Fix another edge case bug where Qt's behavior is the opposite of what I'd expect - when an empty clip region is set, the clip region is cleared entirely, as if a FULL clip region had been set. The resulting bug was that any image which had zero conflicts would show up as one gigantic conflict - ack! The code now checks for this case and bails out of any painting operation that's about to use an empty clip region. |
||
| #4 | 5548 | Sam Stafford |
Only apply alpha-channel diff fix to files that actually have alpha channels. (Painting images with no alpha channels on top of each other doesn't behave like I'd hoped it would.) |
||
| #3 | 5543 | Sam Stafford |
Diffing transparent images produced some weird artifacts, since blending them requires hijacking the alpha channel. Fixed it by painting the images on top of opaque backgrounds before diffing them. |
||
| #2 | 5539 | Sam Stafford | Kick off another window to merge alpha channels, if present. | ||
| #1 | 5528 | Sam Stafford | Version file. |