~ubuntu-branches/ubuntu/quantal/imagemagick/quantal

« back to all changes in this revision

Viewing changes to coders/mpeg.c

  • Committer: Bazaar Package Importer
  • Author(s): Muharem Hrnjadovic
  • Date: 2009-06-04 13:01:13 UTC
  • mfrom: (1.1.5 upstream) (6.1.1 sid)
  • Revision ID: james.westby@ubuntu.com-20090604130113-my9114jxmafpwew3
Tags: 7:6.5.1.0-1.1ubuntu1
* Merge from debian unstable, remaining changes:
  - (Build-)depend on libltdl7-dev instead of libltdl3-dev (the armel buildds
    currently have both available).
  - Don't build-dep on librsvg, it brings in excessive dependencies

Show diffs side-by-side

added added

removed removed

Lines of Context:
17
17
%                                 July 1999                                   %
18
18
%                                                                             %
19
19
%                                                                             %
20
 
%  Copyright 1999-2008 ImageMagick Studio LLC, a non-profit organization      %
 
20
%  Copyright 1999-2009 ImageMagick Studio LLC, a non-profit organization      %
21
21
%  dedicated to making software imaging solutions freely available.           %
22
22
%                                                                             %
23
23
%  You may not use this file except in compliance with the License.  You may  %
415
415
    }
416
416
  quantum=(size_t) MagickMaxBufferExtent;
417
417
  if ((fstat(source_file,&attributes) == 0) && (attributes.st_size != 0))
418
 
    quantum=MagickMin((size_t) attributes.st_size,MagickMaxBufferExtent);
 
418
    quantum=(size_t) MagickMin((double) attributes.st_size,
 
419
      MagickMaxBufferExtent);
419
420
  buffer=(unsigned char *) AcquireQuantumMemory(quantum,sizeof(*buffer));
420
421
  if (buffer == (unsigned char *) NULL)
421
422
    {