← Back to branch summary

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

« back to all changes in this revision

Viewing changes to coders/sct.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:
coders/sct.c
17
17
%                                 July 1992                                   %
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  %
42
42
#include "magick/studio.h"
43
43
#include "magick/blob.h"
44
44
#include "magick/blob-private.h"
 
45
#include "magick/cache.h"
45
46
#include "magick/exception.h"
46
47
#include "magick/exception-private.h"
47
48
#include "magick/image.h"
223
224
      (void) CloseBlob(image);
224
225
      return(GetFirstImageInList(image));
225
226
    }
226
 
  if (SetImageExtent(image,0,0) == MagickFalse)
227
 
    {
228
 
      InheritException(exception,&image->exception);
229
 
      return(DestroyImageList(image));
230
 
    }
231
227
  /*
232
228
    Convert SCT raster image to pixel packets.
233
229
  */
235
231
  {
236
232
    for (i=0; i < (long) separations; i++)
237
233
    {
238
 
      q=GetImagePixels(image,0,y,image->columns,1);
 
234
      q=GetAuthenticPixels(image,0,y,image->columns,1,exception);
239
235
      if (q == (PixelPacket *) NULL)
240
236
        break;
241
 
      indexes=GetIndexes(image);
 
237
      indexes=GetAuthenticIndexQueue(image);
242
238
      for (x=0; x < (long) image->columns; x++)
243
239
      {
244
240
        pixel=(Quantum) ScaleCharToQuantum((unsigned char) ReadBlobByte(image));
272
268
        }
273
269
        q++;
274
270
      }
275
 
      if (SyncImagePixels(image) == MagickFalse)
 
271
      if (SyncAuthenticPixels(image,exception) == MagickFalse)
276
272
        break;
277
273
      if ((image->columns % 2) != 0)
278
274
        (void) ReadBlobByte(image);  /* pad */