← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/imagemagick/oneiric-updates

« back to all changes in this revision

Viewing changes to magick/splay-tree.h

  • Committer: Bazaar Package Importer
  • Author(s): Colin Watson
  • Date: 2011-06-15 11:05:28 UTC
  • mfrom: (6.2.11 sid)
  • Revision ID: james.westby@ubuntu.com-20110615110528-08jgo07a4846xh8d
Tags: 8:6.6.0.4-3ubuntu1
https://launchpad.net/bugs/797595
* Resynchronise with Debian (LP: #797595).  Remaining changes:
  - Make ufraw-batch (universe) a suggestion instead of a recommendation.
  - Make debian/rules install target depend on check; they cannot reliably
    be run in parallel.
  - Don't set MAKEFLAGS in debian/rules; just pass it to the build.

Show diffs side-by-side

added added

removed removed

Lines of Context:
magick/splay-tree.h
30
30
  DeleteNodeByValueFromSplayTree(SplayTreeInfo *,const void *),
31
31
  DeleteNodeFromSplayTree(SplayTreeInfo *,const void *);
32
32
 
33
 
extern MagickExport const void
34
 
  *GetNextKeyInSplayTree(SplayTreeInfo *),
35
 
  *GetNextValueInSplayTree(SplayTreeInfo *),
36
 
  *GetValueFromSplayTree(SplayTreeInfo *,const void *);
37
 
 
38
33
extern MagickExport int
39
34
  CompareSplayTreeString(const void *,const void *),
40
35
  CompareSplayTreeStringInfo(const void *,const void *);
45
40
  *NewSplayTree(int (*)(const void *,const void *),void *(*)(void *),
46
41
    void *(*)(void *));
47
42
 
48
 
extern MagickExport size_t
 
43
extern MagickExport unsigned long
49
44
  GetNumberOfNodesInSplayTree(const SplayTreeInfo *);
50
45
 
51
46
extern MagickExport void
 
47
  *GetNextKeyInSplayTree(SplayTreeInfo *),
 
48
  *GetNextValueInSplayTree(SplayTreeInfo *),
 
49
  *GetValueFromSplayTree(SplayTreeInfo *,const void *),
52
50
  *RemoveNodeByValueFromSplayTree(SplayTreeInfo *,const void *),
53
51
  *RemoveNodeFromSplayTree(SplayTreeInfo *,const void *),
54
52
  ResetSplayTree(SplayTreeInfo *),