← Back to branch summary

~ubuntu-branches/ubuntu/intrepid/gimp/intrepid-updates

« back to all changes in this revision

Viewing changes to libgimpcolor/gimpadaptivesupersample.c

  • Committer: Bazaar Package Importer
  • Author(s): Steve Kowalik
  • Date: 2007-11-21 17:39:07 UTC
  • mfrom: (1.1.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20071121173907-od54p9hdtvn5frl0
Tags: 2.4.1-1ubuntu1
* Merge from Debian unstable.
* Remaining Ubuntu changes:
  - 02_help-message.patch, 03_gimp.desktop.in.in.patch: Distro changes.
  - Weave i18n magic in the rules file.
  - Munge Maintainer field as per spec.
* Ubuntu changes dropped:
  - Apply patch from upstream (SVN r23659) that corrects the image
    disappearing for large images at 150% zoom.
  - Symlink doc directories to avoid duplicate files, CDBS does this for
    us.

Show diffs side-by-side

added added

removed removed

Lines of Context:
libgimpcolor/gimpadaptivesupersample.c
253
253
  GimpSampleType **block;                       /* Sample block matrix */
254
254
  gulong           num_samples;
255
255
 
 
256
  g_return_val_if_fail (render_func != NULL, 0);
 
257
  g_return_val_if_fail (put_pixel_func != NULL, 0);
 
258
 
256
259
  /* Initialize color */
257
260
 
258
261
  gimp_rgba_set (&color, 0.0, 0.0, 0.0, 0.0);