← Back to branch summary

~ubuntu-branches/ubuntu/precise/clutter-1.0/precise

« back to all changes in this revision

Viewing changes to tests/interactive/test-cogl-tex-getset.c

  • Committer: Bazaar Package Importer
  • Author(s): Emilio Pozuelo Monfort
  • Date: 2010-03-21 13:27:56 UTC
  • mto: (2.1.3 experimental) (1.3.1 upstream)
  • mto: This revision was merged to the branch mainline in revision 8.
  • Revision ID: james.westby@ubuntu.com-20100321132756-nf8yd30yxo3zzwcm
Tags: upstream-1.2.2
Import upstream version 1.2.2

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/interactive/test-cogl-tex-getset.c
126
126
  guchar          *data;
127
127
  gint             x,y,t;
128
128
  guchar          *pixel;
 
129
  gchar           *file;
129
130
  
130
131
  self->priv = priv = TEST_COGLBOX_GET_PRIVATE(self);
131
132
  
132
133
  /* Load image from file */
133
 
  
 
134
  file = g_build_filename (TESTS_DATADIR, "redhand.png", NULL);
134
135
  priv->cogl_tex_id[0] =
135
 
    cogl_texture_new_from_file ("redhand.png",
 
136
    cogl_texture_new_from_file (file,
136
137
                                COGL_TEXTURE_NONE,
137
 
                                COGL_PIXEL_FORMAT_ANY, NULL);
 
138
                                COGL_PIXEL_FORMAT_ANY,
 
139
                                NULL);
138
140
  
139
141
  if (priv->cogl_tex_id[0] == COGL_INVALID_HANDLE)
140
142
    {
141
143
      printf ("Failed loading redhand.png image!\n");
142
144
      return;
143
145
    }
144
 
  
 
146
 
 
147
  g_free (file);
 
148
 
145
149
  printf("Texture loaded from file.\n");
146
150
  
147
151
  /* Obtain pixel data */