diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2014-07-23 18:18:26 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2014-07-23 18:18:26 +0200 |
| commit | 44a1fdd0075c7818b65d4191290cdce733687146 (patch) | |
| tree | 3254cbee0a3ab39757bb7a1972faa884127f33cd /src/page.c | |
| parent | a366a6feda133b888da763569953636c90017f57 (diff) | |
| parent | cce8437bfbdb21e2b97025de6721c78f6d4654fc (diff) | |
Merge tag 'upstream/3.13.4.2'
Upstream version 3.13.4.2
Diffstat (limited to 'src/page.c')
| -rw-r--r-- | src/page.c | 1735 |
1 files changed, 842 insertions, 893 deletions
@@ -1,4 +1,4 @@ -/* page.c generated by valac 0.22.1, the Vala compiler +/* page.c generated by valac 0.24.0, the Vala compiler * generated from page.vala, do not modify */ /* @@ -305,9 +305,8 @@ Page* page_construct (GType object_type, gint width, gint height, gint dpi, Scan Page* self = NULL; gboolean _tmp0_ = FALSE; ScanDirection _tmp1_ = 0; - gboolean _tmp3_ = FALSE; - gint _tmp8_ = 0; - ScanDirection _tmp9_ = 0; + gint _tmp7_ = 0; + ScanDirection _tmp8_ = 0; #line 174 "/home/bob/bzr/simple-scan/trunk/src/page.vala" self = (Page*) g_type_create_instance (object_type); #line 176 "/home/bob/bzr/simple-scan/trunk/src/page.vala" @@ -316,69 +315,67 @@ Page* page_construct (GType object_type, gint width, gint height, gint dpi, Scan if (_tmp1_ == SCAN_DIRECTION_TOP_TO_BOTTOM) { #line 176 "/home/bob/bzr/simple-scan/trunk/src/page.vala" _tmp0_ = TRUE; -#line 320 "page.c" +#line 319 "page.c" } else { ScanDirection _tmp2_ = 0; #line 176 "/home/bob/bzr/simple-scan/trunk/src/page.vala" _tmp2_ = scan_direction; #line 176 "/home/bob/bzr/simple-scan/trunk/src/page.vala" _tmp0_ = _tmp2_ == SCAN_DIRECTION_BOTTOM_TO_TOP; -#line 327 "page.c" +#line 326 "page.c" } #line 176 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp3_ = _tmp0_; -#line 176 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - if (_tmp3_) { -#line 333 "page.c" + if (_tmp0_) { +#line 330 "page.c" + gint _tmp3_ = 0; gint _tmp4_ = 0; - gint _tmp5_ = 0; #line 178 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp4_ = width; + _tmp3_ = width; #line 178 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - page_set_scan_width (self, _tmp4_); + page_set_scan_width (self, _tmp3_); #line 179 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp5_ = height; + _tmp4_ = height; #line 179 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - page_set_scan_height (self, _tmp5_); -#line 344 "page.c" + page_set_scan_height (self, _tmp4_); +#line 341 "page.c" } else { + gint _tmp5_ = 0; gint _tmp6_ = 0; - gint _tmp7_ = 0; #line 183 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp6_ = height; + _tmp5_ = height; #line 183 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - page_set_scan_width (self, _tmp6_); + page_set_scan_width (self, _tmp5_); #line 184 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp7_ = width; + _tmp6_ = width; #line 184 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - page_set_scan_height (self, _tmp7_); -#line 356 "page.c" + page_set_scan_height (self, _tmp6_); +#line 353 "page.c" } #line 186 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp8_ = dpi; + _tmp7_ = dpi; #line 186 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - page_set_dpi (self, _tmp8_); + page_set_dpi (self, _tmp7_); #line 187 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp9_ = scan_direction; + _tmp8_ = scan_direction; #line 187 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - page_set_scan_direction (self, _tmp9_); + page_set_scan_direction (self, _tmp8_); #line 174 "/home/bob/bzr/simple-scan/trunk/src/page.vala" return self; -#line 368 "page.c" +#line 365 "page.c" } Page* page_new (gint width, gint height, gint dpi, ScanDirection scan_direction) { #line 174 "/home/bob/bzr/simple-scan/trunk/src/page.vala" return page_construct (TYPE_PAGE, width, height, dpi, scan_direction); -#line 375 "page.c" +#line 372 "page.c" } static guchar* _vala_array_dup3 (guchar* self, int length) { #line 215 "/home/bob/bzr/simple-scan/trunk/src/page.vala" return g_memdup (self, length * sizeof (guchar)); -#line 382 "page.c" +#line 379 "page.c" } @@ -491,14 +488,14 @@ Page* page_construct_from_data (GType object_type, gint scan_width, gint scan_he page_set_crop_height (self, _tmp17_); #line 190 "/home/bob/bzr/simple-scan/trunk/src/page.vala" return self; -#line 495 "page.c" +#line 492 "page.c" } Page* page_new_from_data (gint scan_width, gint scan_height, gint rowstride, gint n_channels, gint depth, gint dpi, ScanDirection scan_direction, const gchar* color_profile, guchar* pixels, int pixels_length1, gboolean has_crop, const gchar* crop_name, gint crop_x, gint crop_y, gint crop_width, gint crop_height) { #line 190 "/home/bob/bzr/simple-scan/trunk/src/page.vala" return page_construct_from_data (TYPE_PAGE, scan_width, scan_height, rowstride, n_channels, depth, dpi, scan_direction, color_profile, pixels, pixels_length1, has_crop, crop_name, crop_x, crop_y, crop_width, crop_height); -#line 502 "page.c" +#line 499 "page.c" } @@ -557,13 +554,13 @@ void page_set_page_info (Page* self, ScanPageInfo* info) { _tmp8_ = self->priv->_scan_height; #line 234 "/home/bob/bzr/simple-scan/trunk/src/page.vala" if (_tmp8_ < 0) { -#line 561 "page.c" +#line 558 "page.c" gint _tmp9_ = 0; #line 235 "/home/bob/bzr/simple-scan/trunk/src/page.vala" _tmp9_ = self->priv->_scan_width; #line 235 "/home/bob/bzr/simple-scan/trunk/src/page.vala" page_set_scan_height (self, _tmp9_ / 2); -#line 567 "page.c" +#line 564 "page.c" } #line 236 "/home/bob/bzr/simple-scan/trunk/src/page.vala" _tmp10_ = info; @@ -609,7 +606,7 @@ void page_set_page_info (Page* self, ScanPageInfo* info) { _tmp21_ = self->priv->_depth; #line 243 "/home/bob/bzr/simple-scan/trunk/src/page.vala" if (_tmp21_ == 1) { -#line 613 "page.c" +#line 610 "page.c" guchar* _tmp22_ = NULL; gint _tmp22__length1 = 0; gint _tmp23_ = 0; @@ -624,7 +621,7 @@ void page_set_page_info (Page* self, ScanPageInfo* info) { _tmp24_ = self->priv->_rowstride; #line 244 "/home/bob/bzr/simple-scan/trunk/src/page.vala" memset (_tmp22_, 0x00, (gsize) (_tmp23_ * _tmp24_)); -#line 628 "page.c" +#line 625 "page.c" } else { guchar* _tmp25_ = NULL; gint _tmp25__length1 = 0; @@ -640,13 +637,13 @@ void page_set_page_info (Page* self, ScanPageInfo* info) { _tmp27_ = self->priv->_rowstride; #line 246 "/home/bob/bzr/simple-scan/trunk/src/page.vala" memset (_tmp25_, 0xFF, (gsize) (_tmp26_ * _tmp27_)); -#line 644 "page.c" +#line 641 "page.c" } #line 248 "/home/bob/bzr/simple-scan/trunk/src/page.vala" g_signal_emit_by_name (self, "size-changed"); #line 249 "/home/bob/bzr/simple-scan/trunk/src/page.vala" g_signal_emit_by_name (self, "pixels-changed"); -#line 650 "page.c" +#line 647 "page.c" } @@ -657,7 +654,7 @@ void page_start (Page* self) { page_set_is_scanning (self, TRUE); #line 255 "/home/bob/bzr/simple-scan/trunk/src/page.vala" g_signal_emit_by_name (self, "scan-line-changed"); -#line 661 "page.c" +#line 658 "page.c" } @@ -674,7 +671,7 @@ static void page_parse_line (Page* self, ScanLine* line, gint n, gboolean* size_ gint _tmp15_ = 0; ScanLine* _tmp16_ = NULL; gint _tmp17_ = 0; - gint _tmp33_ = 0; + gint _tmp32_ = 0; #line 258 "/home/bob/bzr/simple-scan/trunk/src/page.vala" g_return_if_fail (self != NULL); #line 258 "/home/bob/bzr/simple-scan/trunk/src/page.vala" @@ -691,7 +688,7 @@ static void page_parse_line (Page* self, ScanLine* line, gint n, gboolean* size_ _vala_size_changed = FALSE; #line 264 "/home/bob/bzr/simple-scan/trunk/src/page.vala" while (TRUE) { -#line 695 "page.c" +#line 692 "page.c" gint _tmp3_ = 0; gint _tmp4_ = 0; gint rows = 0; @@ -711,7 +708,7 @@ static void page_parse_line (Page* self, ScanLine* line, gint n, gboolean* size_ if (!(_tmp3_ >= _tmp4_)) { #line 264 "/home/bob/bzr/simple-scan/trunk/src/page.vala" break; -#line 715 "page.c" +#line 712 "page.c" } #line 267 "/home/bob/bzr/simple-scan/trunk/src/page.vala" _tmp5_ = self->priv->_scan_height; @@ -745,7 +742,7 @@ static void page_parse_line (Page* self, ScanLine* line, gint n, gboolean* size_ self->priv->_pixels_size_ = _tmp12_; #line 272 "/home/bob/bzr/simple-scan/trunk/src/page.vala" _vala_size_changed = TRUE; -#line 749 "page.c" +#line 746 "page.c" } #line 276 "/home/bob/bzr/simple-scan/trunk/src/page.vala" _tmp13_ = line_number; @@ -761,183 +758,177 @@ static void page_parse_line (Page* self, ScanLine* line, gint n, gboolean* size_ _tmp17_ = _tmp16_->data_length; #line 277 "/home/bob/bzr/simple-scan/trunk/src/page.vala" line_offset = _tmp15_ * _tmp17_; -#line 765 "page.c" +#line 762 "page.c" { gint i = 0; #line 278 "/home/bob/bzr/simple-scan/trunk/src/page.vala" i = 0; -#line 770 "page.c" +#line 767 "page.c" { gboolean _tmp18_ = FALSE; #line 278 "/home/bob/bzr/simple-scan/trunk/src/page.vala" _tmp18_ = TRUE; #line 278 "/home/bob/bzr/simple-scan/trunk/src/page.vala" while (TRUE) { -#line 777 "page.c" - gboolean _tmp19_ = FALSE; - gint _tmp21_ = 0; - ScanLine* _tmp22_ = NULL; - gint _tmp23_ = 0; - guchar* _tmp24_ = NULL; - gint _tmp24__length1 = 0; +#line 774 "page.c" + gint _tmp20_ = 0; + ScanLine* _tmp21_ = NULL; + gint _tmp22_ = 0; + guchar* _tmp23_ = NULL; + gint _tmp23__length1 = 0; + gint _tmp24_ = 0; gint _tmp25_ = 0; - gint _tmp26_ = 0; - ScanLine* _tmp27_ = NULL; - guchar* _tmp28_ = NULL; - gint _tmp28__length1 = 0; + ScanLine* _tmp26_ = NULL; + guchar* _tmp27_ = NULL; + gint _tmp27__length1 = 0; + gint _tmp28_ = 0; gint _tmp29_ = 0; - gint _tmp30_ = 0; + guchar _tmp30_ = '\0'; guchar _tmp31_ = '\0'; - guchar _tmp32_ = '\0'; -#line 278 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp19_ = _tmp18_; #line 278 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - if (!_tmp19_) { -#line 797 "page.c" - gint _tmp20_ = 0; + if (!_tmp18_) { +#line 791 "page.c" + gint _tmp19_ = 0; #line 278 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp20_ = i; + _tmp19_ = i; #line 278 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - i = _tmp20_ + 1; -#line 803 "page.c" + i = _tmp19_ + 1; +#line 797 "page.c" } #line 278 "/home/bob/bzr/simple-scan/trunk/src/page.vala" _tmp18_ = FALSE; #line 278 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp21_ = i; + _tmp20_ = i; #line 278 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp22_ = line; + _tmp21_ = line; #line 278 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp23_ = _tmp22_->data_length; + _tmp22_ = _tmp21_->data_length; #line 278 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - if (!(_tmp21_ < _tmp23_)) { + if (!(_tmp20_ < _tmp22_)) { #line 278 "/home/bob/bzr/simple-scan/trunk/src/page.vala" break; -#line 817 "page.c" +#line 811 "page.c" } #line 279 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp24_ = self->priv->pixels; + _tmp23_ = self->priv->pixels; #line 279 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp24__length1 = self->priv->pixels_length1; + _tmp23__length1 = self->priv->pixels_length1; #line 279 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp25_ = offset; + _tmp24_ = offset; #line 279 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp26_ = i; + _tmp25_ = i; #line 279 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp27_ = line; + _tmp26_ = line; #line 279 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp28_ = _tmp27_->data; + _tmp27_ = _tmp26_->data; #line 279 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp28__length1 = _tmp27_->data_length1; + _tmp27__length1 = _tmp26_->data_length1; #line 279 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp29_ = line_offset; + _tmp28_ = line_offset; #line 279 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp30_ = i; + _tmp29_ = i; #line 279 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp31_ = _tmp28_[_tmp29_ + _tmp30_]; + _tmp30_ = _tmp27_[_tmp28_ + _tmp29_]; #line 279 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp24_[_tmp25_ + _tmp26_] = _tmp31_; + _tmp23_[_tmp24_ + _tmp25_] = _tmp30_; #line 279 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp32_ = _tmp24_[_tmp25_ + _tmp26_]; -#line 843 "page.c" + _tmp31_ = _tmp23_[_tmp24_ + _tmp25_]; +#line 837 "page.c" } } } #line 281 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp33_ = line_number; + _tmp32_ = line_number; #line 281 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - page_set_scan_line (self, _tmp33_); + page_set_scan_line (self, _tmp32_); #line 258 "/home/bob/bzr/simple-scan/trunk/src/page.vala" if (size_changed) { #line 258 "/home/bob/bzr/simple-scan/trunk/src/page.vala" *size_changed = _vala_size_changed; -#line 855 "page.c" +#line 849 "page.c" } } void page_parse_scan_line (Page* self, ScanLine* line) { gboolean size_has_changed = FALSE; - gboolean _tmp9_ = FALSE; + gboolean _tmp8_ = FALSE; #line 284 "/home/bob/bzr/simple-scan/trunk/src/page.vala" g_return_if_fail (self != NULL); #line 284 "/home/bob/bzr/simple-scan/trunk/src/page.vala" g_return_if_fail (line != NULL); #line 286 "/home/bob/bzr/simple-scan/trunk/src/page.vala" size_has_changed = FALSE; -#line 869 "page.c" +#line 863 "page.c" { gint i = 0; #line 287 "/home/bob/bzr/simple-scan/trunk/src/page.vala" i = 0; -#line 874 "page.c" +#line 868 "page.c" { gboolean _tmp0_ = FALSE; #line 287 "/home/bob/bzr/simple-scan/trunk/src/page.vala" _tmp0_ = TRUE; #line 287 "/home/bob/bzr/simple-scan/trunk/src/page.vala" while (TRUE) { -#line 881 "page.c" - gboolean _tmp1_ = FALSE; - gint _tmp3_ = 0; - ScanLine* _tmp4_ = NULL; - gint _tmp5_ = 0; - ScanLine* _tmp6_ = NULL; - gint _tmp7_ = 0; - gboolean _tmp8_ = FALSE; +#line 875 "page.c" + gint _tmp2_ = 0; + ScanLine* _tmp3_ = NULL; + gint _tmp4_ = 0; + ScanLine* _tmp5_ = NULL; + gint _tmp6_ = 0; + gboolean _tmp7_ = FALSE; #line 287 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp1_ = _tmp0_; + if (!_tmp0_) { +#line 884 "page.c" + gint _tmp1_ = 0; #line 287 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - if (!_tmp1_) { -#line 893 "page.c" - gint _tmp2_ = 0; + _tmp1_ = i; #line 287 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp2_ = i; -#line 287 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - i = _tmp2_ + 1; -#line 899 "page.c" + i = _tmp1_ + 1; +#line 890 "page.c" } #line 287 "/home/bob/bzr/simple-scan/trunk/src/page.vala" _tmp0_ = FALSE; #line 287 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp3_ = i; + _tmp2_ = i; #line 287 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp4_ = line; + _tmp3_ = line; #line 287 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp5_ = _tmp4_->n_lines; + _tmp4_ = _tmp3_->n_lines; #line 287 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - if (!(_tmp3_ < _tmp5_)) { + if (!(_tmp2_ < _tmp4_)) { #line 287 "/home/bob/bzr/simple-scan/trunk/src/page.vala" break; -#line 913 "page.c" +#line 904 "page.c" } #line 288 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp6_ = line; + _tmp5_ = line; #line 288 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp7_ = i; + _tmp6_ = i; #line 288 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - page_parse_line (self, _tmp6_, _tmp7_, &_tmp8_); + page_parse_line (self, _tmp5_, _tmp6_, &_tmp7_); #line 288 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - size_has_changed = _tmp8_; -#line 923 "page.c" + size_has_changed = _tmp7_; +#line 914 "page.c" } } } #line 290 "/home/bob/bzr/simple-scan/trunk/src/page.vala" page_set_has_data (self, TRUE); #line 292 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp9_ = size_has_changed; + _tmp8_ = size_has_changed; #line 292 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - if (_tmp9_) { + if (_tmp8_) { #line 293 "/home/bob/bzr/simple-scan/trunk/src/page.vala" g_signal_emit_by_name (self, "size-changed"); -#line 935 "page.c" +#line 926 "page.c" } #line 294 "/home/bob/bzr/simple-scan/trunk/src/page.vala" g_signal_emit_by_name (self, "scan-line-changed"); #line 295 "/home/bob/bzr/simple-scan/trunk/src/page.vala" g_signal_emit_by_name (self, "pixels-changed"); -#line 941 "page.c" +#line 932 "page.c" } @@ -945,8 +936,7 @@ void page_finish (Page* self) { gboolean size_has_changed = FALSE; gboolean _tmp0_ = FALSE; gint _tmp1_ = 0; - gboolean _tmp4_ = FALSE; - gboolean _tmp12_ = FALSE; + gboolean _tmp11_ = FALSE; #line 298 "/home/bob/bzr/simple-scan/trunk/src/page.vala" g_return_if_fail (self != NULL); #line 300 "/home/bob/bzr/simple-scan/trunk/src/page.vala" @@ -955,7 +945,7 @@ void page_finish (Page* self) { _tmp1_ = self->priv->expected_rows; #line 303 "/home/bob/bzr/simple-scan/trunk/src/page.vala" if (_tmp1_ < 0) { -#line 959 "page.c" +#line 949 "page.c" gint _tmp2_ = 0; gint _tmp3_ = 0; #line 304 "/home/bob/bzr/simple-scan/trunk/src/page.vala" @@ -964,72 +954,70 @@ void page_finish (Page* self) { _tmp3_ = self->priv->_scan_height; #line 304 "/home/bob/bzr/simple-scan/trunk/src/page.vala" _tmp0_ = _tmp2_ != _tmp3_; -#line 968 "page.c" +#line 958 "page.c" } else { #line 303 "/home/bob/bzr/simple-scan/trunk/src/page.vala" _tmp0_ = FALSE; -#line 972 "page.c" +#line 962 "page.c" } #line 303 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp4_ = _tmp0_; -#line 303 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - if (_tmp4_) { -#line 978 "page.c" + if (_tmp0_) { +#line 966 "page.c" gint rows = 0; + gint _tmp4_ = 0; gint _tmp5_ = 0; gint _tmp6_ = 0; gint _tmp7_ = 0; gint _tmp8_ = 0; gint _tmp9_ = 0; gint _tmp10_ = 0; - gint _tmp11_ = 0; #line 306 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp5_ = self->priv->_scan_height; + _tmp4_ = self->priv->_scan_height; #line 306 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - rows = _tmp5_; + rows = _tmp4_; #line 307 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp6_ = self->priv->_scan_line; + _tmp5_ = self->priv->_scan_line; #line 307 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - page_set_scan_height (self, _tmp6_); + page_set_scan_height (self, _tmp5_); #line 308 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp7_ = self->priv->_scan_height; + _tmp6_ = self->priv->_scan_height; #line 308 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp8_ = self->priv->_rowstride; + _tmp7_ = self->priv->_rowstride; #line 308 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp9_ = _tmp7_ * _tmp8_; + _tmp8_ = _tmp6_ * _tmp7_; #line 308 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - self->priv->pixels = g_renew (guchar, self->priv->pixels, _tmp7_ * _tmp8_); + self->priv->pixels = g_renew (guchar, self->priv->pixels, _tmp6_ * _tmp7_); #line 308 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - (_tmp9_ > self->priv->pixels_length1) ? memset (self->priv->pixels + self->priv->pixels_length1, 0, sizeof (guchar) * (_tmp9_ - self->priv->pixels_length1)) : NULL; + (_tmp8_ > self->priv->pixels_length1) ? memset (self->priv->pixels + self->priv->pixels_length1, 0, sizeof (guchar) * (_tmp8_ - self->priv->pixels_length1)) : NULL; #line 308 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - self->priv->pixels_length1 = _tmp9_; + self->priv->pixels_length1 = _tmp8_; #line 308 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - self->priv->_pixels_size_ = _tmp9_; + self->priv->_pixels_size_ = _tmp8_; #line 309 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp10_ = rows; + _tmp9_ = rows; #line 309 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp11_ = self->priv->_scan_height; + _tmp10_ = self->priv->_scan_height; #line 309 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - g_debug ("page.vala:309: Trimming page from %d lines to %d lines", _tmp10_, _tmp11_); + g_debug ("page.vala:309: Trimming page from %d lines to %d lines", _tmp9_, _tmp10_); #line 311 "/home/bob/bzr/simple-scan/trunk/src/page.vala" size_has_changed = TRUE; -#line 1017 "page.c" +#line 1005 "page.c" } #line 313 "/home/bob/bzr/simple-scan/trunk/src/page.vala" page_set_is_scanning (self, FALSE); #line 315 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp12_ = size_has_changed; + _tmp11_ = size_has_changed; #line 315 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - if (_tmp12_) { + if (_tmp11_) { #line 316 "/home/bob/bzr/simple-scan/trunk/src/page.vala" g_signal_emit_by_name (self, "size-changed"); -#line 1027 "page.c" +#line 1015 "page.c" } #line 317 "/home/bob/bzr/simple-scan/trunk/src/page.vala" g_signal_emit_by_name (self, "scan-line-changed"); #line 318 "/home/bob/bzr/simple-scan/trunk/src/page.vala" g_signal_emit_by_name (self, "scan-finished"); -#line 1033 "page.c" +#line 1021 "page.c" } @@ -1046,48 +1034,48 @@ void page_rotate_left (Page* self) { switch (_tmp1_) { #line 323 "/home/bob/bzr/simple-scan/trunk/src/page.vala" case SCAN_DIRECTION_TOP_TO_BOTTOM: -#line 1050 "page.c" +#line 1038 "page.c" { #line 326 "/home/bob/bzr/simple-scan/trunk/src/page.vala" page_set_scan_direction (self, SCAN_DIRECTION_LEFT_TO_RIGHT); #line 327 "/home/bob/bzr/simple-scan/trunk/src/page.vala" break; -#line 1056 "page.c" +#line 1044 "page.c" } #line 323 "/home/bob/bzr/simple-scan/trunk/src/page.vala" case SCAN_DIRECTION_LEFT_TO_RIGHT: -#line 1060 "page.c" +#line 1048 "page.c" { #line 329 "/home/bob/bzr/simple-scan/trunk/src/page.vala" page_set_scan_direction (self, SCAN_DIRECTION_BOTTOM_TO_TOP); #line 330 "/home/bob/bzr/simple-scan/trunk/src/page.vala" break; -#line 1066 "page.c" +#line 1054 "page.c" } #line 323 "/home/bob/bzr/simple-scan/trunk/src/page.vala" case SCAN_DIRECTION_BOTTOM_TO_TOP: -#line 1070 "page.c" +#line 1058 "page.c" { #line 332 "/home/bob/bzr/simple-scan/trunk/src/page.vala" page_set_scan_direction (self, SCAN_DIRECTION_RIGHT_TO_LEFT); #line 333 "/home/bob/bzr/simple-scan/trunk/src/page.vala" break; -#line 1076 "page.c" +#line 1064 "page.c" } #line 323 "/home/bob/bzr/simple-scan/trunk/src/page.vala" case SCAN_DIRECTION_RIGHT_TO_LEFT: -#line 1080 "page.c" +#line 1068 "page.c" { #line 335 "/home/bob/bzr/simple-scan/trunk/src/page.vala" page_set_scan_direction (self, SCAN_DIRECTION_TOP_TO_BOTTOM); #line 336 "/home/bob/bzr/simple-scan/trunk/src/page.vala" break; -#line 1086 "page.c" +#line 1074 "page.c" } default: #line 323 "/home/bob/bzr/simple-scan/trunk/src/page.vala" break; -#line 1091 "page.c" +#line 1079 "page.c" } } @@ -1105,48 +1093,48 @@ void page_rotate_right (Page* self) { switch (_tmp1_) { #line 342 "/home/bob/bzr/simple-scan/trunk/src/page.vala" case SCAN_DIRECTION_TOP_TO_BOTTOM: -#line 1109 "page.c" +#line 1097 "page.c" { #line 345 "/home/bob/bzr/simple-scan/trunk/src/page.vala" page_set_scan_direction (self, SCAN_DIRECTION_RIGHT_TO_LEFT); #line 346 "/home/bob/bzr/simple-scan/trunk/src/page.vala" break; -#line 1115 "page.c" +#line 1103 "page.c" } #line 342 "/home/bob/bzr/simple-scan/trunk/src/page.vala" case SCAN_DIRECTION_LEFT_TO_RIGHT: -#line 1119 "page.c" +#line 1107 "page.c" { #line 348 "/home/bob/bzr/simple-scan/trunk/src/page.vala" page_set_scan_direction (self, SCAN_DIRECTION_TOP_TO_BOTTOM); #line 349 "/home/bob/bzr/simple-scan/trunk/src/page.vala" break; -#line 1125 "page.c" +#line 1113 "page.c" } #line 342 "/home/bob/bzr/simple-scan/trunk/src/page.vala" case SCAN_DIRECTION_BOTTOM_TO_TOP: -#line 1129 "page.c" +#line 1117 "page.c" { #line 351 "/home/bob/bzr/simple-scan/trunk/src/page.vala" page_set_scan_direction (self, SCAN_DIRECTION_LEFT_TO_RIGHT); #line 352 "/home/bob/bzr/simple-scan/trunk/src/page.vala" break; -#line 1135 "page.c" +#line 1123 "page.c" } #line 342 "/home/bob/bzr/simple-scan/trunk/src/page.vala" case SCAN_DIRECTION_RIGHT_TO_LEFT: -#line 1139 "page.c" +#line 1127 "page.c" { #line 354 "/home/bob/bzr/simple-scan/trunk/src/page.vala" page_set_scan_direction (self, SCAN_DIRECTION_BOTTOM_TO_TOP); #line 355 "/home/bob/bzr/simple-scan/trunk/src/page.vala" break; -#line 1145 "page.c" +#line 1133 "page.c" } default: #line 342 "/home/bob/bzr/simple-scan/trunk/src/page.vala" break; -#line 1150 "page.c" +#line 1138 "page.c" } } @@ -1161,7 +1149,7 @@ void page_set_no_crop (Page* self) { if (!_tmp0_) { #line 362 "/home/bob/bzr/simple-scan/trunk/src/page.vala" return; -#line 1165 "page.c" +#line 1153 "page.c" } #line 363 "/home/bob/bzr/simple-scan/trunk/src/page.vala" page_set_has_crop (self, FALSE); @@ -1177,7 +1165,7 @@ void page_set_no_crop (Page* self) { page_set_crop_height (self, 0); #line 369 "/home/bob/bzr/simple-scan/trunk/src/page.vala" g_signal_emit_by_name (self, "crop-changed"); -#line 1181 "page.c" +#line 1169 "page.c" } @@ -1188,11 +1176,8 @@ void page_set_custom_crop (Page* self, gint width, gint height) { gboolean _tmp3_ = FALSE; gboolean _tmp4_ = FALSE; const gchar* _tmp5_ = NULL; - gboolean _tmp7_ = FALSE; - gboolean _tmp10_ = FALSE; - gboolean _tmp13_ = FALSE; - gint _tmp14_ = 0; - gint _tmp15_ = 0; + gint _tmp11_ = 0; + gint _tmp12_ = 0; #line 372 "/home/bob/bzr/simple-scan/trunk/src/page.vala" g_return_if_fail (self != NULL); #line 374 "/home/bob/bzr/simple-scan/trunk/src/page.vala" @@ -1207,79 +1192,73 @@ void page_set_custom_crop (Page* self, gint width, gint height) { _tmp5_ = self->priv->_crop_name; #line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala" if (_tmp5_ == NULL) { -#line 1211 "page.c" +#line 1196 "page.c" gboolean _tmp6_ = FALSE; #line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala" _tmp6_ = self->priv->_has_crop; #line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala" _tmp4_ = _tmp6_; -#line 1217 "page.c" +#line 1202 "page.c" } else { #line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala" _tmp4_ = FALSE; -#line 1221 "page.c" +#line 1206 "page.c" } #line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp7_ = _tmp4_; -#line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - if (_tmp7_) { -#line 1227 "page.c" + if (_tmp4_) { +#line 1210 "page.c" + gint _tmp7_ = 0; gint _tmp8_ = 0; - gint _tmp9_ = 0; #line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp8_ = self->priv->_crop_width; + _tmp7_ = self->priv->_crop_width; #line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp9_ = width; + _tmp8_ = width; #line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp3_ = _tmp8_ == _tmp9_; -#line 1236 "page.c" + _tmp3_ = _tmp7_ == _tmp8_; +#line 1219 "page.c" } else { #line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala" _tmp3_ = FALSE; -#line 1240 "page.c" +#line 1223 "page.c" } #line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp10_ = _tmp3_; -#line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - if (_tmp10_) { -#line 1246 "page.c" - gint _tmp11_ = 0; - gint _tmp12_ = 0; + if (_tmp3_) { +#line 1227 "page.c" + gint _tmp9_ = 0; + gint _tmp10_ = 0; #line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp11_ = self->priv->_crop_height; + _tmp9_ = self->priv->_crop_height; #line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp12_ = height; + _tmp10_ = height; #line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp2_ = _tmp11_ == _tmp12_; -#line 1255 "page.c" + _tmp2_ = _tmp9_ == _tmp10_; +#line 1236 "page.c" } else { #line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala" _tmp2_ = FALSE; -#line 1259 "page.c" +#line 1240 "page.c" } #line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp13_ = _tmp2_; -#line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - if (_tmp13_) { + if (_tmp2_) { #line 378 "/home/bob/bzr/simple-scan/trunk/src/page.vala" return; -#line 1267 "page.c" +#line 1246 "page.c" } #line 379 "/home/bob/bzr/simple-scan/trunk/src/page.vala" page_set_crop_name (self, NULL); #line 380 "/home/bob/bzr/simple-scan/trunk/src/page.vala" page_set_has_crop (self, TRUE); #line 382 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp14_ = width; + _tmp11_ = width; #line 382 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - page_set_crop_width (self, _tmp14_); + page_set_crop_width (self, _tmp11_); #line 383 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp15_ = height; + _tmp12_ = height; #line 383 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - page_set_crop_height (self, _tmp15_); + page_set_crop_height (self, _tmp12_); #line 396 "/home/bob/bzr/simple-scan/trunk/src/page.vala" g_signal_emit_by_name (self, "crop-changed"); -#line 1283 "page.c" +#line 1262 "page.c" } @@ -1301,7 +1280,7 @@ void page_set_named_crop (Page* self, const gchar* name) { static GQuark _tmp2_label4 = 0; #line 402 "/home/bob/bzr/simple-scan/trunk/src/page.vala" static GQuark _tmp2_label5 = 0; -#line 1305 "page.c" +#line 1284 "page.c" const gchar* _tmp5_ = NULL; gint pw = 0; gint _tmp6_ = 0; @@ -1333,7 +1312,7 @@ void page_set_named_crop (Page* self, const gchar* name) { if (_tmp3_ == ((0 != _tmp2_label0) ? _tmp2_label0 : (_tmp2_label0 = g_quark_from_static_string ("A4")))) { #line 402 "/home/bob/bzr/simple-scan/trunk/src/page.vala" switch (0) { -#line 1337 "page.c" +#line 1316 "page.c" default: { #line 405 "/home/bob/bzr/simple-scan/trunk/src/page.vala" @@ -1342,13 +1321,13 @@ void page_set_named_crop (Page* self, const gchar* name) { h = 11.7; #line 407 "/home/bob/bzr/simple-scan/trunk/src/page.vala" break; -#line 1346 "page.c" +#line 1325 "page.c" } } } else if (_tmp3_ == ((0 != _tmp2_label1) ? _tmp2_label1 : (_tmp2_label1 = g_quark_from_static_string ("A5")))) { #line 402 "/home/bob/bzr/simple-scan/trunk/src/page.vala" switch (0) { -#line 1352 "page.c" +#line 1331 "page.c" default: { #line 409 "/home/bob/bzr/simple-scan/trunk/src/page.vala" @@ -1357,13 +1336,13 @@ void page_set_named_crop (Page* self, const gchar* name) { h = 8.3; #line 411 "/home/bob/bzr/simple-scan/trunk/src/page.vala" break; -#line 1361 "page.c" +#line 1340 "page.c" } } } else if (_tmp3_ == ((0 != _tmp2_label2) ? _tmp2_label2 : (_tmp2_label2 = g_quark_from_static_string ("A6")))) { #line 402 "/home/bob/bzr/simple-scan/trunk/src/page.vala" switch (0) { -#line 1367 "page.c" +#line 1346 "page.c" default: { #line 413 "/home/bob/bzr/simple-scan/trunk/src/page.vala" @@ -1372,13 +1351,13 @@ void page_set_named_crop (Page* self, const gchar* name) { h = 5.8; #line 415 "/home/bob/bzr/simple-scan/trunk/src/page.vala" break; -#line 1376 "page.c" +#line 1355 "page.c" } } } else if (_tmp3_ == ((0 != _tmp2_label3) ? _tmp2_label3 : (_tmp2_label3 = g_quark_from_static_string ("letter")))) { #line 402 "/home/bob/bzr/simple-scan/trunk/src/page.vala" switch (0) { -#line 1382 "page.c" +#line 1361 "page.c" default: { #line 417 "/home/bob/bzr/simple-scan/trunk/src/page.vala" @@ -1387,13 +1366,13 @@ void page_set_named_crop (Page* self, const gchar* name) { h = (gdouble) 11; #line 419 "/home/bob/bzr/simple-scan/trunk/src/page.vala" break; -#line 1391 "page.c" +#line 1370 "page.c" } } } else if (_tmp3_ == ((0 != _tmp2_label4) ? _tmp2_label4 : (_tmp2_label4 = g_quark_from_static_string ("legal")))) { #line 402 "/home/bob/bzr/simple-scan/trunk/src/page.vala" switch (0) { -#line 1397 "page.c" +#line 1376 "page.c" default: { #line 421 "/home/bob/bzr/simple-scan/trunk/src/page.vala" @@ -1402,13 +1381,13 @@ void page_set_named_crop (Page* self, const gchar* name) { h = (gdouble) 14; #line 423 "/home/bob/bzr/simple-scan/trunk/src/page.vala" break; -#line 1406 "page.c" +#line 1385 "page.c" } } } else if (_tmp3_ == ((0 != _tmp2_label5) ? _tmp2_label5 : (_tmp2_label5 = g_quark_from_static_string ("4x6")))) { #line 402 "/home/bob/bzr/simple-scan/trunk/src/page.vala" switch (0) { -#line 1412 "page.c" +#line 1391 "page.c" default: { #line 425 "/home/bob/bzr/simple-scan/trunk/src/page.vala" @@ -1417,13 +1396,13 @@ void page_set_named_crop (Page* self, const gchar* name) { h = (gdouble) 6; #line 427 "/home/bob/bzr/simple-scan/trunk/src/page.vala" break; -#line 1421 "page.c" +#line 1400 "page.c" } } } else { #line 402 "/home/bob/bzr/simple-scan/trunk/src/page.vala" switch (0) { -#line 1427 "page.c" +#line 1406 "page.c" default: { const gchar* _tmp4_ = NULL; @@ -1433,7 +1412,7 @@ void page_set_named_crop (Page* self, const gchar* name) { g_warning ("page.vala:429: Unknown paper size '%s'", _tmp4_); #line 430 "/home/bob/bzr/simple-scan/trunk/src/page.vala" return; -#line 1437 "page.c" +#line 1416 "page.c" } } } @@ -1461,7 +1440,7 @@ void page_set_named_crop (Page* self, const gchar* name) { _tmp11_ = ph; #line 440 "/home/bob/bzr/simple-scan/trunk/src/page.vala" if (_tmp10_ > _tmp11_) { -#line 1465 "page.c" +#line 1444 "page.c" gdouble t = 0.0; gdouble _tmp12_ = 0.0; gdouble _tmp13_ = 0.0; @@ -1478,7 +1457,7 @@ void page_set_named_crop (Page* self, const gchar* name) { _tmp14_ = t; #line 444 "/home/bob/bzr/simple-scan/trunk/src/page.vala" h = _tmp14_; -#line 1482 "page.c" +#line 1461 "page.c" } #line 448 "/home/bob/bzr/simple-scan/trunk/src/page.vala" _tmp15_ = w; @@ -1498,7 +1477,7 @@ void page_set_named_crop (Page* self, const gchar* name) { _tmp20_ = pw; #line 451 "/home/bob/bzr/simple-scan/trunk/src/page.vala" if (_tmp19_ < _tmp20_) { -#line 1502 "page.c" +#line 1481 "page.c" gint _tmp21_ = 0; gint _tmp22_ = 0; #line 452 "/home/bob/bzr/simple-scan/trunk/src/page.vala" @@ -1507,11 +1486,11 @@ void page_set_named_crop (Page* self, const gchar* name) { _tmp22_ = self->priv->_crop_width; #line 452 "/home/bob/bzr/simple-scan/trunk/src/page.vala" page_set_crop_x (self, (_tmp21_ - _tmp22_) / 2); -#line 1511 "page.c" +#line 1490 "page.c" } else { #line 454 "/home/bob/bzr/simple-scan/trunk/src/page.vala" page_set_crop_x (self, 0); -#line 1515 "page.c" +#line 1494 "page.c" } #line 455 "/home/bob/bzr/simple-scan/trunk/src/page.vala" _tmp23_ = self->priv->_crop_height; @@ -1519,7 +1498,7 @@ void page_set_named_crop (Page* self, const gchar* name) { _tmp24_ = ph; #line 455 "/home/bob/bzr/simple-scan/trunk/src/page.vala" if (_tmp23_ < _tmp24_) { -#line 1523 "page.c" +#line 1502 "page.c" gint _tmp25_ = 0; gint _tmp26_ = 0; #line 456 "/home/bob/bzr/simple-scan/trunk/src/page.vala" @@ -1528,15 +1507,15 @@ void page_set_named_crop (Page* self, const gchar* name) { _tmp26_ = self->priv->_crop_height; #line 456 "/home/bob/bzr/simple-scan/trunk/src/page.vala" page_set_crop_y (self, (_tmp25_ - _tmp26_) / 2); -#line 1532 "page.c" +#line 1511 "page.c" } else { #line 458 "/home/bob/bzr/simple-scan/trunk/src/page.vala" page_set_crop_y (self, 0); -#line 1536 "page.c" +#line 1515 "page.c" } #line 459 "/home/bob/bzr/simple-scan/trunk/src/page.vala" g_signal_emit_by_name (self, "crop-changed"); -#line 1540 "page.c" +#line 1519 "page.c" } @@ -1587,7 +1566,7 @@ void page_move_crop (Page* self, gint x, gint y) { page_set_crop_y (self, _tmp9_); #line 471 "/home/bob/bzr/simple-scan/trunk/src/page.vala" g_signal_emit_by_name (self, "crop-changed"); -#line 1591 "page.c" +#line 1570 "page.c" } @@ -1606,7 +1585,7 @@ void page_rotate_crop (Page* self) { if (!_tmp0_) { #line 477 "/home/bob/bzr/simple-scan/trunk/src/page.vala" return; -#line 1610 "page.c" +#line 1589 "page.c" } #line 479 "/home/bob/bzr/simple-scan/trunk/src/page.vala" _tmp1_ = self->priv->_crop_width; @@ -1624,7 +1603,7 @@ void page_rotate_crop (Page* self) { _tmp4_ = self->priv->_crop_name; #line 484 "/home/bob/bzr/simple-scan/trunk/src/page.vala" if (_tmp4_ == NULL) { -#line 1628 "page.c" +#line 1607 "page.c" gint w = 0; gint _tmp5_ = 0; gint _tmp6_ = 0; @@ -1659,7 +1638,7 @@ void page_rotate_crop (Page* self) { _tmp11_ = w; #line 489 "/home/bob/bzr/simple-scan/trunk/src/page.vala" if ((_tmp9_ + _tmp10_) > _tmp11_) { -#line 1663 "page.c" +#line 1642 "page.c" gint _tmp12_ = 0; gint _tmp13_ = 0; #line 490 "/home/bob/bzr/simple-scan/trunk/src/page.vala" @@ -1668,13 +1647,13 @@ void page_rotate_crop (Page* self) { _tmp13_ = self->priv->_crop_width; #line 490 "/home/bob/bzr/simple-scan/trunk/src/page.vala" page_set_crop_x (self, _tmp12_ - _tmp13_); -#line 1672 "page.c" +#line 1651 "page.c" } #line 491 "/home/bob/bzr/simple-scan/trunk/src/page.vala" _tmp14_ = self->priv->_crop_x; #line 491 "/home/bob/bzr/simple-scan/trunk/src/page.vala" if (_tmp14_ < 0) { -#line 1678 "page.c" +#line 1657 "page.c" gint _tmp15_ = 0; #line 493 "/home/bob/bzr/simple-scan/trunk/src/page.vala" page_set_crop_x (self, 0); @@ -1682,7 +1661,7 @@ void page_rotate_crop (Page* self) { _tmp15_ = w; #line 494 "/home/bob/bzr/simple-scan/trunk/src/page.vala" page_set_crop_width (self, _tmp15_); -#line 1686 "page.c" +#line 1665 "page.c" } #line 496 "/home/bob/bzr/simple-scan/trunk/src/page.vala" _tmp16_ = self->priv->_crop_y; @@ -1692,7 +1671,7 @@ void page_rotate_crop (Page* self) { _tmp18_ = h; #line 496 "/home/bob/bzr/simple-scan/trunk/src/page.vala" if ((_tmp16_ + _tmp17_) > _tmp18_) { -#line 1696 "page.c" +#line 1675 "page.c" gint _tmp19_ = 0; gint _tmp20_ = 0; #line 497 "/home/bob/bzr/simple-scan/trunk/src/page.vala" @@ -1701,13 +1680,13 @@ void page_rotate_crop (Page* self) { _tmp20_ = self->priv->_crop_height; #line 497 "/home/bob/bzr/simple-scan/trunk/src/page.vala" page_set_crop_y (self, _tmp19_ - _tmp20_); -#line 1705 "page.c" +#line 1684 "page.c" } #line 498 "/home/bob/bzr/simple-scan/trunk/src/page.vala" _tmp21_ = self->priv->_crop_y; #line 498 "/home/bob/bzr/simple-scan/trunk/src/page.vala" if (_tmp21_ < 0) { -#line 1711 "page.c" +#line 1690 "page.c" gint _tmp22_ = 0; #line 500 "/home/bob/bzr/simple-scan/trunk/src/page.vala" page_set_crop_y (self, 0); @@ -1715,12 +1694,12 @@ void page_rotate_crop (Page* self) { _tmp22_ = h; #line 501 "/home/bob/bzr/simple-scan/trunk/src/page.vala" page_set_crop_height (self, _tmp22_); -#line 1719 "page.c" +#line 1698 "page.c" } } #line 505 "/home/bob/bzr/simple-scan/trunk/src/page.vala" g_signal_emit_by_name (self, "crop-changed"); -#line 1724 "page.c" +#line 1703 "page.c" } @@ -1744,13 +1723,13 @@ guchar* page_get_pixels (Page* self, int* result_length1) { if (result_length1) { #line 510 "/home/bob/bzr/simple-scan/trunk/src/page.vala" *result_length1 = _tmp1__length1; -#line 1748 "page.c" +#line 1727 "page.c" } #line 510 "/home/bob/bzr/simple-scan/trunk/src/page.vala" result = _tmp1_; #line 510 "/home/bob/bzr/simple-scan/trunk/src/page.vala" return result; -#line 1754 "page.c" +#line 1733 "page.c" } @@ -1762,7 +1741,7 @@ static guchar page_get_sample (Page* self, guchar* pixels, int pixels_length1, g result = (guchar) 0xFF; #line 517 "/home/bob/bzr/simple-scan/trunk/src/page.vala" return result; -#line 1766 "page.c" +#line 1745 "page.c" } @@ -1774,40 +1753,39 @@ static void page_get_pixel (Page* self, gint x, gint y, guchar* pixel, int pixel gint _tmp15_ = 0; gboolean _tmp16_ = FALSE; gint _tmp17_ = 0; - gboolean _tmp19_ = FALSE; - guchar* _tmp103_ = NULL; - gint _tmp103__length1 = 0; + guchar* _tmp98_ = NULL; + gint _tmp98__length1 = 0; + gint _tmp99_ = 0; + guchar* _tmp100_ = NULL; + gint _tmp100__length1 = 0; + gint _tmp101_ = 0; + gint _tmp102_ = 0; + gint _tmp103_ = 0; gint _tmp104_ = 0; - guchar* _tmp105_ = NULL; - gint _tmp105__length1 = 0; - gint _tmp106_ = 0; - gint _tmp107_ = 0; + guchar _tmp105_ = '\0'; + guchar _tmp106_ = '\0'; + guchar* _tmp107_ = NULL; + gint _tmp107__length1 = 0; gint _tmp108_ = 0; - gint _tmp109_ = 0; - guchar _tmp110_ = '\0'; - guchar _tmp111_ = '\0'; - guchar* _tmp112_ = NULL; - gint _tmp112__length1 = 0; + guchar* _tmp109_ = NULL; + gint _tmp109__length1 = 0; + gint _tmp110_ = 0; + gint _tmp111_ = 0; + gint _tmp112_ = 0; gint _tmp113_ = 0; - guchar* _tmp114_ = NULL; - gint _tmp114__length1 = 0; - gint _tmp115_ = 0; - gint _tmp116_ = 0; + guchar _tmp114_ = '\0'; + guchar _tmp115_ = '\0'; + guchar* _tmp116_ = NULL; + gint _tmp116__length1 = 0; gint _tmp117_ = 0; - gint _tmp118_ = 0; - guchar _tmp119_ = '\0'; - guchar _tmp120_ = '\0'; - guchar* _tmp121_ = NULL; - gint _tmp121__length1 = 0; + guchar* _tmp118_ = NULL; + gint _tmp118__length1 = 0; + gint _tmp119_ = 0; + gint _tmp120_ = 0; + gint _tmp121_ = 0; gint _tmp122_ = 0; - guchar* _tmp123_ = NULL; - gint _tmp123__length1 = 0; - gint _tmp124_ = 0; - gint _tmp125_ = 0; - gint _tmp126_ = 0; - gint _tmp127_ = 0; - guchar _tmp128_ = '\0'; - guchar _tmp129_ = '\0'; + guchar _tmp123_ = '\0'; + guchar _tmp124_ = '\0'; #line 521 "/home/bob/bzr/simple-scan/trunk/src/page.vala" g_return_if_fail (self != NULL); #line 523 "/home/bob/bzr/simple-scan/trunk/src/page.vala" @@ -1818,15 +1796,15 @@ static void page_get_pixel (Page* self, gint x, gint y, guchar* pixel, int pixel switch (_tmp1_) { #line 523 "/home/bob/bzr/simple-scan/trunk/src/page.vala" case SCAN_DIRECTION_TOP_TO_BOTTOM: -#line 1822 "page.c" +#line 1800 "page.c" { #line 526 "/home/bob/bzr/simple-scan/trunk/src/page.vala" break; -#line 1826 "page.c" +#line 1804 "page.c" } #line 523 "/home/bob/bzr/simple-scan/trunk/src/page.vala" case SCAN_DIRECTION_BOTTOM_TO_TOP: -#line 1830 "page.c" +#line 1808 "page.c" { gint _tmp2_ = 0; gint _tmp3_ = 0; @@ -1846,11 +1824,11 @@ static void page_get_pixel (Page* self, gint x, gint y, guchar* pixel, int pixel y = (_tmp4_ - _tmp5_) - 1; #line 530 "/home/bob/bzr/simple-scan/trunk/src/page.vala" break; -#line 1850 "page.c" +#line 1828 "page.c" } #line 523 "/home/bob/bzr/simple-scan/trunk/src/page.vala" case SCAN_DIRECTION_LEFT_TO_RIGHT: -#line 1854 "page.c" +#line 1832 "page.c" { gint t = 0; gint _tmp6_ = 0; @@ -1873,11 +1851,11 @@ static void page_get_pixel (Page* self, gint x, gint y, guchar* pixel, int pixel y = _tmp9_; #line 535 "/home/bob/bzr/simple-scan/trunk/src/page.vala" break; -#line 1877 "page.c" +#line 1855 "page.c" } #line 523 "/home/bob/bzr/simple-scan/trunk/src/page.vala" case SCAN_DIRECTION_RIGHT_TO_LEFT: -#line 1881 "page.c" +#line 1859 "page.c" { gint t = 0; gint _tmp10_ = 0; @@ -1900,12 +1878,12 @@ static void page_get_pixel (Page* self, gint x, gint y, guchar* pixel, int pixel y = (_tmp12_ - _tmp13_) - 1; #line 540 "/home/bob/bzr/simple-scan/trunk/src/page.vala" break; -#line 1904 "page.c" +#line 1882 "page.c" } default: #line 523 "/home/bob/bzr/simple-scan/trunk/src/page.vala" break; -#line 1909 "page.c" +#line 1887 "page.c" } #line 543 "/home/bob/bzr/simple-scan/trunk/src/page.vala" _tmp14_ = self->priv->_rowstride; @@ -1917,172 +1895,173 @@ static void page_get_pixel (Page* self, gint x, gint y, guchar* pixel, int pixel _tmp17_ = self->priv->_depth; #line 546 "/home/bob/bzr/simple-scan/trunk/src/page.vala" if (_tmp17_ == 8) { -#line 1921 "page.c" +#line 1899 "page.c" gint _tmp18_ = 0; #line 546 "/home/bob/bzr/simple-scan/trunk/src/page.vala" _tmp18_ = self->priv->_n_channels; #line 546 "/home/bob/bzr/simple-scan/trunk/src/page.vala" _tmp16_ = _tmp18_ == 3; -#line 1927 "page.c" +#line 1905 "page.c" } else { #line 546 "/home/bob/bzr/simple-scan/trunk/src/page.vala" _tmp16_ = FALSE; -#line 1931 "page.c" +#line 1909 "page.c" } #line 546 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp19_ = _tmp16_; -#line 546 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - if (_tmp19_) { -#line 1937 "page.c" + if (_tmp16_) { +#line 1913 "page.c" gint o = 0; + gint _tmp19_ = 0; gint _tmp20_ = 0; gint _tmp21_ = 0; - gint _tmp22_ = 0; - guchar* _tmp23_ = NULL; - gint _tmp23__length1 = 0; - gint _tmp24_ = 0; - guchar* _tmp25_ = NULL; - gint _tmp25__length1 = 0; - gint _tmp26_ = 0; + guchar* _tmp22_ = NULL; + gint _tmp22__length1 = 0; + gint _tmp23_ = 0; + guchar* _tmp24_ = NULL; + gint _tmp24__length1 = 0; + gint _tmp25_ = 0; + guchar _tmp26_ = '\0'; guchar _tmp27_ = '\0'; - guchar _tmp28_ = '\0'; - guchar* _tmp29_ = NULL; - gint _tmp29__length1 = 0; - gint _tmp30_ = 0; - guchar* _tmp31_ = NULL; - gint _tmp31__length1 = 0; - gint _tmp32_ = 0; + guchar* _tmp28_ = NULL; + gint _tmp28__length1 = 0; + gint _tmp29_ = 0; + guchar* _tmp30_ = NULL; + gint _tmp30__length1 = 0; + gint _tmp31_ = 0; + guchar _tmp32_ = '\0'; guchar _tmp33_ = '\0'; - guchar _tmp34_ = '\0'; - guchar* _tmp35_ = NULL; - gint _tmp35__length1 = 0; - gint _tmp36_ = 0; - guchar* _tmp37_ = NULL; - gint _tmp37__length1 = 0; - gint _tmp38_ = 0; + guchar* _tmp34_ = NULL; + gint _tmp34__length1 = 0; + gint _tmp35_ = 0; + guchar* _tmp36_ = NULL; + gint _tmp36__length1 = 0; + gint _tmp37_ = 0; + guchar _tmp38_ = '\0'; guchar _tmp39_ = '\0'; - guchar _tmp40_ = '\0'; #line 548 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp20_ = line_offset; + _tmp19_ = line_offset; #line 548 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp21_ = x; + _tmp20_ = x; #line 548 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp22_ = self->priv->_n_channels; + _tmp21_ = self->priv->_n_channels; #line 548 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - o = _tmp20_ + (_tmp21_ * _tmp22_); + o = _tmp19_ + (_tmp20_ * _tmp21_); #line 549 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp23_ = pixel; + _tmp22_ = pixel; #line 549 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp23__length1 = pixel_length1; + _tmp22__length1 = pixel_length1; #line 549 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp24_ = offset; + _tmp23_ = offset; #line 549 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp25_ = self->priv->pixels; + _tmp24_ = self->priv->pixels; #line 549 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp25__length1 = self->priv->pixels_length1; + _tmp24__length1 = self->priv->pixels_length1; #line 549 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp26_ = o; + _tmp25_ = o; #line 549 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp27_ = _tmp25_[_tmp26_]; + _tmp26_ = _tmp24_[_tmp25_]; #line 549 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp23_[_tmp24_ + 0] = _tmp27_; + _tmp22_[_tmp23_ + 0] = _tmp26_; #line 549 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp28_ = _tmp23_[_tmp24_ + 0]; + _tmp27_ = _tmp22_[_tmp23_ + 0]; #line 550 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp29_ = pixel; + _tmp28_ = pixel; #line 550 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp29__length1 = pixel_length1; + _tmp28__length1 = pixel_length1; #line 550 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp30_ = offset; + _tmp29_ = offset; #line 550 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp31_ = self->priv->pixels; + _tmp30_ = self->priv->pixels; #line 550 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp31__length1 = self->priv->pixels_length1; + _tmp30__length1 = self->priv->pixels_length1; #line 550 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp32_ = o; + _tmp31_ = o; #line 550 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp33_ = _tmp31_[_tmp32_ + 1]; + _tmp32_ = _tmp30_[_tmp31_ + 1]; #line 550 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp29_[_tmp30_ + 1] = _tmp33_; + _tmp28_[_tmp29_ + 1] = _tmp32_; #line 550 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp34_ = _tmp29_[_tmp30_ + 1]; + _tmp33_ = _tmp28_[_tmp29_ + 1]; #line 551 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp35_ = pixel; + _tmp34_ = pixel; #line 551 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp35__length1 = pixel_length1; + _tmp34__length1 = pixel_length1; #line 551 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp36_ = offset; + _tmp35_ = offset; #line 551 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp37_ = self->priv->pixels; + _tmp36_ = self->priv->pixels; #line 551 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp37__length1 = self->priv->pixels_length1; + _tmp36__length1 = self->priv->pixels_length1; #line 551 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp38_ = o; + _tmp37_ = o; #line 551 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp39_ = _tmp37_[_tmp38_ + 2]; + _tmp38_ = _tmp36_[_tmp37_ + 2]; #line 551 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp35_[_tmp36_ + 2] = _tmp39_; + _tmp34_[_tmp35_ + 2] = _tmp38_; #line 551 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp40_ = _tmp35_[_tmp36_ + 2]; + _tmp39_ = _tmp34_[_tmp35_ + 2]; #line 552 "/home/bob/bzr/simple-scan/trunk/src/page.vala" return; -#line 2030 "page.c" +#line 2006 "page.c" } else { - gboolean _tmp41_ = FALSE; - gint _tmp42_ = 0; - gboolean _tmp44_ = FALSE; + gboolean _tmp40_ = FALSE; + gint _tmp41_ = 0; #line 554 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp42_ = self->priv->_depth; + _tmp41_ = self->priv->_depth; #line 554 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - if (_tmp42_ == 8) { -#line 2039 "page.c" - gint _tmp43_ = 0; + if (_tmp41_ == 8) { +#line 2014 "page.c" + gint _tmp42_ = 0; #line 554 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp43_ = self->priv->_n_channels; + _tmp42_ = self->priv->_n_channels; #line 554 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp41_ = _tmp43_ == 1; -#line 2045 "page.c" + _tmp40_ = _tmp42_ == 1; +#line 2020 "page.c" } else { #line 554 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp41_ = FALSE; -#line 2049 "page.c" + _tmp40_ = FALSE; +#line 2024 "page.c" } #line 554 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp44_ = _tmp41_; -#line 554 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - if (_tmp44_) { -#line 2055 "page.c" + if (_tmp40_) { +#line 2028 "page.c" guchar p = '\0'; - guchar* _tmp45_ = NULL; - gint _tmp45__length1 = 0; - gint _tmp46_ = 0; - gint _tmp47_ = 0; - guchar _tmp48_ = '\0'; + guchar* _tmp43_ = NULL; + gint _tmp43__length1 = 0; + gint _tmp44_ = 0; + gint _tmp45_ = 0; + guchar _tmp46_ = '\0'; + guchar* _tmp47_ = NULL; + gint _tmp47__length1 = 0; + gint _tmp48_ = 0; guchar* _tmp49_ = NULL; gint _tmp49__length1 = 0; gint _tmp50_ = 0; guchar* _tmp51_ = NULL; gint _tmp51__length1 = 0; gint _tmp52_ = 0; - guchar* _tmp53_ = NULL; - gint _tmp53__length1 = 0; - gint _tmp54_ = 0; + guchar _tmp53_ = '\0'; + guchar _tmp54_ = '\0'; guchar _tmp55_ = '\0'; guchar _tmp56_ = '\0'; - guchar _tmp57_ = '\0'; - guchar _tmp58_ = '\0'; #line 556 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp45_ = self->priv->pixels; + _tmp43_ = self->priv->pixels; #line 556 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp45__length1 = self->priv->pixels_length1; + _tmp43__length1 = self->priv->pixels_length1; #line 556 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp46_ = line_offset; + _tmp44_ = line_offset; #line 556 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp47_ = x; + _tmp45_ = x; #line 556 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp48_ = _tmp45_[_tmp46_ + _tmp47_]; + _tmp46_ = _tmp43_[_tmp44_ + _tmp45_]; #line 556 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - p = _tmp48_; + p = _tmp46_; +#line 557 "/home/bob/bzr/simple-scan/trunk/src/page.vala" + _tmp47_ = pixel; +#line 557 "/home/bob/bzr/simple-scan/trunk/src/page.vala" + _tmp47__length1 = pixel_length1; +#line 557 "/home/bob/bzr/simple-scan/trunk/src/page.vala" + _tmp48_ = offset; #line 557 "/home/bob/bzr/simple-scan/trunk/src/page.vala" _tmp49_ = pixel; #line 557 "/home/bob/bzr/simple-scan/trunk/src/page.vala" @@ -2096,333 +2075,318 @@ static void page_get_pixel (Page* self, gint x, gint y, guchar* pixel, int pixel #line 557 "/home/bob/bzr/simple-scan/trunk/src/page.vala" _tmp52_ = offset; #line 557 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp53_ = pixel; -#line 557 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp53__length1 = pixel_length1; -#line 557 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp54_ = offset; + _tmp53_ = p; #line 557 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp55_ = p; + _tmp51_[_tmp52_ + 2] = _tmp53_; #line 557 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp53_[_tmp54_ + 2] = _tmp55_; + _tmp54_ = _tmp51_[_tmp52_ + 2]; #line 557 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp56_ = _tmp53_[_tmp54_ + 2]; + _tmp49_[_tmp50_ + 1] = _tmp54_; #line 557 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp51_[_tmp52_ + 1] = _tmp56_; + _tmp55_ = _tmp49_[_tmp50_ + 1]; #line 557 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp57_ = _tmp51_[_tmp52_ + 1]; + _tmp47_[_tmp48_ + 0] = _tmp55_; #line 557 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp49_[_tmp50_ + 0] = _tmp57_; -#line 557 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp58_ = _tmp49_[_tmp50_ + 0]; + _tmp56_ = _tmp47_[_tmp48_ + 0]; #line 558 "/home/bob/bzr/simple-scan/trunk/src/page.vala" return; -#line 2121 "page.c" +#line 2094 "page.c" } else { - gboolean _tmp59_ = FALSE; - gint _tmp60_ = 0; - gboolean _tmp62_ = FALSE; + gboolean _tmp57_ = FALSE; + gint _tmp58_ = 0; #line 562 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp60_ = self->priv->_depth; + _tmp58_ = self->priv->_depth; #line 562 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - if (_tmp60_ == 1) { -#line 2130 "page.c" - gint _tmp61_ = 0; + if (_tmp58_ == 1) { +#line 2102 "page.c" + gint _tmp59_ = 0; #line 562 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp61_ = self->priv->_n_channels; + _tmp59_ = self->priv->_n_channels; #line 562 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp59_ = _tmp61_ == 1; -#line 2136 "page.c" + _tmp57_ = _tmp59_ == 1; +#line 2108 "page.c" } else { #line 562 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp59_ = FALSE; -#line 2140 "page.c" + _tmp57_ = FALSE; +#line 2112 "page.c" } #line 562 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp62_ = _tmp59_; -#line 562 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - if (_tmp62_) { -#line 2146 "page.c" + if (_tmp57_) { +#line 2116 "page.c" guchar p = '\0'; - guchar* _tmp63_ = NULL; - gint _tmp63__length1 = 0; + guchar* _tmp60_ = NULL; + gint _tmp60__length1 = 0; + gint _tmp61_ = 0; + gint _tmp62_ = 0; + guchar _tmp63_ = '\0'; gint _tmp64_ = 0; - gint _tmp65_ = 0; - guchar _tmp66_ = '\0'; - gint _tmp67_ = 0; - guchar _tmp68_ = '\0'; - gint _tmp69_ = 0; - guchar* _tmp70_ = NULL; - gint _tmp70__length1 = 0; - gint _tmp71_ = 0; - guchar* _tmp72_ = NULL; - gint _tmp72__length1 = 0; - gint _tmp73_ = 0; - guchar* _tmp74_ = NULL; - gint _tmp74__length1 = 0; - gint _tmp75_ = 0; - gint _tmp76_ = 0; - guchar _tmp77_ = '\0'; - guchar _tmp78_ = '\0'; - guchar _tmp79_ = '\0'; + guchar _tmp65_ = '\0'; + gint _tmp66_ = 0; + guchar* _tmp67_ = NULL; + gint _tmp67__length1 = 0; + gint _tmp68_ = 0; + guchar* _tmp69_ = NULL; + gint _tmp69__length1 = 0; + gint _tmp70_ = 0; + guchar* _tmp71_ = NULL; + gint _tmp71__length1 = 0; + gint _tmp72_ = 0; + guchar _tmp73_ = '\0'; + guchar _tmp74_ = '\0'; + guchar _tmp75_ = '\0'; #line 564 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp63_ = self->priv->pixels; + _tmp60_ = self->priv->pixels; #line 564 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp63__length1 = self->priv->pixels_length1; + _tmp60__length1 = self->priv->pixels_length1; #line 564 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp64_ = line_offset; + _tmp61_ = line_offset; #line 564 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp65_ = x; + _tmp62_ = x; #line 564 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp66_ = _tmp63_[_tmp64_ + (_tmp65_ / 8)]; + _tmp63_ = _tmp60_[_tmp61_ + (_tmp62_ / 8)]; #line 564 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - p = _tmp66_; + p = _tmp63_; #line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp68_ = p; + _tmp65_ = p; #line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp69_ = x; + _tmp66_ = x; #line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - if (((gint) (_tmp68_ & (0x80 >> (_tmp69_ % 8)))) != 0) { + if (((gint) (_tmp65_ & (0x80 >> (_tmp66_ % 8)))) != 0) { #line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp67_ = 0x00; -#line 2189 "page.c" + _tmp64_ = 0x00; +#line 2158 "page.c" } else { #line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp67_ = 0xFF; -#line 2193 "page.c" + _tmp64_ = 0xFF; +#line 2162 "page.c" } #line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp70_ = pixel; -#line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp70__length1 = pixel_length1; + _tmp67_ = pixel; #line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp71_ = offset; + _tmp67__length1 = pixel_length1; #line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp72_ = pixel; + _tmp68_ = offset; #line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp72__length1 = pixel_length1; + _tmp69_ = pixel; #line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp73_ = offset; + _tmp69__length1 = pixel_length1; #line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp74_ = pixel; + _tmp70_ = offset; #line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp74__length1 = pixel_length1; + _tmp71_ = pixel; #line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp75_ = offset; + _tmp71__length1 = pixel_length1; #line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp76_ = _tmp67_; + _tmp72_ = offset; #line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp74_[_tmp75_ + 2] = (guchar) _tmp76_; + _tmp71_[_tmp72_ + 2] = (guchar) _tmp64_; #line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp77_ = _tmp74_[_tmp75_ + 2]; + _tmp73_ = _tmp71_[_tmp72_ + 2]; #line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp72_[_tmp73_ + 1] = _tmp77_; + _tmp69_[_tmp70_ + 1] = _tmp73_; #line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp78_ = _tmp72_[_tmp73_ + 1]; + _tmp74_ = _tmp69_[_tmp70_ + 1]; #line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp70_[_tmp71_ + 0] = _tmp78_; + _tmp67_[_tmp68_ + 0] = _tmp74_; #line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp79_ = _tmp70_[_tmp71_ + 0]; + _tmp75_ = _tmp67_[_tmp68_ + 0]; #line 566 "/home/bob/bzr/simple-scan/trunk/src/page.vala" return; -#line 2229 "page.c" +#line 2196 "page.c" } else { - gboolean _tmp80_ = FALSE; - gint _tmp81_ = 0; - gboolean _tmp83_ = FALSE; + gboolean _tmp76_ = FALSE; + gint _tmp77_ = 0; #line 570 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp81_ = self->priv->_depth; + _tmp77_ = self->priv->_depth; #line 570 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - if (_tmp81_ == 2) { -#line 2238 "page.c" - gint _tmp82_ = 0; + if (_tmp77_ == 2) { +#line 2204 "page.c" + gint _tmp78_ = 0; #line 570 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp82_ = self->priv->_n_channels; + _tmp78_ = self->priv->_n_channels; #line 570 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp80_ = _tmp82_ == 1; -#line 2244 "page.c" + _tmp76_ = _tmp78_ == 1; +#line 2210 "page.c" } else { #line 570 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp80_ = FALSE; -#line 2248 "page.c" + _tmp76_ = FALSE; +#line 2214 "page.c" } #line 570 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp83_ = _tmp80_; -#line 570 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - if (_tmp83_) { -#line 2254 "page.c" + if (_tmp76_) { +#line 2218 "page.c" gint block_shift[4] = {0}; - gint _tmp84_[4] = {0}; + gint _tmp79_[4] = {0}; guchar p = '\0'; - guchar* _tmp85_ = NULL; - gint _tmp85__length1 = 0; + guchar* _tmp80_ = NULL; + gint _tmp80__length1 = 0; + gint _tmp81_ = 0; + gint _tmp82_ = 0; + guchar _tmp83_ = '\0'; + gint sample = 0; + guchar _tmp84_ = '\0'; + gint _tmp85_ = 0; gint _tmp86_ = 0; gint _tmp87_ = 0; - guchar _tmp88_ = '\0'; - gint sample = 0; - guchar _tmp89_ = '\0'; - gint _tmp90_ = 0; + guchar* _tmp88_ = NULL; + gint _tmp88__length1 = 0; + gint _tmp89_ = 0; + guchar* _tmp90_ = NULL; + gint _tmp90__length1 = 0; gint _tmp91_ = 0; - gint _tmp92_ = 0; - guchar* _tmp93_ = NULL; - gint _tmp93__length1 = 0; + guchar* _tmp92_ = NULL; + gint _tmp92__length1 = 0; + gint _tmp93_ = 0; gint _tmp94_ = 0; - guchar* _tmp95_ = NULL; - gint _tmp95__length1 = 0; - gint _tmp96_ = 0; - guchar* _tmp97_ = NULL; - gint _tmp97__length1 = 0; - gint _tmp98_ = 0; - gint _tmp99_ = 0; - guchar _tmp100_ = '\0'; - guchar _tmp101_ = '\0'; - guchar _tmp102_ = '\0'; + guchar _tmp95_ = '\0'; + guchar _tmp96_ = '\0'; + guchar _tmp97_ = '\0'; #line 572 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp84_[0] = 6; + _tmp79_[0] = 6; #line 572 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp84_[1] = 4; + _tmp79_[1] = 4; #line 572 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp84_[2] = 2; + _tmp79_[2] = 2; #line 572 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp84_[3] = 0; + _tmp79_[3] = 0; #line 572 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - memcpy (block_shift, _tmp84_, 4 * sizeof (gint)); + memcpy (block_shift, _tmp79_, 4 * sizeof (gint)); #line 574 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp85_ = self->priv->pixels; + _tmp80_ = self->priv->pixels; #line 574 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp85__length1 = self->priv->pixels_length1; + _tmp80__length1 = self->priv->pixels_length1; #line 574 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp86_ = line_offset; + _tmp81_ = line_offset; #line 574 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp87_ = x; + _tmp82_ = x; #line 574 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp88_ = _tmp85_[_tmp86_ + (_tmp87_ / 4)]; + _tmp83_ = _tmp80_[_tmp81_ + (_tmp82_ / 4)]; #line 574 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - p = _tmp88_; + p = _tmp83_; #line 575 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp89_ = p; + _tmp84_ = p; #line 575 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp90_ = x; + _tmp85_ = x; #line 575 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp91_ = block_shift[_tmp90_ % 4]; + _tmp86_ = block_shift[_tmp85_ % 4]; #line 575 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - sample = (_tmp89_ >> _tmp91_) & 0x3; + sample = (_tmp84_ >> _tmp86_) & 0x3; #line 576 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp92_ = sample; + _tmp87_ = sample; #line 576 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - sample = (_tmp92_ * 255) / 3; + sample = (_tmp87_ * 255) / 3; #line 578 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp93_ = pixel; + _tmp88_ = pixel; #line 578 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp93__length1 = pixel_length1; + _tmp88__length1 = pixel_length1; #line 578 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp94_ = offset; + _tmp89_ = offset; #line 578 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp95_ = pixel; + _tmp90_ = pixel; #line 578 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp95__length1 = pixel_length1; + _tmp90__length1 = pixel_length1; #line 578 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp96_ = offset; + _tmp91_ = offset; #line 578 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp97_ = pixel; + _tmp92_ = pixel; #line 578 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp97__length1 = pixel_length1; + _tmp92__length1 = pixel_length1; #line 578 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp98_ = offset; + _tmp93_ = offset; #line 578 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp99_ = sample; + _tmp94_ = sample; #line 578 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp97_[_tmp98_ + 2] = (guchar) _tmp99_; + _tmp92_[_tmp93_ + 2] = (guchar) _tmp94_; #line 578 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp100_ = _tmp97_[_tmp98_ + 2]; + _tmp95_ = _tmp92_[_tmp93_ + 2]; #line 578 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp95_[_tmp96_ + 1] = _tmp100_; + _tmp90_[_tmp91_ + 1] = _tmp95_; #line 578 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp101_ = _tmp95_[_tmp96_ + 1]; + _tmp96_ = _tmp90_[_tmp91_ + 1]; #line 578 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp93_[_tmp94_ + 0] = _tmp101_; + _tmp88_[_tmp89_ + 0] = _tmp96_; #line 578 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp102_ = _tmp93_[_tmp94_ + 0]; + _tmp97_ = _tmp88_[_tmp89_ + 0]; #line 579 "/home/bob/bzr/simple-scan/trunk/src/page.vala" return; -#line 2349 "page.c" +#line 2313 "page.c" } } } } #line 583 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp103_ = pixel; + _tmp98_ = pixel; #line 583 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp103__length1 = pixel_length1; + _tmp98__length1 = pixel_length1; #line 583 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp104_ = offset; + _tmp99_ = offset; #line 583 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp105_ = self->priv->pixels; + _tmp100_ = self->priv->pixels; #line 583 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp105__length1 = self->priv->pixels_length1; + _tmp100__length1 = self->priv->pixels_length1; #line 583 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp106_ = line_offset; + _tmp101_ = line_offset; #line 583 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp107_ = x; + _tmp102_ = x; #line 583 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp108_ = self->priv->_depth; + _tmp103_ = self->priv->_depth; #line 583 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp109_ = self->priv->_n_channels; + _tmp104_ = self->priv->_n_channels; #line 583 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp110_ = page_get_sample (self, _tmp105_, _tmp105__length1, _tmp106_, _tmp107_, _tmp108_, _tmp109_, 0); + _tmp105_ = page_get_sample (self, _tmp100_, _tmp100__length1, _tmp101_, _tmp102_, _tmp103_, _tmp104_, 0); #line 583 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp103_[_tmp104_ + 0] = _tmp110_; + _tmp98_[_tmp99_ + 0] = _tmp105_; #line 583 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp111_ = _tmp103_[_tmp104_ + 0]; + _tmp106_ = _tmp98_[_tmp99_ + 0]; #line 584 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp112_ = pixel; + _tmp107_ = pixel; #line 584 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp112__length1 = pixel_length1; + _tmp107__length1 = pixel_length1; #line 584 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp113_ = offset; + _tmp108_ = offset; #line 584 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp114_ = self->priv->pixels; + _tmp109_ = self->priv->pixels; #line 584 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp114__length1 = self->priv->pixels_length1; + _tmp109__length1 = self->priv->pixels_length1; #line 584 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp115_ = line_offset; + _tmp110_ = line_offset; #line 584 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp116_ = x; + _tmp111_ = x; #line 584 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp117_ = self->priv->_depth; + _tmp112_ = self->priv->_depth; #line 584 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp118_ = self->priv->_n_channels; + _tmp113_ = self->priv->_n_channels; #line 584 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp119_ = page_get_sample (self, _tmp114_, _tmp114__length1, _tmp115_, _tmp116_, _tmp117_, _tmp118_, 1); + _tmp114_ = page_get_sample (self, _tmp109_, _tmp109__length1, _tmp110_, _tmp111_, _tmp112_, _tmp113_, 1); #line 584 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp112_[_tmp113_ + 1] = _tmp119_; + _tmp107_[_tmp108_ + 1] = _tmp114_; #line 584 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp120_ = _tmp112_[_tmp113_ + 1]; + _tmp115_ = _tmp107_[_tmp108_ + 1]; #line 585 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp121_ = pixel; + _tmp116_ = pixel; #line 585 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp121__length1 = pixel_length1; + _tmp116__length1 = pixel_length1; #line 585 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp122_ = offset; + _tmp117_ = offset; #line 585 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp123_ = self->priv->pixels; + _tmp118_ = self->priv->pixels; #line 585 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp123__length1 = self->priv->pixels_length1; + _tmp118__length1 = self->priv->pixels_length1; #line 585 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp124_ = line_offset; + _tmp119_ = line_offset; #line 585 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp125_ = x; + _tmp120_ = x; #line 585 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp126_ = self->priv->_depth; + _tmp121_ = self->priv->_depth; #line 585 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp127_ = self->priv->_n_channels; + _tmp122_ = self->priv->_n_channels; #line 585 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp128_ = page_get_sample (self, _tmp123_, _tmp123__length1, _tmp124_, _tmp125_, _tmp126_, _tmp127_, 2); + _tmp123_ = page_get_sample (self, _tmp118_, _tmp118__length1, _tmp119_, _tmp120_, _tmp121_, _tmp122_, 2); #line 585 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp121_[_tmp122_ + 2] = _tmp128_; + _tmp116_[_tmp117_ + 2] = _tmp123_; #line 585 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp129_ = _tmp121_[_tmp122_ + 2]; -#line 2426 "page.c" + _tmp124_ = _tmp116_[_tmp117_ + 2]; +#line 2390 "page.c" } @@ -2434,16 +2398,15 @@ GdkPixbuf* page_get_image (Page* self, gboolean apply_crop) { gint b = 0; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; - gboolean _tmp3_ = FALSE; GdkPixbuf* image = NULL; + gint _tmp25_ = 0; gint _tmp26_ = 0; gint _tmp27_ = 0; gint _tmp28_ = 0; - gint _tmp29_ = 0; - GdkPixbuf* _tmp30_ = NULL; + GdkPixbuf* _tmp29_ = NULL; guint8* image_pixels = NULL; - GdkPixbuf* _tmp31_ = NULL; - guint8* _tmp32_ = NULL; + GdkPixbuf* _tmp30_ = NULL; + guint8* _tmp31_ = NULL; gint image_pixels_length1 = 0; gint _image_pixels_size_ = 0; #line 588 "/home/bob/bzr/simple-scan/trunk/src/page.vala" @@ -2452,23 +2415,22 @@ GdkPixbuf* page_get_image (Page* self, gboolean apply_crop) { _tmp1_ = apply_crop; #line 591 "/home/bob/bzr/simple-scan/trunk/src/page.vala" if (_tmp1_) { -#line 2456 "page.c" +#line 2419 "page.c" gboolean _tmp2_ = FALSE; #line 591 "/home/bob/bzr/simple-scan/trunk/src/page.vala" _tmp2_ = self->priv->_has_crop; #line 591 "/home/bob/bzr/simple-scan/trunk/src/page.vala" _tmp0_ = _tmp2_; -#line 2462 "page.c" +#line 2425 "page.c" } else { #line 591 "/home/bob/bzr/simple-scan/trunk/src/page.vala" _tmp0_ = FALSE; -#line 2466 "page.c" +#line 2429 "page.c" } #line 591 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp3_ = _tmp0_; -#line 591 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - if (_tmp3_) { -#line 2472 "page.c" + if (_tmp0_) { +#line 2433 "page.c" + gint _tmp3_ = 0; gint _tmp4_ = 0; gint _tmp5_ = 0; gint _tmp6_ = 0; @@ -2478,255 +2440,248 @@ GdkPixbuf* page_get_image (Page* self, gboolean apply_crop) { gint _tmp10_ = 0; gint _tmp11_ = 0; gint _tmp12_ = 0; - gint _tmp13_ = 0; + gint _tmp15_ = 0; gint _tmp16_ = 0; gint _tmp17_ = 0; gint _tmp18_ = 0; - gint _tmp19_ = 0; #line 593 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp4_ = self->priv->_crop_x; + _tmp3_ = self->priv->_crop_x; #line 593 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - l = _tmp4_; + l = _tmp3_; #line 594 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp5_ = l; + _tmp4_ = l; #line 594 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp6_ = self->priv->_crop_width; + _tmp5_ = self->priv->_crop_width; #line 594 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - r = _tmp5_ + _tmp6_; + r = _tmp4_ + _tmp5_; #line 595 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp7_ = self->priv->_crop_y; + _tmp6_ = self->priv->_crop_y; #line 595 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - t = _tmp7_; + t = _tmp6_; #line 596 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp8_ = t; + _tmp7_ = t; #line 596 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp9_ = self->priv->_crop_height; + _tmp8_ = self->priv->_crop_height; #line 596 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - b = _tmp8_ + _tmp9_; + b = _tmp7_ + _tmp8_; #line 598 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp10_ = l; + _tmp9_ = l; #line 598 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - if (_tmp10_ < 0) { + if (_tmp9_ < 0) { #line 599 "/home/bob/bzr/simple-scan/trunk/src/page.vala" l = 0; -#line 2513 "page.c" +#line 2474 "page.c" } #line 600 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp11_ = r; + _tmp10_ = r; #line 600 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp12_ = page_get_width (self); + _tmp11_ = page_get_width (self); #line 600 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp13_ = _tmp12_; + _tmp12_ = _tmp11_; #line 600 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - if (_tmp11_ > _tmp13_) { -#line 2523 "page.c" + if (_tmp10_ > _tmp12_) { +#line 2484 "page.c" + gint _tmp13_ = 0; gint _tmp14_ = 0; - gint _tmp15_ = 0; #line 601 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp14_ = page_get_width (self); + _tmp13_ = page_get_width (self); #line 601 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp15_ = _tmp14_; + _tmp14_ = _tmp13_; #line 601 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - r = _tmp15_; -#line 2532 "page.c" + r = _tmp14_; +#line 2493 "page.c" } #line 602 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp16_ = t; + _tmp15_ = t; #line 602 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - if (_tmp16_ < 0) { + if (_tmp15_ < 0) { #line 603 "/home/bob/bzr/simple-scan/trunk/src/page.vala" t = 0; -#line 2540 "page.c" +#line 2501 "page.c" } #line 604 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp17_ = b; + _tmp16_ = b; #line 604 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp18_ = page_get_height (self); + _tmp17_ = page_get_height (self); #line 604 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp19_ = _tmp18_; + _tmp18_ = _tmp17_; #line 604 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - if (_tmp17_ > _tmp19_) { -#line 2550 "page.c" + if (_tmp16_ > _tmp18_) { +#line 2511 "page.c" + gint _tmp19_ = 0; gint _tmp20_ = 0; - gint _tmp21_ = 0; #line 605 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp20_ = page_get_height (self); + _tmp19_ = page_get_height (self); #line 605 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp21_ = _tmp20_; + _tmp20_ = _tmp19_; #line 605 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - b = _tmp21_; -#line 2559 "page.c" + b = _tmp20_; +#line 2520 "page.c" } } else { + gint _tmp21_ = 0; gint _tmp22_ = 0; gint _tmp23_ = 0; gint _tmp24_ = 0; - gint _tmp25_ = 0; #line 609 "/home/bob/bzr/simple-scan/trunk/src/page.vala" l = 0; #line 610 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp22_ = page_get_width (self); + _tmp21_ = page_get_width (self); #line 610 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp23_ = _tmp22_; + _tmp22_ = _tmp21_; #line 610 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - r = _tmp23_; + r = _tmp22_; #line 611 "/home/bob/bzr/simple-scan/trunk/src/page.vala" t = 0; #line 612 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp24_ = page_get_height (self); + _tmp23_ = page_get_height (self); #line 612 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp25_ = _tmp24_; + _tmp24_ = _tmp23_; #line 612 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - b = _tmp25_; -#line 2582 "page.c" + b = _tmp24_; +#line 2543 "page.c" } #line 615 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp26_ = r; + _tmp25_ = r; #line 615 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp27_ = l; + _tmp26_ = l; #line 615 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp28_ = b; + _tmp27_ = b; #line 615 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp29_ = t; + _tmp28_ = t; #line 615 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp30_ = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, _tmp26_ - _tmp27_, _tmp28_ - _tmp29_); + _tmp29_ = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, _tmp25_ - _tmp26_, _tmp27_ - _tmp28_); #line 615 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - image = _tmp30_; + image = _tmp29_; #line 616 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp31_ = image; + _tmp30_ = image; #line 616 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp32_ = gdk_pixbuf_get_pixels (_tmp31_); + _tmp31_ = gdk_pixbuf_get_pixels (_tmp30_); #line 616 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - image_pixels = _tmp32_; + image_pixels = _tmp31_; #line 616 "/home/bob/bzr/simple-scan/trunk/src/page.vala" image_pixels_length1 = -1; #line 616 "/home/bob/bzr/simple-scan/trunk/src/page.vala" _image_pixels_size_ = image_pixels_length1; -#line 2606 "page.c" +#line 2567 "page.c" { gint y = 0; - gint _tmp33_ = 0; + gint _tmp32_ = 0; #line 617 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp33_ = t; + _tmp32_ = t; #line 617 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - y = _tmp33_; -#line 2614 "page.c" + y = _tmp32_; +#line 2575 "page.c" { - gboolean _tmp34_ = FALSE; + gboolean _tmp33_ = FALSE; #line 617 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp34_ = TRUE; + _tmp33_ = TRUE; #line 617 "/home/bob/bzr/simple-scan/trunk/src/page.vala" while (TRUE) { -#line 2621 "page.c" - gboolean _tmp35_ = FALSE; - gint _tmp37_ = 0; - gint _tmp38_ = 0; +#line 2582 "page.c" + gint _tmp35_ = 0; + gint _tmp36_ = 0; gint offset = 0; - GdkPixbuf* _tmp39_ = NULL; + GdkPixbuf* _tmp37_ = NULL; + gint _tmp38_ = 0; + gint _tmp39_ = 0; gint _tmp40_ = 0; - gint _tmp41_ = 0; - gint _tmp42_ = 0; -#line 617 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp35_ = _tmp34_; #line 617 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - if (!_tmp35_) { -#line 2634 "page.c" - gint _tmp36_ = 0; + if (!_tmp33_) { +#line 2592 "page.c" + gint _tmp34_ = 0; #line 617 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp36_ = y; + _tmp34_ = y; #line 617 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - y = _tmp36_ + 1; -#line 2640 "page.c" + y = _tmp34_ + 1; +#line 2598 "page.c" } #line 617 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp34_ = FALSE; + _tmp33_ = FALSE; #line 617 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp37_ = y; + _tmp35_ = y; #line 617 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp38_ = b; + _tmp36_ = b; #line 617 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - if (!(_tmp37_ < _tmp38_)) { + if (!(_tmp35_ < _tmp36_)) { #line 617 "/home/bob/bzr/simple-scan/trunk/src/page.vala" break; -#line 2652 "page.c" +#line 2610 "page.c" } #line 619 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp39_ = image; + _tmp37_ = image; #line 619 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp40_ = gdk_pixbuf_get_rowstride (_tmp39_); + _tmp38_ = gdk_pixbuf_get_rowstride (_tmp37_); #line 619 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp41_ = y; + _tmp39_ = y; #line 619 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp42_ = t; + _tmp40_ = t; #line 619 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - offset = _tmp40_ * (_tmp41_ - _tmp42_); -#line 2664 "page.c" + offset = _tmp38_ * (_tmp39_ - _tmp40_); +#line 2622 "page.c" { gint x = 0; - gint _tmp43_ = 0; + gint _tmp41_ = 0; #line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp43_ = l; + _tmp41_ = l; #line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - x = _tmp43_; -#line 2672 "page.c" + x = _tmp41_; +#line 2630 "page.c" { - gboolean _tmp44_ = FALSE; + gboolean _tmp42_ = FALSE; #line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp44_ = TRUE; + _tmp42_ = TRUE; #line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala" while (TRUE) { -#line 2679 "page.c" - gboolean _tmp45_ = FALSE; +#line 2637 "page.c" + gint _tmp44_ = 0; + gint _tmp45_ = 0; + gint _tmp46_ = 0; gint _tmp47_ = 0; - gint _tmp48_ = 0; + guint8* _tmp48_ = NULL; + gint _tmp48__length1 = 0; gint _tmp49_ = 0; gint _tmp50_ = 0; - guint8* _tmp51_ = NULL; - gint _tmp51__length1 = 0; - gint _tmp52_ = 0; - gint _tmp53_ = 0; - gint _tmp54_ = 0; -#line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp45_ = _tmp44_; + gint _tmp51_ = 0; #line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - if (!_tmp45_) { -#line 2694 "page.c" - gint _tmp46_ = 0; + if (!_tmp42_) { +#line 2649 "page.c" + gint _tmp43_ = 0; #line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp46_ = x; + _tmp43_ = x; #line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - x = _tmp46_ + 1; -#line 2700 "page.c" + x = _tmp43_ + 1; +#line 2655 "page.c" } #line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp44_ = FALSE; + _tmp42_ = FALSE; #line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp47_ = x; + _tmp44_ = x; #line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp48_ = r; + _tmp45_ = r; #line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - if (!(_tmp47_ < _tmp48_)) { + if (!(_tmp44_ < _tmp45_)) { #line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala" break; -#line 2712 "page.c" +#line 2667 "page.c" } #line 621 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp49_ = x; + _tmp46_ = x; #line 621 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp50_ = y; + _tmp47_ = y; #line 621 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp51_ = image_pixels; + _tmp48_ = image_pixels; #line 621 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp51__length1 = image_pixels_length1; + _tmp48__length1 = image_pixels_length1; #line 621 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp52_ = offset; + _tmp49_ = offset; #line 621 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp53_ = x; + _tmp50_ = x; #line 621 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp54_ = l; + _tmp51_ = l; #line 621 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - page_get_pixel (self, _tmp49_, _tmp50_, _tmp51_, _tmp51__length1, _tmp52_ + ((_tmp53_ - _tmp54_) * 3)); -#line 2730 "page.c" + page_get_pixel (self, _tmp46_, _tmp47_, _tmp48_, _tmp48__length1, _tmp49_ + ((_tmp50_ - _tmp51_) * 3)); +#line 2685 "page.c" } } } @@ -2737,7 +2692,7 @@ GdkPixbuf* page_get_image (Page* self, gboolean apply_crop) { result = image; #line 624 "/home/bob/bzr/simple-scan/trunk/src/page.vala" return result; -#line 2741 "page.c" +#line 2696 "page.c" } @@ -2756,49 +2711,49 @@ static gchar* string_to_utf8 (const gchar* self, int* result_length1) { gint _tmp6_ = 0; gchar* _tmp7_ = NULL; gint _tmp7__length1 = 0; -#line 1266 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1303 "/usr/share/vala-0.24/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1267 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1304 "/usr/share/vala-0.24/vapi/glib-2.0.vapi" _tmp0_ = strlen (self); -#line 1267 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1304 "/usr/share/vala-0.24/vapi/glib-2.0.vapi" _tmp1_ = _tmp0_; -#line 1267 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1304 "/usr/share/vala-0.24/vapi/glib-2.0.vapi" _tmp2_ = g_new0 (gchar, _tmp1_ + 1); -#line 1267 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1304 "/usr/share/vala-0.24/vapi/glib-2.0.vapi" _result_ = _tmp2_; -#line 1267 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1304 "/usr/share/vala-0.24/vapi/glib-2.0.vapi" _result__length1 = _tmp1_ + 1; -#line 1267 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1304 "/usr/share/vala-0.24/vapi/glib-2.0.vapi" __result__size_ = _result__length1; -#line 1268 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1305 "/usr/share/vala-0.24/vapi/glib-2.0.vapi" _tmp3_ = _result__length1; -#line 1268 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1305 "/usr/share/vala-0.24/vapi/glib-2.0.vapi" _result__length1 = _tmp3_ - 1; -#line 1269 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1306 "/usr/share/vala-0.24/vapi/glib-2.0.vapi" _tmp4_ = _result_; -#line 1269 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1306 "/usr/share/vala-0.24/vapi/glib-2.0.vapi" _tmp4__length1 = _result__length1; -#line 1269 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1306 "/usr/share/vala-0.24/vapi/glib-2.0.vapi" _tmp5_ = strlen (self); -#line 1269 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1306 "/usr/share/vala-0.24/vapi/glib-2.0.vapi" _tmp6_ = _tmp5_; -#line 1269 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1306 "/usr/share/vala-0.24/vapi/glib-2.0.vapi" memcpy (_tmp4_, self, (gsize) _tmp6_); -#line 1270 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1307 "/usr/share/vala-0.24/vapi/glib-2.0.vapi" _tmp7_ = _result_; -#line 1270 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1307 "/usr/share/vala-0.24/vapi/glib-2.0.vapi" _tmp7__length1 = _result__length1; -#line 1270 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1307 "/usr/share/vala-0.24/vapi/glib-2.0.vapi" if (result_length1) { -#line 1270 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1307 "/usr/share/vala-0.24/vapi/glib-2.0.vapi" *result_length1 = _tmp7__length1; -#line 2796 "page.c" +#line 2751 "page.c" } -#line 1270 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1307 "/usr/share/vala-0.24/vapi/glib-2.0.vapi" result = _tmp7_; -#line 1270 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1307 "/usr/share/vala-0.24/vapi/glib-2.0.vapi" return result; -#line 2802 "page.c" +#line 2757 "page.c" } @@ -2817,7 +2772,7 @@ static gchar* page_get_icc_data_encoded (Page* self, const gchar* icc_profile_fi g_return_val_if_fail (self != NULL, NULL); #line 627 "/home/bob/bzr/simple-scan/trunk/src/page.vala" g_return_val_if_fail (icc_profile_filename != NULL, NULL); -#line 2821 "page.c" +#line 2776 "page.c" { const gchar* _tmp0_ = NULL; gchar* _tmp1_ = NULL; @@ -2831,7 +2786,7 @@ static gchar* page_get_icc_data_encoded (Page* self, const gchar* icc_profile_fi contents = _tmp1_; #line 633 "/home/bob/bzr/simple-scan/trunk/src/page.vala" if (_inner_error_ != NULL) { -#line 2835 "page.c" +#line 2790 "page.c" goto __catch3_g_error; } } @@ -2859,7 +2814,7 @@ static gchar* page_get_icc_data_encoded (Page* self, const gchar* icc_profile_fi _g_free0 (contents); #line 638 "/home/bob/bzr/simple-scan/trunk/src/page.vala" return result; -#line 2863 "page.c" +#line 2818 "page.c" } __finally3: #line 631 "/home/bob/bzr/simple-scan/trunk/src/page.vala" @@ -2872,7 +2827,7 @@ static gchar* page_get_icc_data_encoded (Page* self, const gchar* icc_profile_fi g_clear_error (&_inner_error_); #line 631 "/home/bob/bzr/simple-scan/trunk/src/page.vala" return NULL; -#line 2876 "page.c" +#line 2831 "page.c" } #line 642 "/home/bob/bzr/simple-scan/trunk/src/page.vala" _tmp4_ = contents; @@ -2894,14 +2849,14 @@ static gchar* page_get_icc_data_encoded (Page* self, const gchar* icc_profile_fi _g_free0 (contents); #line 642 "/home/bob/bzr/simple-scan/trunk/src/page.vala" return result; -#line 2898 "page.c" +#line 2853 "page.c" } static gpointer _g_object_ref0 (gpointer self) { #line 647 "/home/bob/bzr/simple-scan/trunk/src/page.vala" return self ? g_object_ref (self) : NULL; -#line 2905 "page.c" +#line 2860 "page.c" } @@ -2945,7 +2900,7 @@ void page_copy_to_clipboard (Page* self, GtkWindow* window) { _g_object_unref0 (clipboard); #line 645 "/home/bob/bzr/simple-scan/trunk/src/page.vala" _g_object_unref0 (display); -#line 2949 "page.c" +#line 2904 "page.c" } @@ -2982,7 +2937,7 @@ void page_save (Page* self, const gchar* type, gint quality, GFile* file, GError g_propagate_error (error, _inner_error_); #line 655 "/home/bob/bzr/simple-scan/trunk/src/page.vala" return; -#line 2986 "page.c" +#line 2941 "page.c" } #line 656 "/home/bob/bzr/simple-scan/trunk/src/page.vala" _tmp2_ = stream; @@ -3000,7 +2955,7 @@ void page_save (Page* self, const gchar* type, gint quality, GFile* file, GError _tmp5_ = self->priv->_color_profile; #line 660 "/home/bob/bzr/simple-scan/trunk/src/page.vala" if (_tmp5_ != NULL) { -#line 3004 "page.c" +#line 2959 "page.c" const gchar* _tmp6_ = NULL; gchar* _tmp7_ = NULL; #line 661 "/home/bob/bzr/simple-scan/trunk/src/page.vala" @@ -3011,7 +2966,7 @@ void page_save (Page* self, const gchar* type, gint quality, GFile* file, GError _g_free0 (icc_profile_data); #line 661 "/home/bob/bzr/simple-scan/trunk/src/page.vala" icc_profile_data = _tmp7_; -#line 3015 "page.c" +#line 2970 "page.c" } #line 663 "/home/bob/bzr/simple-scan/trunk/src/page.vala" _tmp8_ = g_strcmp0; @@ -3021,7 +2976,7 @@ void page_save (Page* self, const gchar* type, gint quality, GFile* file, GError _tmp10_ = _tmp8_ (_tmp9_, "jpeg"); #line 663 "/home/bob/bzr/simple-scan/trunk/src/page.vala" if (_tmp10_ == 0) { -#line 3025 "page.c" +#line 2980 "page.c" gchar** keys = NULL; gchar* _tmp11_ = NULL; gchar* _tmp12_ = NULL; @@ -3123,7 +3078,7 @@ void page_save (Page* self, const gchar* type, gint quality, GFile* file, GError _tmp27_ = icc_profile_data; #line 667 "/home/bob/bzr/simple-scan/trunk/src/page.vala" if (_tmp27_ == NULL) { -#line 3127 "page.c" +#line 3082 "page.c" gchar** _tmp28_ = NULL; gint _tmp28__length1 = 0; gchar* _tmp29_ = NULL; @@ -3137,7 +3092,7 @@ void page_save (Page* self, const gchar* type, gint quality, GFile* file, GError _tmp28_[4] = NULL; #line 668 "/home/bob/bzr/simple-scan/trunk/src/page.vala" _tmp29_ = _tmp28_[4]; -#line 3141 "page.c" +#line 3096 "page.c" } #line 669 "/home/bob/bzr/simple-scan/trunk/src/page.vala" _tmp30_ = writer; @@ -3171,13 +3126,13 @@ void page_save (Page* self, const gchar* type, gint quality, GFile* file, GError _g_object_unref0 (stream); #line 669 "/home/bob/bzr/simple-scan/trunk/src/page.vala" return; -#line 3175 "page.c" +#line 3130 "page.c" } #line 663 "/home/bob/bzr/simple-scan/trunk/src/page.vala" values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL); #line 663 "/home/bob/bzr/simple-scan/trunk/src/page.vala" keys = (_vala_array_free (keys, keys_length1, (GDestroyNotify) g_free), NULL); -#line 3181 "page.c" +#line 3136 "page.c" } else { GCompareFunc _tmp34_ = NULL; const gchar* _tmp35_ = NULL; @@ -3190,7 +3145,7 @@ void page_save (Page* self, const gchar* type, gint quality, GFile* file, GError _tmp36_ = _tmp34_ (_tmp35_, "png"); #line 671 "/home/bob/bzr/simple-scan/trunk/src/page.vala" if (_tmp36_ == 0) { -#line 3194 "page.c" +#line 3149 "page.c" gchar** keys = NULL; gchar* _tmp37_ = NULL; gchar** _tmp38_ = NULL; @@ -3243,7 +3198,7 @@ void page_save (Page* self, const gchar* type, gint quality, GFile* file, GError _tmp42_ = icc_profile_data; #line 675 "/home/bob/bzr/simple-scan/trunk/src/page.vala" if (_tmp42_ == NULL) { -#line 3247 "page.c" +#line 3202 "page.c" gchar** _tmp43_ = NULL; gint _tmp43__length1 = 0; gchar* _tmp44_ = NULL; @@ -3257,7 +3212,7 @@ void page_save (Page* self, const gchar* type, gint quality, GFile* file, GError _tmp43_[0] = NULL; #line 676 "/home/bob/bzr/simple-scan/trunk/src/page.vala" _tmp44_ = _tmp43_[0]; -#line 3261 "page.c" +#line 3216 "page.c" } #line 677 "/home/bob/bzr/simple-scan/trunk/src/page.vala" _tmp45_ = writer; @@ -3291,13 +3246,13 @@ void page_save (Page* self, const gchar* type, gint quality, GFile* file, GError _g_object_unref0 (stream); #line 677 "/home/bob/bzr/simple-scan/trunk/src/page.vala" return; -#line 3295 "page.c" +#line 3250 "page.c" } #line 671 "/home/bob/bzr/simple-scan/trunk/src/page.vala" values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL); #line 671 "/home/bob/bzr/simple-scan/trunk/src/page.vala" keys = (_vala_array_free (keys, keys_length1, (GDestroyNotify) g_free), NULL); -#line 3301 "page.c" +#line 3256 "page.c" } else { GCompareFunc _tmp49_ = NULL; const gchar* _tmp50_ = NULL; @@ -3310,7 +3265,7 @@ void page_save (Page* self, const gchar* type, gint quality, GFile* file, GError _tmp51_ = _tmp49_ (_tmp50_, "tiff"); #line 679 "/home/bob/bzr/simple-scan/trunk/src/page.vala" if (_tmp51_ == 0) { -#line 3314 "page.c" +#line 3269 "page.c" gchar** keys = NULL; gchar* _tmp52_ = NULL; gchar* _tmp53_ = NULL; @@ -3373,7 +3328,7 @@ void page_save (Page* self, const gchar* type, gint quality, GFile* file, GError _tmp59_ = icc_profile_data; #line 683 "/home/bob/bzr/simple-scan/trunk/src/page.vala" if (_tmp59_ == NULL) { -#line 3377 "page.c" +#line 3332 "page.c" gchar** _tmp60_ = NULL; gint _tmp60__length1 = 0; gchar* _tmp61_ = NULL; @@ -3387,7 +3342,7 @@ void page_save (Page* self, const gchar* type, gint quality, GFile* file, GError _tmp60_[1] = NULL; #line 684 "/home/bob/bzr/simple-scan/trunk/src/page.vala" _tmp61_ = _tmp60_[1]; -#line 3391 "page.c" +#line 3346 "page.c" } #line 685 "/home/bob/bzr/simple-scan/trunk/src/page.vala" _tmp62_ = writer; @@ -3421,13 +3376,13 @@ void page_save (Page* self, const gchar* type, gint quality, GFile* file, GError _g_object_unref0 (stream); #line 685 "/home/bob/bzr/simple-scan/trunk/src/page.vala" return; -#line 3425 "page.c" +#line 3380 "page.c" } #line 679 "/home/bob/bzr/simple-scan/trunk/src/page.vala" values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL); #line 679 "/home/bob/bzr/simple-scan/trunk/src/page.vala" keys = (_vala_array_free (keys, keys_length1, (GDestroyNotify) g_free), NULL); -#line 3431 "page.c" +#line 3386 "page.c" } else { } } @@ -3440,7 +3395,7 @@ void page_save (Page* self, const gchar* type, gint quality, GFile* file, GError _pixbuf_writer_unref0 (writer); #line 653 "/home/bob/bzr/simple-scan/trunk/src/page.vala" _g_object_unref0 (stream); -#line 3444 "page.c" +#line 3399 "page.c" } @@ -3449,7 +3404,6 @@ gint page_get_width (Page* self) { gboolean _tmp0_ = FALSE; ScanDirection _tmp1_ = 0; ScanDirection _tmp2_ = 0; - gboolean _tmp5_ = FALSE; #line 25 "/home/bob/bzr/simple-scan/trunk/src/page.vala" g_return_val_if_fail (self != NULL, 0); #line 27 "/home/bob/bzr/simple-scan/trunk/src/page.vala" @@ -3460,7 +3414,7 @@ gint page_get_width (Page* self) { if (_tmp2_ == SCAN_DIRECTION_TOP_TO_BOTTOM) { #line 27 "/home/bob/bzr/simple-scan/trunk/src/page.vala" _tmp0_ = TRUE; -#line 3464 "page.c" +#line 3418 "page.c" } else { ScanDirection _tmp3_ = 0; ScanDirection _tmp4_ = 0; @@ -3470,30 +3424,28 @@ gint page_get_width (Page* self) { _tmp4_ = _tmp3_; #line 27 "/home/bob/bzr/simple-scan/trunk/src/page.vala" _tmp0_ = _tmp4_ == SCAN_DIRECTION_BOTTOM_TO_TOP; -#line 3474 "page.c" +#line 3428 "page.c" } #line 27 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp5_ = _tmp0_; -#line 27 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - if (_tmp5_) { -#line 3480 "page.c" - gint _tmp6_ = 0; + if (_tmp0_) { +#line 3432 "page.c" + gint _tmp5_ = 0; #line 28 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp6_ = self->priv->_scan_width; + _tmp5_ = self->priv->_scan_width; #line 28 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - result = _tmp6_; + result = _tmp5_; #line 28 "/home/bob/bzr/simple-scan/trunk/src/page.vala" return result; -#line 3488 "page.c" +#line 3440 "page.c" } else { - gint _tmp7_ = 0; + gint _tmp6_ = 0; #line 30 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp7_ = self->priv->_scan_height; + _tmp6_ = self->priv->_scan_height; #line 30 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - result = _tmp7_; + result = _tmp6_; #line 30 "/home/bob/bzr/simple-scan/trunk/src/page.vala" return result; -#line 3497 "page.c" +#line 3449 "page.c" } } @@ -3503,7 +3455,6 @@ gint page_get_height (Page* self) { gboolean _tmp0_ = FALSE; ScanDirection _tmp1_ = 0; ScanDirection _tmp2_ = 0; - gboolean _tmp5_ = FALSE; #line 37 "/home/bob/bzr/simple-scan/trunk/src/page.vala" g_return_val_if_fail (self != NULL, 0); #line 39 "/home/bob/bzr/simple-scan/trunk/src/page.vala" @@ -3514,7 +3465,7 @@ gint page_get_height (Page* self) { if (_tmp2_ == SCAN_DIRECTION_TOP_TO_BOTTOM) { #line 39 "/home/bob/bzr/simple-scan/trunk/src/page.vala" _tmp0_ = TRUE; -#line 3518 "page.c" +#line 3469 "page.c" } else { ScanDirection _tmp3_ = 0; ScanDirection _tmp4_ = 0; @@ -3524,30 +3475,28 @@ gint page_get_height (Page* self) { _tmp4_ = _tmp3_; #line 39 "/home/bob/bzr/simple-scan/trunk/src/page.vala" _tmp0_ = _tmp4_ == SCAN_DIRECTION_BOTTOM_TO_TOP; -#line 3528 "page.c" +#line 3479 "page.c" } #line 39 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp5_ = _tmp0_; -#line 39 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - if (_tmp5_) { -#line 3534 "page.c" - gint _tmp6_ = 0; + if (_tmp0_) { +#line 3483 "page.c" + gint _tmp5_ = 0; #line 40 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp6_ = self->priv->_scan_height; + _tmp5_ = self->priv->_scan_height; #line 40 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - result = _tmp6_; + result = _tmp5_; #line 40 "/home/bob/bzr/simple-scan/trunk/src/page.vala" return result; -#line 3542 "page.c" +#line 3491 "page.c" } else { - gint _tmp7_ = 0; + gint _tmp6_ = 0; #line 42 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - _tmp7_ = self->priv->_scan_width; + _tmp6_ = self->priv->_scan_width; #line 42 "/home/bob/bzr/simple-scan/trunk/src/page.vala" - result = _tmp7_; + result = _tmp6_; #line 42 "/home/bob/bzr/simple-scan/trunk/src/page.vala" return result; -#line 3551 "page.c" +#line 3500 "page.c" } } @@ -3572,7 +3521,7 @@ gboolean page_get_is_landscape (Page* self) { result = _tmp1_ > _tmp3_; #line 47 "/home/bob/bzr/simple-scan/trunk/src/page.vala" return result; -#line 3576 "page.c" +#line 3525 "page.c" } @@ -3587,7 +3536,7 @@ gint page_get_dpi (Page* self) { result = _tmp0_; #line 50 "/home/bob/bzr/simple-scan/trunk/src/page.vala" return result; -#line 3591 "page.c" +#line 3540 "page.c" } @@ -3599,7 +3548,7 @@ static void page_set_dpi (Page* self, gint value) { _tmp0_ = value; #line 50 "/home/bob/bzr/simple-scan/trunk/src/page.vala" self->priv->_dpi = _tmp0_; -#line 3603 "page.c" +#line 3552 "page.c" } @@ -3614,7 +3563,7 @@ gint page_get_depth (Page* self) { result = _tmp0_; #line 56 "/home/bob/bzr/simple-scan/trunk/src/page.vala" return result; -#line 3618 "page.c" +#line 3567 "page.c" } @@ -3626,7 +3575,7 @@ static void page_set_depth (Page* self, gint value) { _tmp0_ = value; #line 56 "/home/bob/bzr/simple-scan/trunk/src/page.vala" self->priv->_depth = _tmp0_; -#line 3630 "page.c" +#line 3579 "page.c" } @@ -3641,7 +3590,7 @@ const gchar* page_get_color_profile (Page* self) { result = _tmp0_; #line 59 "/home/bob/bzr/simple-scan/trunk/src/page.vala" return result; -#line 3645 "page.c" +#line 3594 "page.c" } @@ -3658,7 +3607,7 @@ void page_set_color_profile (Page* self, const gchar* value) { _g_free0 (self->priv->_color_profile); #line 59 "/home/bob/bzr/simple-scan/trunk/src/page.vala" self->priv->_color_profile = _tmp1_; -#line 3662 "page.c" +#line 3611 "page.c" } @@ -3673,7 +3622,7 @@ gint page_get_scan_width (Page* self) { result = _tmp0_; #line 62 "/home/bob/bzr/simple-scan/trunk/src/page.vala" return result; -#line 3677 "page.c" +#line 3626 "page.c" } @@ -3685,7 +3634,7 @@ static void page_set_scan_width (Page* self, gint value) { _tmp0_ = value; #line 62 "/home/bob/bzr/simple-scan/trunk/src/page.vala" self->priv->_scan_width = _tmp0_; -#line 3689 "page.c" +#line 3638 "page.c" } @@ -3700,7 +3649,7 @@ gint page_get_scan_height (Page* self) { result = _tmp0_; #line 65 "/home/bob/bzr/simple-scan/trunk/src/page.vala" return result; -#line 3704 "page.c" +#line 3653 "page.c" } @@ -3712,7 +3661,7 @@ static void page_set_scan_height (Page* self, gint value) { _tmp0_ = value; #line 65 "/home/bob/bzr/simple-scan/trunk/src/page.vala" self->priv->_scan_height = _tmp0_; -#line 3716 "page.c" +#line 3665 "page.c" } @@ -3727,7 +3676,7 @@ gint page_get_rowstride (Page* self) { result = _tmp0_; #line 68 "/home/bob/bzr/simple-scan/trunk/src/page.vala" return result; -#line 3731 "page.c" +#line 3680 "page.c" } @@ -3739,7 +3688,7 @@ static void page_set_rowstride (Page* self, gint value) { _tmp0_ = value; #line 68 "/home/bob/bzr/simple-scan/trunk/src/page.vala" self->priv->_rowstride = _tmp0_; -#line 3743 "page.c" +#line 3692 "page.c" } @@ -3754,7 +3703,7 @@ gint page_get_n_channels (Page* self) { result = _tmp0_; #line 71 "/home/bob/bzr/simple-scan/trunk/src/page.vala" return result; -#line 3758 "page.c" +#line 3707 "page.c" } @@ -3766,7 +3715,7 @@ static void page_set_n_channels (Page* self, gint value) { _tmp0_ = value; #line 71 "/home/bob/bzr/simple-scan/trunk/src/page.vala" self->priv->_n_channels = _tmp0_; -#line 3770 "page.c" +#line 3719 "page.c" } @@ -3781,7 +3730,7 @@ gboolean page_get_is_scanning (Page* self) { result = _tmp0_; #line 77 "/home/bob/bzr/simple-scan/trunk/src/page.vala" return result; -#line 3785 "page.c" +#line 3734 "page.c" } @@ -3793,7 +3742,7 @@ static void page_set_is_scanning (Page* self, gboolean value) { _tmp0_ = value; #line 77 "/home/bob/bzr/simple-scan/trunk/src/page.vala" self->priv->_is_scanning = _tmp0_; -#line 3797 "page.c" +#line 3746 "page.c" } @@ -3808,7 +3757,7 @@ gboolean page_get_has_data (Page* self) { result = _tmp0_; #line 80 "/home/bob/bzr/simple-scan/trunk/src/page.vala" return result; -#line 3812 "page.c" +#line 3761 "page.c" } @@ -3820,7 +3769,7 @@ static void page_set_has_data (Page* self, gboolean value) { _tmp0_ = value; #line 80 "/home/bob/bzr/simple-scan/trunk/src/page.vala" self->priv->_has_data = _tmp0_; -#line 3824 "page.c" +#line 3773 "page.c" } @@ -3835,7 +3784,7 @@ gint page_get_scan_line (Page* self) { result = _tmp0_; #line 83 "/home/bob/bzr/simple-scan/trunk/src/page.vala" return result; -#line 3839 "page.c" +#line 3788 "page.c" } @@ -3847,7 +3796,7 @@ static void page_set_scan_line (Page* self, gint value) { _tmp0_ = value; #line 83 "/home/bob/bzr/simple-scan/trunk/src/page.vala" self->priv->_scan_line = _tmp0_; -#line 3851 "page.c" +#line 3800 "page.c" } @@ -3862,7 +3811,7 @@ gboolean page_get_is_color (Page* self) { result = _tmp0_ > 1; #line 86 "/home/bob/bzr/simple-scan/trunk/src/page.vala" return result; -#line 3866 "page.c" +#line 3815 "page.c" } @@ -3877,7 +3826,7 @@ ScanDirection page_get_scan_direction (Page* self) { result = _tmp0_; #line 92 "/home/bob/bzr/simple-scan/trunk/src/page.vala" return result; -#line 3881 "page.c" +#line 3830 "page.c" } @@ -3904,7 +3853,7 @@ void page_set_scan_direction (Page* self, ScanDirection value) { if (_tmp0_ == _tmp1_) { #line 97 "/home/bob/bzr/simple-scan/trunk/src/page.vala" return; -#line 3908 "page.c" +#line 3857 "page.c" } #line 100 "/home/bob/bzr/simple-scan/trunk/src/page.vala" size_has_changed = FALSE; @@ -3918,13 +3867,13 @@ void page_set_scan_direction (Page* self, ScanDirection value) { _tmp4_ = left_steps; #line 102 "/home/bob/bzr/simple-scan/trunk/src/page.vala" if (_tmp4_ < 0) { -#line 3922 "page.c" +#line 3871 "page.c" gint _tmp5_ = 0; #line 103 "/home/bob/bzr/simple-scan/trunk/src/page.vala" _tmp5_ = left_steps; #line 103 "/home/bob/bzr/simple-scan/trunk/src/page.vala" left_steps = _tmp5_ + 4; -#line 3928 "page.c" +#line 3877 "page.c" } #line 104 "/home/bob/bzr/simple-scan/trunk/src/page.vala" _tmp6_ = left_steps; @@ -3932,13 +3881,13 @@ void page_set_scan_direction (Page* self, ScanDirection value) { if (_tmp6_ != 2) { #line 105 "/home/bob/bzr/simple-scan/trunk/src/page.vala" size_has_changed = TRUE; -#line 3936 "page.c" +#line 3885 "page.c" } #line 108 "/home/bob/bzr/simple-scan/trunk/src/page.vala" _tmp7_ = self->priv->_has_crop; #line 108 "/home/bob/bzr/simple-scan/trunk/src/page.vala" if (_tmp7_) { -#line 3942 "page.c" +#line 3891 "page.c" gint _tmp8_ = 0; #line 110 "/home/bob/bzr/simple-scan/trunk/src/page.vala" _tmp8_ = left_steps; @@ -3946,7 +3895,7 @@ void page_set_scan_direction (Page* self, ScanDirection value) { switch (_tmp8_) { #line 110 "/home/bob/bzr/simple-scan/trunk/src/page.vala" case 1: -#line 3950 "page.c" +#line 3899 "page.c" { gint t = 0; gint _tmp9_ = 0; @@ -3990,11 +3939,11 @@ void page_set_scan_direction (Page* self, ScanDirection value) { page_set_crop_height (self, _tmp17_); #line 120 "/home/bob/bzr/simple-scan/trunk/src/page.vala" break; -#line 3994 "page.c" +#line 3943 "page.c" } #line 110 "/home/bob/bzr/simple-scan/trunk/src/page.vala" case 2: -#line 3998 "page.c" +#line 3947 "page.c" { gint _tmp18_ = 0; gint _tmp19_ = 0; @@ -4026,11 +3975,11 @@ void page_set_scan_direction (Page* self, ScanDirection value) { page_set_crop_y (self, _tmp23_ - (_tmp24_ + _tmp25_)); #line 125 "/home/bob/bzr/simple-scan/trunk/src/page.vala" break; -#line 4030 "page.c" +#line 3979 "page.c" } #line 110 "/home/bob/bzr/simple-scan/trunk/src/page.vala" case 3: -#line 4034 "page.c" +#line 3983 "page.c" { gint t = 0; gint _tmp26_ = 0; @@ -4074,12 +4023,12 @@ void page_set_scan_direction (Page* self, ScanDirection value) { page_set_crop_height (self, _tmp34_); #line 134 "/home/bob/bzr/simple-scan/trunk/src/page.vala" break; -#line 4078 "page.c" +#line 4027 "page.c" } default: #line 110 "/home/bob/bzr/simple-scan/trunk/src/page.vala" break; -#line 4083 "page.c" +#line 4032 "page.c" } } #line 138 "/home/bob/bzr/simple-scan/trunk/src/page.vala" @@ -4092,7 +4041,7 @@ void page_set_scan_direction (Page* self, ScanDirection value) { if (_tmp36_) { #line 140 "/home/bob/bzr/simple-scan/trunk/src/page.vala" g_signal_emit_by_name (self, "size-changed"); -#line 4096 "page.c" +#line 4045 "page.c" } #line 141 "/home/bob/bzr/simple-scan/trunk/src/page.vala" g_signal_emit_by_name (self, "scan-direction-changed"); @@ -4102,7 +4051,7 @@ void page_set_scan_direction (Page* self, ScanDirection value) { if (_tmp37_) { #line 143 "/home/bob/bzr/simple-scan/trunk/src/page.vala" g_signal_emit_by_name (self, "crop-changed"); -#line 4106 "page.c" +#line 4055 "page.c" } } @@ -4118,7 +4067,7 @@ gboolean page_get_has_crop (Page* self) { result = _tmp0_; #line 150 "/home/bob/bzr/simple-scan/trunk/src/page.vala" return result; -#line 4122 "page.c" +#line 4071 "page.c" } @@ -4130,7 +4079,7 @@ static void page_set_has_crop (Page* self, gboolean value) { _tmp0_ = value; #line 150 "/home/bob/bzr/simple-scan/trunk/src/page.vala" self->priv->_has_crop = _tmp0_; -#line 4134 "page.c" +#line 4083 "page.c" } @@ -4145,7 +4094,7 @@ const gchar* page_get_crop_name (Page* self) { result = _tmp0_; #line 153 "/home/bob/bzr/simple-scan/trunk/src/page.vala" return result; -#line 4149 "page.c" +#line 4098 "page.c" } @@ -4162,7 +4111,7 @@ static void page_set_crop_name (Page* self, const gchar* value) { _g_free0 (self->priv->_crop_name); #line 153 "/home/bob/bzr/simple-scan/trunk/src/page.vala" self->priv->_crop_name = _tmp1_; -#line 4166 "page.c" +#line 4115 "page.c" } @@ -4177,7 +4126,7 @@ gint page_get_crop_x (Page* self) { result = _tmp0_; #line 156 "/home/bob/bzr/simple-scan/trunk/src/page.vala" return result; -#line 4181 "page.c" +#line 4130 "page.c" } @@ -4189,7 +4138,7 @@ static void page_set_crop_x (Page* self, gint value) { _tmp0_ = value; #line 156 "/home/bob/bzr/simple-scan/trunk/src/page.vala" self->priv->_crop_x = _tmp0_; -#line 4193 "page.c" +#line 4142 "page.c" } @@ -4204,7 +4153,7 @@ gint page_get_crop_y (Page* self) { result = _tmp0_; #line 159 "/home/bob/bzr/simple-scan/trunk/src/page.vala" return result; -#line 4208 "page.c" +#line 4157 "page.c" } @@ -4216,7 +4165,7 @@ static void page_set_crop_y (Page* self, gint value) { _tmp0_ = value; #line 159 "/home/bob/bzr/simple-scan/trunk/src/page.vala" self->priv->_crop_y = _tmp0_; -#line 4220 "page.c" +#line 4169 "page.c" } @@ -4231,7 +4180,7 @@ gint page_get_crop_width (Page* self) { result = _tmp0_; #line 162 "/home/bob/bzr/simple-scan/trunk/src/page.vala" return result; -#line 4235 "page.c" +#line 4184 "page.c" } @@ -4243,7 +4192,7 @@ static void page_set_crop_width (Page* self, gint value) { _tmp0_ = value; #line 162 "/home/bob/bzr/simple-scan/trunk/src/page.vala" self->priv->_crop_width = _tmp0_; -#line 4247 "page.c" +#line 4196 "page.c" } @@ -4258,7 +4207,7 @@ gint page_get_crop_height (Page* self) { result = _tmp0_; #line 165 "/home/bob/bzr/simple-scan/trunk/src/page.vala" return result; -#line 4262 "page.c" +#line 4211 "page.c" } @@ -4270,14 +4219,14 @@ static void page_set_crop_height (Page* self, gint value) { _tmp0_ = value; #line 165 "/home/bob/bzr/simple-scan/trunk/src/page.vala" self->priv->_crop_height = _tmp0_; -#line 4274 "page.c" +#line 4223 "page.c" } static void value_page_init (GValue* value) { #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala" value->data[0].v_pointer = NULL; -#line 4281 "page.c" +#line 4230 "page.c" } @@ -4286,7 +4235,7 @@ static void value_page_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala" page_unref (value->data[0].v_pointer); -#line 4290 "page.c" +#line 4239 "page.c" } } @@ -4296,11 +4245,11 @@ static void value_page_copy_value (const GValue* src_value, GValue* dest_value) if (src_value->data[0].v_pointer) { #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala" dest_value->data[0].v_pointer = page_ref (src_value->data[0].v_pointer); -#line 4300 "page.c" +#line 4249 "page.c" } else { #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala" dest_value->data[0].v_pointer = NULL; -#line 4304 "page.c" +#line 4253 "page.c" } } @@ -4308,37 +4257,37 @@ static void value_page_copy_value (const GValue* src_value, GValue* dest_value) static gpointer value_page_peek_pointer (const GValue* value) { #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala" return value->data[0].v_pointer; -#line 4312 "page.c" +#line 4261 "page.c" } static gchar* value_page_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala" if (collect_values[0].v_pointer) { -#line 4319 "page.c" +#line 4268 "page.c" Page* object; object = collect_values[0].v_pointer; #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala" if (object->parent_instance.g_class == NULL) { #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 4326 "page.c" +#line 4275 "page.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 4330 "page.c" +#line 4279 "page.c" } #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala" value->data[0].v_pointer = page_ref (object); -#line 4334 "page.c" +#line 4283 "page.c" } else { #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala" value->data[0].v_pointer = NULL; -#line 4338 "page.c" +#line 4287 "page.c" } #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala" return NULL; -#line 4342 "page.c" +#line 4291 "page.c" } @@ -4349,25 +4298,25 @@ static gchar* value_page_lcopy_value (const GValue* value, guint n_collect_value if (!object_p) { #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 4353 "page.c" +#line 4302 "page.c" } #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala" if (!value->data[0].v_pointer) { #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala" *object_p = NULL; -#line 4359 "page.c" +#line 4308 "page.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala" *object_p = value->data[0].v_pointer; -#line 4363 "page.c" +#line 4312 "page.c" } else { #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala" *object_p = page_ref (value->data[0].v_pointer); -#line 4367 "page.c" +#line 4316 "page.c" } #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala" return NULL; -#line 4371 "page.c" +#line 4320 "page.c" } @@ -4381,7 +4330,7 @@ GParamSpec* param_spec_page (const gchar* name, const gchar* nick, const gchar* G_PARAM_SPEC (spec)->value_type = object_type; #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala" return G_PARAM_SPEC (spec); -#line 4385 "page.c" +#line 4334 "page.c" } @@ -4390,7 +4339,7 @@ gpointer value_get_page (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PAGE), NULL); #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala" return value->data[0].v_pointer; -#line 4394 "page.c" +#line 4343 "page.c" } @@ -4410,17 +4359,17 @@ void value_set_page (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala" page_ref (value->data[0].v_pointer); -#line 4414 "page.c" +#line 4363 "page.c" } else { #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala" value->data[0].v_pointer = NULL; -#line 4418 "page.c" +#line 4367 "page.c" } #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala" if (old) { #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala" page_unref (old); -#line 4424 "page.c" +#line 4373 "page.c" } } @@ -4439,17 +4388,17 @@ void value_take_page (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala" value->data[0].v_pointer = v_object; -#line 4443 "page.c" +#line 4392 "page.c" } else { #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala" value->data[0].v_pointer = NULL; -#line 4447 "page.c" +#line 4396 "page.c" } #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala" if (old) { #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala" page_unref (old); -#line 4453 "page.c" +#line 4402 "page.c" } } @@ -4473,7 +4422,7 @@ static void page_class_init (PageClass * klass) { g_signal_new ("crop_changed", TYPE_PAGE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala" g_signal_new ("scan_finished", TYPE_PAGE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 4477 "page.c" +#line 4426 "page.c" } @@ -4482,7 +4431,7 @@ static void page_instance_init (Page * self) { self->priv = PAGE_GET_PRIVATE (self); #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala" self->ref_count = 1; -#line 4486 "page.c" +#line 4435 "page.c" } @@ -4496,7 +4445,7 @@ static void page_finalize (Page* obj) { self->priv->pixels = (g_free (self->priv->pixels), NULL); #line 153 "/home/bob/bzr/simple-scan/trunk/src/page.vala" _g_free0 (self->priv->_crop_name); -#line 4500 "page.c" +#line 4449 "page.c" } @@ -4521,7 +4470,7 @@ gpointer page_ref (gpointer instance) { g_atomic_int_inc (&self->ref_count); #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala" return instance; -#line 4525 "page.c" +#line 4474 "page.c" } @@ -4534,7 +4483,7 @@ void page_unref (gpointer instance) { PAGE_GET_CLASS (self)->finalize (self); #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala" g_type_free_instance ((GTypeInstance *) self); -#line 4538 "page.c" +#line 4487 "page.c" } } @@ -4557,23 +4506,23 @@ PixbufWriter* pixbuf_writer_construct (GType object_type, GFileOutputStream* str self->stream = _tmp1_; #line 696 "/home/bob/bzr/simple-scan/trunk/src/page.vala" return self; -#line 4561 "page.c" +#line 4510 "page.c" } PixbufWriter* pixbuf_writer_new (GFileOutputStream* stream) { #line 696 "/home/bob/bzr/simple-scan/trunk/src/page.vala" return pixbuf_writer_construct (TYPE_PIXBUF_WRITER, stream); -#line 4568 "page.c" +#line 4517 "page.c" } static gboolean _pixbuf_writer_write_pixbuf_data_gdk_pixbuf_save_func (guint8* buf, gsize buf_length1, GError** error, gpointer self) { gboolean result; - result = pixbuf_writer_write_pixbuf_data (self, buf, buf_length1, error); + result = pixbuf_writer_write_pixbuf_data ((PixbufWriter*) self, buf, buf_length1, error); #line 703 "/home/bob/bzr/simple-scan/trunk/src/page.vala" return result; -#line 4577 "page.c" +#line 4526 "page.c" } @@ -4611,7 +4560,7 @@ void pixbuf_writer_save (PixbufWriter* self, GdkPixbuf* image, const gchar* type g_propagate_error (error, _inner_error_); #line 703 "/home/bob/bzr/simple-scan/trunk/src/page.vala" return; -#line 4615 "page.c" +#line 4564 "page.c" } } @@ -4638,20 +4587,20 @@ static gboolean pixbuf_writer_write_pixbuf_data (PixbufWriter* self, guint8* buf g_propagate_error (error, _inner_error_); #line 708 "/home/bob/bzr/simple-scan/trunk/src/page.vala" return FALSE; -#line 4642 "page.c" +#line 4591 "page.c" } #line 709 "/home/bob/bzr/simple-scan/trunk/src/page.vala" result = TRUE; #line 709 "/home/bob/bzr/simple-scan/trunk/src/page.vala" return result; -#line 4648 "page.c" +#line 4597 "page.c" } static void value_pixbuf_writer_init (GValue* value) { #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala" value->data[0].v_pointer = NULL; -#line 4655 "page.c" +#line 4604 "page.c" } @@ -4660,7 +4609,7 @@ static void value_pixbuf_writer_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala" pixbuf_writer_unref (value->data[0].v_pointer); -#line 4664 "page.c" +#line 4613 "page.c" } } @@ -4670,11 +4619,11 @@ static void value_pixbuf_writer_copy_value (const GValue* src_value, GValue* des if (src_value->data[0].v_pointer) { #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala" dest_value->data[0].v_pointer = pixbuf_writer_ref (src_value->data[0].v_pointer); -#line 4674 "page.c" +#line 4623 "page.c" } else { #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala" dest_value->data[0].v_pointer = NULL; -#line 4678 "page.c" +#line 4627 "page.c" } } @@ -4682,37 +4631,37 @@ static void value_pixbuf_writer_copy_value (const GValue* src_value, GValue* des static gpointer value_pixbuf_writer_peek_pointer (const GValue* value) { #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala" return value->data[0].v_pointer; -#line 4686 "page.c" +#line 4635 "page.c" } static gchar* value_pixbuf_writer_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala" if (collect_values[0].v_pointer) { -#line 4693 "page.c" +#line 4642 "page.c" PixbufWriter* object; object = collect_values[0].v_pointer; #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala" if (object->parent_instance.g_class == NULL) { #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 4700 "page.c" +#line 4649 "page.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 4704 "page.c" +#line 4653 "page.c" } #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala" value->data[0].v_pointer = pixbuf_writer_ref (object); -#line 4708 "page.c" +#line 4657 "page.c" } else { #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala" value->data[0].v_pointer = NULL; -#line 4712 "page.c" +#line 4661 "page.c" } #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala" return NULL; -#line 4716 "page.c" +#line 4665 "page.c" } @@ -4723,25 +4672,25 @@ static gchar* value_pixbuf_writer_lcopy_value (const GValue* value, guint n_coll if (!object_p) { #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 4727 "page.c" +#line 4676 "page.c" } #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala" if (!value->data[0].v_pointer) { #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala" *object_p = NULL; -#line 4733 "page.c" +#line 4682 "page.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala" *object_p = value->data[0].v_pointer; -#line 4737 "page.c" +#line 4686 "page.c" } else { #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala" *object_p = pixbuf_writer_ref (value->data[0].v_pointer); -#line 4741 "page.c" +#line 4690 "page.c" } #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala" return NULL; -#line 4745 "page.c" +#line 4694 "page.c" } @@ -4755,7 +4704,7 @@ GParamSpec* param_spec_pixbuf_writer (const gchar* name, const gchar* nick, cons G_PARAM_SPEC (spec)->value_type = object_type; #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala" return G_PARAM_SPEC (spec); -#line 4759 "page.c" +#line 4708 "page.c" } @@ -4764,7 +4713,7 @@ gpointer value_get_pixbuf_writer (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PIXBUF_WRITER), NULL); #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala" return value->data[0].v_pointer; -#line 4768 "page.c" +#line 4717 "page.c" } @@ -4784,17 +4733,17 @@ void value_set_pixbuf_writer (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala" pixbuf_writer_ref (value->data[0].v_pointer); -#line 4788 "page.c" +#line 4737 "page.c" } else { #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala" value->data[0].v_pointer = NULL; -#line 4792 "page.c" +#line 4741 "page.c" } #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala" if (old) { #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala" pixbuf_writer_unref (old); -#line 4798 "page.c" +#line 4747 "page.c" } } @@ -4813,17 +4762,17 @@ void value_take_pixbuf_writer (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala" value->data[0].v_pointer = v_object; -#line 4817 "page.c" +#line 4766 "page.c" } else { #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala" value->data[0].v_pointer = NULL; -#line 4821 "page.c" +#line 4770 "page.c" } #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala" if (old) { #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala" pixbuf_writer_unref (old); -#line 4827 "page.c" +#line 4776 "page.c" } } @@ -4833,14 +4782,14 @@ static void pixbuf_writer_class_init (PixbufWriterClass * klass) { pixbuf_writer_parent_class = g_type_class_peek_parent (klass); #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala" PIXBUF_WRITER_CLASS (klass)->finalize = pixbuf_writer_finalize; -#line 4837 "page.c" +#line 4786 "page.c" } static void pixbuf_writer_instance_init (PixbufWriter * self) { #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala" self->ref_count = 1; -#line 4844 "page.c" +#line 4793 "page.c" } @@ -4850,7 +4799,7 @@ static void pixbuf_writer_finalize (PixbufWriter* obj) { self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PIXBUF_WRITER, PixbufWriter); #line 694 "/home/bob/bzr/simple-scan/trunk/src/page.vala" _g_object_unref0 (self->stream); -#line 4854 "page.c" +#line 4803 "page.c" } @@ -4875,7 +4824,7 @@ gpointer pixbuf_writer_ref (gpointer instance) { g_atomic_int_inc (&self->ref_count); #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala" return instance; -#line 4879 "page.c" +#line 4828 "page.c" } @@ -4888,7 +4837,7 @@ void pixbuf_writer_unref (gpointer instance) { PIXBUF_WRITER_GET_CLASS (self)->finalize (self); #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala" g_type_free_instance ((GTypeInstance *) self); -#line 4892 "page.c" +#line 4841 "page.c" } } |