← Back to branch summary

~ubuntu-branches/ubuntu/vivid/clutter-1.0/vivid-proposed

« back to all changes in this revision

Viewing changes to tests/conform/texture.c

  • Committer: Package Import Robot
  • Author(s): Emilio Pozuelo Monfort
  • Date: 2014-03-26 11:51:28 UTC
  • mfrom: (1.5.1) (4.1.30 experimental)
  • Revision ID: package-import@ubuntu.com-20140326115128-timmbsde8734o6wz
Tags: 1.18.0-1
* New upstream release.
* debian/control.in:
  + Bump gtk-doc-tools build dependency.
  + Also break libcogl15.
  + Standards-Version is 3.9.5, no changes needed.
* debian/libclutter-1.0-0.symbols:
  + Drop a few symbols that were accidentally exported in the DSO because
    they had a clutter_ prefix but were not in the public headers.
  + Add one new symbol.
  + Drop unnecessary debian revisions from some symbols.
* debian/control.in,
  debian/rules,
  debian/libclutter-1.0-0.symbols:
  + Temporarily disable evdev input support. It was only enabled in 1.17.6-1
    in experimental and there is nothing using it yet, and I would like to
    wait a bit before uploading libinput to unstable as the ABI isn't stable
    yet.
* d/p/0001-wayland-Add-missing-CLUTTER_AVAILABLE-annotations.patch:
  + Add missing annotations so that a few symbols are exported in the DSO.

* Upload to unstable.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/conform/texture.c
1
 
#include <glib.h>
 
1
#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
2
2
#include <clutter/clutter.h>
3
3
#include <string.h>
4
4
 
5
 
#include "test-conform-common.h"
6
 
 
7
5
static CoglHandle
8
6
make_texture (void)
9
7
{
28
26
                                     (guchar *)data);
29
27
}
30
28
 
31
 
void
32
 
texture_pick_with_alpha (TestConformSimpleFixture *fixture,
33
 
                         gconstpointer data)
 
29
static void
 
30
texture_pick_with_alpha (void)
34
31
{
35
32
  ClutterTexture *tex = CLUTTER_TEXTURE (clutter_texture_new ());
36
 
  ClutterStage *stage = CLUTTER_STAGE (clutter_stage_new ());
 
33
  ClutterStage *stage = CLUTTER_STAGE (clutter_test_get_stage ());
37
34
  ClutterActor *actor;
38
35
 
39
36
  clutter_texture_set_cogl_texture (tex, make_texture ());
40
37
 
41
 
  clutter_container_add_actor (CLUTTER_CONTAINER (stage), CLUTTER_ACTOR (tex));
 
38
  clutter_actor_add_child (CLUTTER_ACTOR (stage), CLUTTER_ACTOR (tex));
42
39
 
43
40
  clutter_actor_show (CLUTTER_ACTOR (stage));
44
41
 
80
77
  if (g_test_verbose ())
81
78
    g_print ("actor @ (10, 10) = %p\n", actor);
82
79
  g_assert (actor == CLUTTER_ACTOR (tex));
83
 
 
84
 
  clutter_actor_destroy (CLUTTER_ACTOR (stage));
85
 
 
86
 
  if (g_test_verbose ())
87
 
    g_print ("OK\n");
88
80
}
89
81
 
 
82
CLUTTER_TEST_SUITE (
 
83
  CLUTTER_TEST_UNIT ("/texture/pick-with-alpha", texture_pick_with_alpha)
 
84
)