← Back to branch summary

~ubuntu-branches/ubuntu/vivid/nip2/vivid-proposed

« back to all changes in this revision

Viewing changes to src/imagepresent.c

  • Committer: Bazaar Package Importer
  • Author(s): Michael Terry
  • Date: 2009-05-12 09:26:46 UTC
  • mfrom: (1.2.11 upstream) (2.1.4 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090512092646-j8lb1w2x69pvgma4
Tags: 7.18.1-1ubuntu1
https://launchpad.net/bugs/375435
* Merge from debian unstable (LP: #375435), remaining changes:
  - debian/control: Also Recommend abrowser

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/imagepresent.c
106
106
 
107
107
        /* Child views should all have removed themselves.
108
108
         */
109
 
        assert( ip->regionviews == NULL );
 
109
        g_assert( ip->regionviews == NULL );
110
110
}
111
111
 
112
112
static void
1027
1027
                        /* Make a new region.
1028
1028
                         */
1029
1029
                        char txt[MAX_STRSIZE];
1030
 
                        BufInfo buf;
 
1030
                        VipsBuf buf;
1031
1031
                        Symbol *sym;
1032
1032
 
1033
1033
                        /* In compatibility mode, we need to un-offset, since
1041
1041
                                ip->floating.top -= im->Yoffset;
1042
1042
                        }
1043
1043
 
1044
 
                        buf_init_static( &buf, txt, MAX_STRSIZE );
 
1044
                        vips_buf_init_static( &buf, txt, MAX_STRSIZE );
1045
1045
 
1046
1046
                        switch( ip->regionview->type ) {
1047
1047
                        case REGIONVIEW_MARK:
1049
1049
                                 * "Point".
1050
1050
                                 */
1051
1051
                                if( row->ws->compat_78 )
1052
 
                                        buf_appends( &buf, "Point " );
 
1052
                                        vips_buf_appends( &buf, "Point " );
1053
1053
                                else
1054
 
                                        buf_appendf( &buf, "%s ", CLASS_MARK );
 
1054
                                        vips_buf_appendf( &buf, "%s ", CLASS_MARK );
1055
1055
 
1056
1056
                                row_qualified_name( row, &buf );
1057
 
                                buf_appendd( &buf, ip->floating.left );
1058
 
                                buf_appendd( &buf, ip->floating.top );
 
1057
                                vips_buf_appendd( &buf, ip->floating.left );
 
1058
                                vips_buf_appendd( &buf, ip->floating.top );
1059
1059
                                break;
1060
1060
 
1061
1061
                        case REGIONVIEW_REGION:
1062
 
                                buf_appendf( &buf, "%s ", CLASS_REGION );
 
1062
                                vips_buf_appendf( &buf, "%s ", CLASS_REGION );
1063
1063
                                row_qualified_name( row, &buf );
1064
 
                                buf_appendd( &buf, ip->floating.left );
1065
 
                                buf_appendd( &buf, ip->floating.top );
1066
 
                                buf_appendd( &buf, ip->floating.width );
1067
 
                                buf_appendd( &buf, ip->floating.height );
 
1064
                                vips_buf_appendd( &buf, ip->floating.left );
 
1065
                                vips_buf_appendd( &buf, ip->floating.top );
 
1066
                                vips_buf_appendd( &buf, ip->floating.width );
 
1067
                                vips_buf_appendd( &buf, ip->floating.height );
1068
1068
                                break;
1069
1069
 
1070
1070
                        case REGIONVIEW_ARROW:
1071
 
                                buf_appendf( &buf, "%s ", CLASS_ARROW );
 
1071
                                vips_buf_appendf( &buf, "%s ", CLASS_ARROW );
1072
1072
                                row_qualified_name( row, &buf );
1073
 
                                buf_appendd( &buf, ip->floating.left );
1074
 
                                buf_appendd( &buf, ip->floating.top );
1075
 
                                buf_appendd( &buf, ip->floating.width );
1076
 
                                buf_appendd( &buf, ip->floating.height );
 
1073
                                vips_buf_appendd( &buf, ip->floating.left );
 
1074
                                vips_buf_appendd( &buf, ip->floating.top );
 
1075
                                vips_buf_appendd( &buf, ip->floating.width );
 
1076
                                vips_buf_appendd( &buf, ip->floating.height );
1077
1077
                                break;
1078
1078
 
1079
1079
                        case REGIONVIEW_HGUIDE:
1080
 
                                buf_appendf( &buf, "%s ", CLASS_HGUIDE );
 
1080
                                vips_buf_appendf( &buf, "%s ", CLASS_HGUIDE );
1081
1081
                                row_qualified_name( row, &buf );
1082
 
                                buf_appendd( &buf, ip->floating.top );
 
1082
                                vips_buf_appendd( &buf, ip->floating.top );
1083
1083
                                break;
1084
1084
 
1085
1085
                        case REGIONVIEW_VGUIDE:
1086
 
                                buf_appendf( &buf, "%s ", CLASS_VGUIDE );
 
1086
                                vips_buf_appendf( &buf, "%s ", CLASS_VGUIDE );
1087
1087
                                row_qualified_name( row, &buf );
1088
 
                                buf_appendd( &buf, ip->floating.left );
 
1088
                                vips_buf_appendd( &buf, ip->floating.left );
1089
1089
                                break;
1090
1090
 
1091
1091
                        default:
1092
 
                                assert( FALSE );
 
1092
                                g_assert( FALSE );
1093
1093
                        }
1094
1094
 
1095
1095
                        DESTROY_GTK( ip->regionview );
1096
1096
 
1097
1097
                        if( !(sym = workspace_add_def( row->ws, 
1098
 
                                buf_all( &buf ) )) ) 
 
1098
                                vips_buf_all( &buf ) )) ) 
1099
1099
                                box_alert( GTK_WIDGET( ip ) );
1100
1100
 
1101
1101
                        workspace_deselect_all( row->ws );
1525
1525
                GTK_SIGNAL_FUNC( imagepresent_scroll_event_cb ), ip );
1526
1526
 
1527
1527
        port = gtk_bin_get_child( GTK_BIN( ip->swin ) );
1528
 
        assert( GTK_IS_VIEWPORT( port ) );
 
1528
        g_assert( GTK_IS_VIEWPORT( port ) );
1529
1529
        gtk_signal_connect( GTK_OBJECT( ip->hadj ), "changed",
1530
1530
                GTK_SIGNAL_FUNC( imagepresent_hadj_changed_cb ), ip );
1531
1531
        gtk_signal_connect( GTK_OBJECT( ip->hadj ), "value_changed",