← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/photos/GRaw.vala

  • Committer: Package Import Robot
  • Author(s): Mathieu Trudel-Lapierre
  • Date: 2011-11-25 12:31:19 UTC
  • Revision ID: package-import@ubuntu.com-20111125123119-lfpfor07uow6vrz9
Tags: 0.11.6-0ubuntu2
* debian/patches/99git_libraw_api.patch: cherry-pick changes from git to work
  with libraw 0.14.0.
* debian/patches/05-gomp-linking.patch: we also need to link shotwell against
  GOMP now, apparently, so add -fopenmp to the Makefile's relevant rule.
* debian/shotwell-video-thumbnailer.1: added, it was missing from the previous
  upload and referred to by debian/manpages.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/photos/GRaw.vala
34
34
    OUT_OF_ORDER_CALL,
35
35
    NO_THUMBNAIL,
36
36
    UNSUPPORTED_THUMBNAIL,
37
 
    CANNOT_ADDMASK,
38
37
    OUT_OF_MEMORY,
39
38
    DATA_ERROR,
40
39
    IO_ERROR,
41
40
    CANCELLED_BY_CALLBACK,
 
41
    BAD_CROP,
42
42
    SYSTEM_ERROR
43
43
}
44
44
 
163
163
        proc = new LibRaw.Processor(options);
164
164
    }
165
165
    
166
 
    public void add_masked_borders_to_bitmap() {
167
 
        proc.add_masked_borders_to_bitmap();
168
 
    }
169
 
    
170
166
    public void adjust_sizes_info_only() throws Exception {
171
167
        throw_exception("adjust_sizes_info_only", proc.adjust_sizes_info_only());
172
168
    }
215
211
        throw_exception("ppm_tiff_writer", proc.ppm_tiff_writer(filename));
216
212
    }
217
213
    
218
 
    public void rotate_fuji_raw() throws Exception {
219
 
        throw_exception("rotate_fuji_raw", proc.rotate_fuji_raw());
220
 
    }
221
 
    
222
214
    public void thumb_writer(string filename) throws Exception {
223
215
        throw_exception("thumb_writer", proc.thumb_writer(filename));
224
216
    }
262
254
        // camera_profile
263
255
        // bad_pixels
264
256
        // dark_frame
265
 
        output_params->filtering_mode = LibRaw.Filtering.AUTOMATIC;
266
257
        output_params->output_bps = 8;
267
258
        // output_tiff
268
259
        output_params->user_flip = GRaw.Flip.FROM_SOURCE;
303
294
        case LibRaw.Result.UNSUPPORTED_THUMBNAIL:
304
295
            throw new Exception.UNSUPPORTED_THUMBNAIL(msg);
305
296
        
306
 
        case LibRaw.Result.CANNOT_ADDMASK:
307
 
            throw new Exception.CANNOT_ADDMASK(msg);
308
 
        
309
297
        case LibRaw.Result.UNSUFFICIENT_MEMORY:
310
298
            throw new Exception.OUT_OF_MEMORY(msg);
311
299
        
318
306
        case LibRaw.Result.CANCELLED_BY_CALLBACK:
319
307
            throw new Exception.CANCELLED_BY_CALLBACK(msg);
320
308
        
 
309
        case LibRaw.Result.BAD_CROP:
 
310
            throw new Exception.BAD_CROP(msg);
 
311
        
321
312
        default:
322
313
            return;
323
314
    }