Added an option to enable PDF image compression with a customizable quality

NAPS2.Core/ImportExport/Pdf/PdfImageSettings.cs

@@ -0,0 +1,37 @@
+/*
+    NAPS2 (Not Another PDF Scanner 2)
+    http://sourceforge.net/projects/naps2/
+
+    Copyright (C) 2015       Luca De Petrillo
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License
+    as published by the Free Software Foundation; either version 2
+    of the License, or (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+*/
+
+using NAPS2.Lang.Resources;
+
+namespace NAPS2.ImportExport.Pdf
+{
+    public class PdfImageSettings
+    {
+        public const int DEFAULT_JPEG_QUALITY = 75;
+        public const bool DEFAULT_COMPRESS_IMAGES = false;
+
+        public PdfImageSettings()
+        {
+            JpegQuality = DEFAULT_JPEG_QUALITY;
+            CompressImages = DEFAULT_COMPRESS_IMAGES;
+        }
+
+        public int JpegQuality { get; set; }
+
+        public bool CompressImages { get; set; }
+    }
+}

NAPS2.Core/ImportExport/Pdf/PdfSettings.cs

@@ -5,6 +5,7 @@
     Copyright (C) 2009       Pavel Sorejs
     Copyright (C) 2012       Michael Adams
     Copyright (C) 2013       Peter De Leeuw
+    Copyright (C) 2015       Luca De Petrillo
     Copyright (C) 2012-2015  Ben Olden-Cooligan
 
     This program is free software; you can redistribute it and/or
@@ -27,11 +28,13 @@ namespace NAPS2.ImportExport.Pdf
     public class PdfSettings
     {
         private PdfMetadata metadata;
+        private PdfImageSettings imageSettings;
         private PdfEncryption encryption;
 
         public PdfSettings()
         {
             metadata = new PdfMetadata();
+            imageSettings = new PdfImageSettings();
             encryption = new PdfEncryption();
         }
 
@@ -50,6 +53,19 @@ public PdfMetadata Metadata
             }
         }
 
+        public PdfImageSettings ImageSettings
+        {
+            get { return imageSettings; }
+            set
+            {
+                if (value == null)
+                {
+                    throw new ArgumentNullException("value");
+                }
+                imageSettings = value;
+            }
+        }
+
         public PdfEncryption Encryption
         {
             get { return encryption; }

NAPS2.Core/ImportExport/Pdf/PdfSharpExporter.cs

@@ -5,6 +5,7 @@
     Copyright (C) 2009       Pavel Sorejs
     Copyright (C) 2012       Michael Adams
     Copyright (C) 2013       Peter De Leeuw
+    Copyright (C) 2015       Luca De Petrillo
     Copyright (C) 2012-2015  Ben Olden-Cooligan
 
     This program is free software; you can redistribute it and/or
@@ -30,6 +31,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 using PdfSharp.Pdf;
 using PdfSharp.Pdf.IO;
 using PdfSharp.Pdf.Security;
+using System.Drawing.Imaging;
 
 namespace NAPS2.ImportExport.Pdf
 {
@@ -107,7 +109,37 @@ public bool Export(string path, IEnumerable<IScannedImage> images, PdfSettings s
                             tf.DrawString(element.Text, new XFont("Times New Roman", adjustedFontSize, XFontStyle.Regular), XBrushes.Transparent, adjustedBounds);
                         }
                     }
-                    gfx.DrawImage(img, 0, 0, (int)realWidth, (int)realHeight);
+
+                    if (scannedImage.IsHighQuality() && settings.ImageSettings.CompressImages)
+                    {
+                        // Compress the image to JPEG and use it if smaller than the original one.
+                        var quality = Math.Max(Math.Min(settings.ImageSettings.JpegQuality, 100), 0);
+                        var encoder = ImageCodecInfo.GetImageEncoders().First(x => x.FormatID == ImageFormat.Jpeg.Guid);
+                        var encoderParams = new EncoderParameters(1);
+                        encoderParams.Param[0] = new EncoderParameter(Encoder.Quality, quality);
+
+                        using (var streamJpg = new MemoryStream())
+                        {
+                            img.Save(streamJpg, encoder, encoderParams);
+                            if (streamJpg.Length < stream.Length) 
+                            {
+                                using (var imgJpg = Bitmap.FromStream(streamJpg))
+                                {
+                                    gfx.DrawImage(imgJpg, 0, 0, (int)realWidth, (int)realHeight);
+                                }
+                            }
+                            else
+                            {
+                                gfx.DrawImage(img, 0, 0, (int)realWidth, (int)realHeight);
+                            }
+
+                        }
+                    }
+                    else
+                    {
+                        gfx.DrawImage(img, 0, 0, (int)realWidth, (int)realHeight);
+                    }
+
                     i++;
                 }
             }

NAPS2.Core/NAPS2.Core.csproj

@@ -81,6 +81,7 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>Icons.resx</DependentUpon>
     </Compile>
+    <Compile Include="ImportExport\Pdf\PdfImageSettings.cs" />
     <Compile Include="ImportExport\Pdf\PdfSaver.cs" />
     <Compile Include="Util\ChangeTracker.cs" />
     <Compile Include="Util\CollectionExtensions.cs" />

NAPS2.Core/Scan/Images/FileBasedScannedImage.cs

@@ -5,6 +5,7 @@
     Copyright (C) 2009       Pavel Sorejs
     Copyright (C) 2012       Michael Adams
     Copyright (C) 2013       Peter De Leeuw
+    Copyright (C) 2015       Luca De Petrillo
     Copyright (C) 2012-2015  Ben Olden-Cooligan
 
     This program is free software; you can redistribute it and/or
@@ -69,9 +70,12 @@ private static DirectoryInfo RecoveryFolder
         // Store a base image and transform pair (rather than doing the actual transform on the base image)
         // so that JPEG degradation is minimized when multiple rotations/flips are performed
         private readonly List<Transform> transformList = new List<Transform>();
+        private readonly bool highQuality;
 
         public FileBasedScannedImage(Bitmap img, ScanBitDepth bitDepth, bool highQuality)
         {
+            this.highQuality = highQuality;
+
             Bitmap baseImage;
             MemoryStream baseImageEncoded;
             ScannedImageHelper.GetSmallestBitmap(img, bitDepth, highQuality, out baseImage, out baseImageEncoded, out baseImageFileFormat);
@@ -214,5 +218,10 @@ public void MovedTo(int index)
             _recoveryIndexManager.Index.Images.Insert(index, indexImage);
             _recoveryIndexManager.Save();
         }
+
+        public bool IsHighQuality()
+        {
+            return highQuality;
+        }
     }
 }

NAPS2.Core/Scan/Images/IScannedImage.cs

@@ -5,6 +5,7 @@
     Copyright (C) 2009       Pavel Sorejs
     Copyright (C) 2012       Michael Adams
     Copyright (C) 2013       Peter De Leeuw
+    Copyright (C) 2015       Luca De Petrillo
     Copyright (C) 2012-2015  Ben Olden-Cooligan
 
     This program is free software; you can redistribute it and/or
@@ -77,5 +78,11 @@ public interface IScannedImage : IDisposable
         /// </summary>
         /// <param name="index">The index at which the image was inserted after being removed.</param>
         void MovedTo(int index);
+
+
+        /// <summary>
+        /// Indicates if the scanned image has been acquired using "High Quality" configuration, or if it has been imported using a lossless format.
+        /// </summary>
+        bool IsHighQuality();
     }
 }

NAPS2.Core/Scan/Images/ScannedImage.cs

@@ -5,6 +5,7 @@
     Copyright (C) 2009       Pavel Sorejs
     Copyright (C) 2012       Michael Adams
     Copyright (C) 2013       Peter De Leeuw
+    Copyright (C) 2015       Luca De Petrillo
     Copyright (C) 2012-2015  Ben Olden-Cooligan
 
     This program is free software; you can redistribute it and/or
@@ -34,6 +35,7 @@ public class ScannedImage : IScannedImage
         private Bitmap thumbnail;
         // The image's bit depth (or C24Bit if unknown)
         private readonly ScanBitDepth bitDepth;
+        private readonly bool highQuality;
         // Only one of the following (baseImage/baseImageEncoded) should have a value for any particular ScannedImage
         private readonly Bitmap baseImage;
         private readonly MemoryStream baseImageEncoded;
@@ -42,9 +44,12 @@ public class ScannedImage : IScannedImage
         // so that JPEG degradation is minimized when multiple rotations/flips are performed
         private readonly List<Transform> transformList = new List<Transform>();
 
+
         public ScannedImage(Bitmap img, ScanBitDepth bitDepth, bool highQuality)
         {
             this.bitDepth = bitDepth;
+            this.highQuality = highQuality;
+
             ScannedImageHelper.GetSmallestBitmap(img, bitDepth, highQuality, out baseImage, out baseImageEncoded, out baseImageFileFormat);
         }
 
@@ -126,5 +131,10 @@ public void MovedTo(int index)
         {
             // Do nothing, this is only important for FileBasedScannedImage
         }
+
+        public bool IsHighQuality()
+        {
+            return highQuality;
+        }
     }
 }