Merge lp:~djaler1/pantheon-photos/fix-1302900 into lp:~pantheon-photos/pantheon-photos/trunk

[Kirill Romanov]

Add Gif support

Fix bug 1302900

[Danielle Foré (danrabbit)]

Don't forget to add gif as a supported mimetype in the .desktop file ;)

review: Needs Fixing

[Danielle Foré (danrabbit)]

I can confirm this add gif support to Photo Viewer, but I can't confirm that it makes them show in the photos library

[lp:~djaler1/pantheon-photos/fix-1302900]

3098. By Kirill Romanov on 2017-01-01

Added mimetype in .desktop file, fixed import gifs in library

=== modified file 'data/org.pantheon.photos-viewer.desktop.in.in'
--- data/org.pantheon.photos-viewer.desktop.in.in	2016-08-28 20:08:59 +0000
+++ data/org.pantheon.photos-viewer.desktop.in.in	2017-01-01 21:59:12 +0000
@@ -8,7 +8,7 @@
 NoDisplay=true
 Type=Application
 StartupNotify=true
-MimeType=image/jpeg;image/jpg;image/pjpeg;image/png;image/tiff;image/x-3fr;image/x-adobe-dng;image/x-arw;image/x-bay;image/x-bmp;image/x-canon-cr2;image/x-canon-crw;image/x-cap;image/x-cr2;image/x-crw;image/x-dcr;image/x-dcraw;image/x-dcs;image/x-dng;image/x-drf;image/x-eip;image/x-erf;image/x-fff;image/x-fuji-raf;image/x-iiq;image/x-k25;image/x-kdc;image/x-mef;image/x-minolta-mrw;image/x-mos;image/x-mrw;image/x-nef;image/x-nikon-nef;image/x-nrw;image/x-olympus-orf;image/x-orf;image/x-panasonic-raw;image/x-pef;image/x-pentax-pef;image/x-png;image/x-ptx;image/x-pxn;image/x-r3d;image/x-raf;image/x-raw;image/x-rw2;image/x-rwl;image/x-rwz;image/x-sigma-x3f;image/x-sony-arw;image/x-sony-sr2;image/x-sony-srf;image/x-sr2;image/x-srf;image/x-x3f;
+MimeType=image/jpeg;image/jpg;image/pjpeg;image/png;image/tiff;image/gif;image/x-3fr;image/x-adobe-dng;image/x-arw;image/x-bay;image/x-bmp;image/x-canon-cr2;image/x-canon-crw;image/x-cap;image/x-cr2;image/x-crw;image/x-dcr;image/x-dcraw;image/x-dcs;image/x-dng;image/x-drf;image/x-eip;image/x-erf;image/x-fff;image/x-fuji-raf;image/x-iiq;image/x-k25;image/x-kdc;image/x-mef;image/x-minolta-mrw;image/x-mos;image/x-mrw;image/x-nef;image/x-nikon-nef;image/x-nrw;image/x-olympus-orf;image/x-orf;image/x-panasonic-raw;image/x-pef;image/x-pentax-pef;image/x-png;image/x-ptx;image/x-pxn;image/x-r3d;image/x-raf;image/x-raw;image/x-rw2;image/x-rwl;image/x-rwz;image/x-sigma-x3f;image/x-sony-arw;image/x-sony-sr2;image/x-sony-srf;image/x-sr2;image/x-srf;image/x-x3f;
 Categories=Graphics;Viewer;Photography;GNOME;GTK;
 Actions=AboutDialog;
 
 
=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2016-11-05 04:17:16 +0000
+++ src/CMakeLists.txt	2017-01-01 21:59:12 +0000
@@ -144,6 +144,7 @@
 
     photos/BmpSupport.vala
     photos/GdkSupport.vala
+    photos/GifSupport.vala
     photos/GRaw.vala
     photos/JfifSupport.vala
     photos/PhotoFileAdapter.vala
 
=== added file 'src/photos/GifSupport.vala'
--- src/photos/GifSupport.vala	1970-01-01 00:00:00 +0000
+++ src/photos/GifSupport.vala	2017-01-01 21:59:12 +0000
@@ -0,0 +1,185 @@
+/* Copyright 2010-2013 Yorba Foundation
+ *
+ * This software is licensed under the GNU LGPL (version 2.1 or later).
+ * See the COPYING file in this distribution.
+ */
+
+class GifFileFormatProperties : PhotoFileFormatProperties {
+    private static string[] KNOWN_EXTENSIONS = { "gif" };
+    private static string[] KNOWN_MIME_TYPES = { "image/gif" };
+
+    private static GifFileFormatProperties instance = null;
+
+    public static void init () {
+        instance = new GifFileFormatProperties ();
+    }
+
+    public static GifFileFormatProperties get_instance () {
+        return instance;
+    }
+
+    public override PhotoFileFormat get_file_format () {
+        return PhotoFileFormat.GIF;
+    }
+
+    public override PhotoFileFormatFlags get_flags () {
+        return PhotoFileFormatFlags.NONE;
+    }
+
+    public override string get_user_visible_name () {
+        return _ ("GIF");
+    }
+
+    public override string get_default_extension () {
+        return KNOWN_EXTENSIONS[0];
+    }
+
+    public override string[] get_known_extensions () {
+        return KNOWN_EXTENSIONS;
+    }
+
+    public override string get_default_mime_type () {
+        return KNOWN_MIME_TYPES[0];
+    }
+
+    public override string[] get_mime_types () {
+        return KNOWN_MIME_TYPES;
+    }
+}
+
+public class GifSniffer : GdkSniffer {
+    private const uint8[] MAGIC_SEQUENCE_GIF87 = { 71, 73, 70, 56, 55, 97 };
+    private const uint8[] MAGIC_SEQUENCE_GIF89 = { 71, 73, 70, 56, 57, 97 };
+
+    public GifSniffer (File file, PhotoFileSniffer.Options options) {
+        base (file, options);
+    }
+
+    private static bool is_gif_file (File file) throws Error {
+        FileInputStream instream = file.read (null);
+
+        uint8[] file_lead_sequence = new uint8[MAGIC_SEQUENCE_GIF87.length];
+
+        instream.read (file_lead_sequence, null);
+
+        bool is_gif_87 = true;
+
+        for (int i = 0; i < MAGIC_SEQUENCE_GIF87.length; i++) {
+            if (file_lead_sequence[i] != MAGIC_SEQUENCE_GIF87[i]) {
+                is_gif_87 = false;
+            }
+        }
+
+        if (is_gif_87) {
+            return true;
+        } else {
+            instream.seek (0, SeekType.SET);
+
+            file_lead_sequence = new uint8[MAGIC_SEQUENCE_GIF89.length];
+
+            instream.read (file_lead_sequence, null);
+
+            bool is_gif_89 = true;
+
+            for (int i = 0; i < MAGIC_SEQUENCE_GIF89.length; i++) {
+                if (file_lead_sequence[i] != MAGIC_SEQUENCE_GIF89[i]) {
+                    is_gif_89 = false;
+                }
+            }
+
+            return is_gif_89;
+        }
+    }
+
+    public override DetectedPhotoInformation? sniff () throws Error {
+        if (!is_gif_file (file))
+            return null;
+
+        DetectedPhotoInformation? detected = base.sniff ();
+
+        if (detected == null) {
+            return null;
+        }
+
+        return (detected.file_format == PhotoFileFormat.GIF) ? detected : null;
+    }
+}
+
+public class GifReader : GdkReader {
+    public GifReader (string filepath) {
+        base (filepath, PhotoFileFormat.GIF);
+    }
+
+    public override Gdk.Pixbuf scaled_read (Dimensions full, Dimensions scaled) throws Error {
+        Gdk.Pixbuf result = null;
+        /* if we encounter a situation where there are two orders of magnitude or more of
+           difference between the full image size and the scaled size, and if the full image
+           size has five or more decimal digits of precision, Gdk.Pixbuf.from_file_at_scale( ) can
+           fail due to what appear to be floating-point round-off issues. This isn't surprising,
+           since 32-bit floats only have 6-7 decimal digits of precision in their mantissa. In
+           this case, we prefetch the image at a larger scale and then downsample it to the
+           desired scale as a post-process step. This short-circuits Gdk.Pixbuf's buggy
+           scaling code. */
+        if (((full.width > 9999) || (full.height > 9999)) && ((scaled.width < 100) ||
+        (scaled.height < 100))) {
+            Dimensions prefetch_dimensions = full.get_scaled_by_constraint (1000,
+            ScaleConstraint.DIMENSIONS);
+
+            result = new Gdk.Pixbuf.from_file_at_scale (get_filepath (), prefetch_dimensions.width,
+            prefetch_dimensions.height, false);
+
+            result = result.scale_simple (scaled.width, scaled.height, Gdk.InterpType.HYPER);
+        } else {
+            result = new Gdk.Pixbuf.from_file_at_scale (get_filepath (), scaled.width,
+            scaled.height, false);
+        }
+
+        return result;
+    }
+}
+
+public class GifFileFormatDriver : PhotoFileFormatDriver {
+    private static GifFileFormatDriver instance = null;
+
+    public static void init () {
+        instance = new GifFileFormatDriver ();
+        GifFileFormatProperties.init ();
+    }
+
+    public static GifFileFormatDriver get_instance () {
+        return instance;
+    }
+
+    public override PhotoFileFormatProperties get_properties () {
+        return GifFileFormatProperties.get_instance ();
+    }
+
+    public override PhotoFileReader create_reader (string filepath) {
+        return new GifReader (filepath);
+    }
+
+    public override bool can_write_image () {
+        return false;
+    }
+
+    public override bool can_write_metadata () {
+        return false;
+    }
+
+    public override PhotoFileWriter? create_writer (string filepath) {
+        return null;
+    }
+
+    public override PhotoFileMetadataWriter? create_metadata_writer (string filepath) {
+        return null;
+    }
+
+    public override PhotoFileSniffer create_sniffer (File file, PhotoFileSniffer.Options options) {
+        return new GifSniffer (file, options);
+    }
+
+    public override PhotoMetadata create_metadata () {
+        return new PhotoMetadata ();
+    }
+}
+
 
=== modified file 'src/photos/PhotoFileFormat.vala'
--- src/photos/PhotoFileFormat.vala	2014-08-08 21:13:09 +0000
+++ src/photos/PhotoFileFormat.vala	2017-01-01 21:59:12 +0000
@@ -63,12 +63,13 @@
     PNG,
     TIFF,
     BMP,
+    GIF,
     UNKNOWN;
 
     // This is currently listed in the order of detection, that is, the file is examined from
     // left to right.  (See PhotoFileInterrogator.)
     public static PhotoFileFormat[] get_supported () {
-        return { JFIF, RAW, PNG, TIFF, BMP };
+        return { JFIF, RAW, PNG, TIFF, BMP, GIF};
     }
 
     public static PhotoFileFormat[] get_writeable () {
@@ -144,6 +145,9 @@
         case BMP:
             return 4;
 
+        case GIF:
+            return 5;
+
         case UNKNOWN:
         default:
             return -1;
@@ -168,6 +172,9 @@
         case 4:
             return BMP;
 
+        case 5:
+            return GIF;
+
         default:
             return UNKNOWN;
         }
@@ -212,6 +219,9 @@
         case "bmp":
             return PhotoFileFormat.BMP;
 
+        case "gif":
+            return PhotoFileFormat.GIF;
+
         default:
             return PhotoFileFormat.UNKNOWN;
         }
@@ -239,6 +249,10 @@
             Photos.BmpFileFormatDriver.init ();
             break;
 
+        case GIF:
+            GifFileFormatDriver.init ();
+            break;
+
         default:
             error ("Unsupported file format %s", this.to_string ());
         }
@@ -261,6 +275,9 @@
         case BMP:
             return Photos.BmpFileFormatDriver.get_instance ();
 
+        case GIF:
+            return GifFileFormatDriver.get_instance ();
+
         default:
             error ("Unsupported file format %s", this.to_string ());
         }