|
|
@ -113,12 +113,7 @@ namespace photo_sorter
|
|
|
|
else
|
|
|
|
else
|
|
|
|
{
|
|
|
|
{
|
|
|
|
fname = global.filenames[global.position];
|
|
|
|
fname = global.filenames[global.position];
|
|
|
|
/*Image img;
|
|
|
|
/* v0.1.1 Preview
|
|
|
|
using (var bmp = new Bitmap(fname))
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
img = new Bitmap(bmp);
|
|
|
|
|
|
|
|
}*/
|
|
|
|
|
|
|
|
//var profile = fname.GetProfile("dng:thumbnail");
|
|
|
|
|
|
|
|
using (var jpegThumbnail = new MagickImage(fname))
|
|
|
|
using (var jpegThumbnail = new MagickImage(fname))
|
|
|
|
{
|
|
|
|
{
|
|
|
|
// Correct the image orientation
|
|
|
|
// Correct the image orientation
|
|
|
@ -126,13 +121,28 @@ namespace photo_sorter
|
|
|
|
//Image img = jpegThumbnail.Write();
|
|
|
|
//Image img = jpegThumbnail.Write();
|
|
|
|
jpegThumbnail.Write(global.dest + "\\.tmp.jpg");
|
|
|
|
jpegThumbnail.Write(global.dest + "\\.tmp.jpg");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
*/
|
|
|
|
Image img;
|
|
|
|
Image img;
|
|
|
|
using (var bmp = new Bitmap(global.dest + "\\.tmp.jpg"))
|
|
|
|
using (MemoryStream img_stream = new MemoryStream())
|
|
|
|
{
|
|
|
|
{
|
|
|
|
img = new Bitmap(bmp);
|
|
|
|
// Convert RAW file to JPEG in memory
|
|
|
|
|
|
|
|
using (var raw_img = new MagickImage(fname))
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
if (raw_img != null)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
raw_img.AutoOrient();
|
|
|
|
|
|
|
|
img_stream.Position = 0;
|
|
|
|
|
|
|
|
raw_img.Write(img_stream, ImageMagick.MagickFormat.Jpeg);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
img_stream.Position = 0;
|
|
|
|
|
|
|
|
using (var bmp = new Bitmap(img_stream))
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
img = new Bitmap(bmp);
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
img_preview.Image = img;
|
|
|
|
img_preview.Image = img;
|
|
|
|
//img_preview.Image = jpegThumbnail;
|
|
|
|
|
|
|
|
img_preview.Visible = true;
|
|
|
|
img_preview.Visible = true;
|
|
|
|
GC.Collect();
|
|
|
|
GC.Collect();
|
|
|
|
GC.WaitForPendingFinalizers();
|
|
|
|
GC.WaitForPendingFinalizers();
|
|
|
|