← Back to branch summary

~amigadave/simple-scan/fix-translatable-strings

« back to all changes in this revision

Viewing changes to src/book.vala

  • Committer: Robert Ancell
  • Date: 2014-04-13 21:02:56 UTC
  • Revision ID: robert.ancell@canonical.com-20140413210256-upt47843gh3qzmsi
Use properties instead of getters and setters. Use as keyword instead of casts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/book.vala
153
153
        {
154
154
            var page = get_page (i);
155
155
            var image = page.get_image (true);
156
 
            var width = image.get_width () * 72.0 / page.dpi;
157
 
            var height = image.get_height () * 72.0 / page.dpi;
 
156
            var width = image.width * 72.0 / page.dpi;
 
157
            var height = image.height * 72.0 / page.dpi;
158
158
            surface.set_size (width, height);
159
159
            save_ps_pdf_surface (surface, image, page.dpi);
160
160
            surface.show_page ();
264
264
        {
265
265
            var page = get_page (i);
266
266
            var image = page.get_image (true);
267
 
            var width = image.get_width ();
268
 
            var height = image.get_height ();
 
267
            var width = image.width;
 
268
            var height = image.height;
269
269
            unowned uint8[] pixels = image.get_pixels ();
270
270
            var page_width = width * 72.0 / page.dpi;
271
271
            var page_height = height * 72.0 / page.dpi;
284
284
                data = new uint8[data_length];
285
285
                for (var row = 0; row < height; row++)
286
286
                {
287
 
                    var in_offset = row * image.get_rowstride ();
 
287
                    var in_offset = row * image.rowstride;
288
288
                    var out_offset = row * width * 3;
289
289
                    for (var x = 0; x < width; x++)
290
290
                    {
314
314
                        shift_count = 6;
315
315
                    }
316
316
 
317
 
                    var in_offset = row * image.get_rowstride ();
 
317
                    var in_offset = row * image.rowstride;
318
318
                    for (var x = 0; x < width; x++)
319
319
                    {
320
320
                        /* Clear byte */
359
359
                        mask = 0x80;
360
360
                    }
361
361
 
362
 
                    var in_offset = row * image.get_rowstride ();
 
362
                    var in_offset = row * image.rowstride;
363
363
                    for (var x = 0; x < width; x++)
364
364
                    {
365
365
                        /* Clear byte */
388
388
                data = new uint8 [data_length];
389
389
                for (var row = 0; row < height; row++)
390
390
                {
391
 
                    var in_offset = row * image.get_rowstride ();
 
391
                    var in_offset = row * image.rowstride;
392
392
                    var out_offset = row * width;
393
393
                    for (var x = 0; x < width; x++)
394
394
                        data[out_offset+x] = pixels[in_offset+x*3];