← Back to branch summary

~ubuntu-branches/ubuntu/gutsy/imagemagick/gutsy

« back to all changes in this revision

Viewing changes to magick/memory_.h

  • Committer: Bazaar Package Importer
  • Author(s): Kees Cook
  • Date: 2007-10-02 14:15:13 UTC
  • Revision ID: james.westby@ubuntu.com-20071002141513-9b4x384fhd4rb8qo
Tags: 7:6.2.4.5.dfsg1-2ubuntu1
* Merge with Debian unstable for CVE fixes.  Remaining changes:
  - Magick++/lib/Geometry.cpp: build fix for g++-4.3.
  - debian/control: Ubuntu maintainer address.

Show diffs side-by-side

added added

removed removed

Lines of Context:
magick/memory_.h
24
24
 
25
25
extern MagickExport void
26
26
  *AcquireMagickMemory(const size_t),
 
27
  *AcquireQuantumMemory(const size_t,const size_t),
27
28
  *CopyMagickMemory(void *,const void *,const size_t),
28
29
  DestroyMagickMemory(void),
29
30
  *RelinquishMagickMemory(void *),
30
31
  *ResetMagickMemory(void *,int,const size_t),
31
 
  *ResizeMagickMemory(void *,const size_t);
 
32
  *ResizeMagickMemory(void *,const size_t),
 
33
  *ResizeQuantumMemory(void *,const size_t,const size_t);
32
34
 
33
35
#if defined(__cplusplus) || defined(c_plusplus)
34
36
}