← Back to branch summary

~ubuntu-branches/ubuntu/precise/shotwell/precise-updates

« back to all changes in this revision

Viewing changes to src/photos/PngSupport.vala

  • Committer: Package Import Robot
  • Author(s): Robert Ancell
  • Date: 2012-03-28 11:59:51 UTC
  • mfrom: (1.2.10)
  • Revision ID: package-import@ubuntu.com-20120328115951-c63mrdyoqrro0bek
Tags: 0.12.0-0ubuntu1
* New upstream release:
  (Changes since 0.11.6)
  - Adds straighten tool
  - Ported from GTK 2 to GTK 3
  - Better handling of importing from Android devices
  - Facebook and Flickr login now use OAuth authentication
  - Numerous enhancements to the plugin subsystem
  - The F-Spot importer is now implemented as a plugin
  - Many, many bugfixes and stability enhancements
* debian/control:
  - Bump build-depends on gexiv2

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/photos/PngSupport.vala
8
8
    private static string[] KNOWN_EXTENSIONS = { "png" };
9
9
    private static string[] KNOWN_MIME_TYPES = { "image/png" };
10
10
 
11
 
    private static PngFileFormatProperties singleton_instance = null;
 
11
    private static PngFileFormatProperties instance = null;
12
12
 
 
13
    public static void init() {
 
14
        instance = new PngFileFormatProperties();
 
15
    }
 
16
    
13
17
    public static PngFileFormatProperties get_instance() {
14
 
        lock (singleton_instance) {
15
 
            if (singleton_instance == null)
16
 
                singleton_instance = new PngFileFormatProperties();
17
 
        }
18
 
        
19
 
        return singleton_instance;
 
18
        return instance;
20
19
    }
21
 
 
 
20
    
22
21
    public override PhotoFileFormat get_file_format() {
23
22
        return PhotoFileFormat.PNG;
24
23
    }
136
135
}
137
136
 
138
137
public class PngFileFormatDriver : PhotoFileFormatDriver {
139
 
    private static PngFileFormatDriver singleton_instance = null;
 
138
    private static PngFileFormatDriver instance = null;
 
139
    
 
140
    public static void init() {
 
141
        instance = new PngFileFormatDriver();
 
142
        PngFileFormatProperties.init();
 
143
    }
140
144
    
141
145
    public static PngFileFormatDriver get_instance() {
142
 
        lock (singleton_instance) {
143
 
            if (singleton_instance == null)
144
 
                singleton_instance = new PngFileFormatDriver();
145
 
        }
146
 
        
147
 
        return singleton_instance;
 
146
        return instance;
148
147
    }
149
148
    
150
149
    public override PhotoFileFormatProperties get_properties() {