~ubuntu-branches/ubuntu/feisty/gst-plugins-good0.10/feisty-security

« back to all changes in this revision

Viewing changes to ext/cairo/gsttimeoverlay.c

  • Committer: Bazaar Package Importer
  • Author(s): Sebastian Dröge
  • Date: 2006-12-21 21:12:15 UTC
  • mfrom: (1.1.5 upstream)
  • Revision ID: james.westby@ubuntu.com-20061221211215-3uukkusokhe0nk4f
Tags: 0.10.5-0ubuntu1
* Sync with pkg-gstreamer SVN:
  + debian/rules:
    - Use Ubuntu as distribution name and point to the proper Launchpad URL
  + debian/patches/01_esdsink-priority.patch:
    - Mark the esdsink with rank primary-2 to get
      pulse > alsadmix > esd > alsa > oss

Show diffs side-by-side

added added

removed removed

Lines of Context:
91
91
  cairo_set_font_size (font_cairo, 20);
92
92
  cairo_font_extents (font_cairo, &font_extents);
93
93
  timeoverlay->text_height = font_extents.height;
94
 
  GST_DEBUG_OBJECT (timeoverlay, "font height is %d", font_extents.height);
 
94
  GST_DEBUG_OBJECT (timeoverlay, "font height is %f", font_extents.height);
95
95
  cairo_destroy (font_cairo);
96
96
  font_cairo = NULL;
97
97
}
186
186
  int i, j;
187
187
  unsigned char *image;
188
188
  cairo_text_extents_t extents;
189
 
  gpointer dest, src;
 
189
  guint8 *dest, *src;
190
190
  cairo_surface_t *font_surface;
191
191
  cairo_t *text_cairo;
192
192
  GstFlowReturn ret = GST_FLOW_OK;