github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-07-16 10:03:44 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed a problem with writing transparent bitmaps to non transparent image formats. Cleaned up some code, implemented the start of a donate page in the installer (also tweaked the size a bit)

Browse source 
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@1673 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
This commit is contained in:
RKrom 2012-02-21 13:30:43 +00:00
parent 4a07359cf6
commit 150ea9c4eb
7 changed files with 157 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

59
Greenshot/Helpers/ImageOutput.cs
View file

@ -76,41 +76,41 @@ namespace Greenshot.Helpers {
/// Saves image to stream with specified quality
/// </summary>
public static void SaveToStream(Image imageToSave, Stream stream, OutputFormat extension, int quality) {
ImageFormat imfo = null;
bool disposeImage = false;
ImageFormat imageFormat = null;
//bool disposeImage = false;
switch (extension) {
case OutputFormat.bmp:
imfo = ImageFormat.Bmp;
imageFormat = ImageFormat.Bmp;
break;
case OutputFormat.gif:
imfo = ImageFormat.Gif;
imageFormat = ImageFormat.Gif;
break;
case OutputFormat.jpg:
imfo = ImageFormat.Jpeg;
imageFormat = ImageFormat.Jpeg;
break;
case OutputFormat.png:
imfo = ImageFormat.Png;
imageFormat = ImageFormat.Png;
break;
case OutputFormat.tiff:
imfo = ImageFormat.Tiff;
imageFormat = ImageFormat.Tiff;
break;
default:
imfo = ImageFormat.Png;
imageFormat = ImageFormat.Png;
break;
}
// If Quantizing is enable, overwrite the image to save with a 256 - color version
if (conf.OutputFileReduceColors) {
try {
LOG.Debug("Reducing colors on bitmap.");
Quantizer quantizer = new OctreeQuantizer(255,8);
imageToSave = quantizer.Quantize(imageToSave);
// Make sure the "new" image is disposed
disposeImage = true;
} catch(Exception e) {
LOG.Warn("Error occurred while Quantizing the image, ignoring and using original. Error: ", e);
}
}
//// If Quantizing is enable, overwrite the image to save with a 256 - color version
//if (conf.OutputFileReduceColors) {
// try {
// LOG.Debug("Reducing colors on bitmap.");
// Quantizer quantizer = new OctreeQuantizer(255,8);
// imageToSave = quantizer.Quantize(imageToSave);
// // Make sure the "new" image is disposed
// disposeImage = true;
// } catch(Exception e) {
// LOG.Warn("Error occurred while Quantizing the image, ignoring and using original. Error: ", e);
// }
//}
try {
// Create meta-data
@ -119,23 +119,28 @@ namespace Greenshot.Helpers {
try {
imageToSave.SetPropertyItem(softwareUsedPropertyItem);
} catch (ArgumentException) {
LOG.WarnFormat("Image of type {0} do not support property {1}", imfo, softwareUsedPropertyItem.Id);
LOG.WarnFormat("Image of type {0} do not support property {1}", imageFormat, softwareUsedPropertyItem.Id);
}
}
LOG.DebugFormat("Saving image to stream with PixelFormat {0}", imageToSave.PixelFormat);
if (imfo == ImageFormat.Jpeg) {
if (imageFormat == ImageFormat.Jpeg) {
EncoderParameters parameters = new EncoderParameters(1);
parameters.Param[0] = new System.Drawing.Imaging.EncoderParameter(Encoder.Quality, quality);
ImageCodecInfo[] ies = ImageCodecInfo.GetImageEncoders();
imageToSave.Save(stream, ies[1], parameters);
} else if (imageFormat != ImageFormat.Png && Image.IsAlphaPixelFormat(imageToSave.PixelFormat)) {
// No transparency in target format
using (Bitmap tmpBitmap = ImageHelper.Clone(imageToSave, PixelFormat.Format24bppRgb)) {
tmpBitmap.Save(stream, imageFormat);
}
} else {
imageToSave.Save(stream, imfo);
imageToSave.Save(stream, imageFormat);
}
} finally {
// cleanup if needed
if (disposeImage && imageToSave != null) {
imageToSave.Dispose();
}
// // cleanup if needed
// if (disposeImage && imageToSave != null) {
// imageToSave.Dispose();
// }
}
}