← Back to branch summary

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

« back to all changes in this revision

Viewing changes to wand/stream.c

  • Committer: Bazaar Package Importer
  • Author(s): Nelson A. de Oliveira
  • Date: 2010-06-20 19:59:55 UTC
  • mfrom: (6.2.8 sid)
  • Revision ID: james.westby@ubuntu.com-20100620195955-n3eq0yenhycw888i
Tags: 7:6.6.2.6-1
http://bugs.debian.org/579775
http://bugs.debian.org/582073
http://bugs.debian.org/583024
* New upstream release;
* Change Recommends on ufraw to ufraw-batch (Closes: #579775);
* Fix FTBFS when using dash to run the configure script, by setting
  CONFIG_SHELL=/bin/bash (Closes: #582073, #583024). Thank you, Niko Tyni!

Show diffs side-by-side

added added

removed removed

Lines of Context:
wand/stream.c
17
17
%                              July 1992                                      %
18
18
%                                                                             %
19
19
%                                                                             %
20
 
%  Copyright 1999-2009 ImageMagick Studio LLC, a non-profit organization      %
 
20
%  Copyright 1999-2010 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  %
135
135
      (char *) NULL
136
136
    };
137
137
 
138
 
  (void) printf("Version: %s\n",GetMagickVersion((unsigned long *) NULL));
 
138
  (void) printf("Version: %s\n",GetMagickVersion((size_t *) NULL));
139
139
  (void) printf("Copyright: %s\n",GetMagickCopyright());
140
140
  (void) printf("Features: %s\n\n",GetMagickFeatures());
141
141
  (void) printf("Usage: %s [options ...] input-image raw-image\n",
165
165
{ \
166
166
  DestroyImageStack(); \
167
167
  stream_info=DestroyStreamInfo(stream_info); \
168
 
  for (i=0; i < (long) argc; i++) \
 
168
  for (i=0; i < (ssize_t) argc; i++) \
169
169
    argv[i]=DestroyString(argv[i]); \
170
170
  argv=(char **) RelinquishMagickMemory(argv); \
171
171
}
197
197
  ImageStack
198
198
    image_stack[MaxImageStackDepth+1];
199
199
 
200
 
  long
 
200
  ssize_t
201
201
    j,
202
202
    k;
203
203
 
208
208
  MagickStatusType
209
209
    status;
210
210
 
211
 
  register long
 
211
  register ssize_t
212
212
    i;
213
213
 
214
214
  StreamInfo
230
230
          (LocaleCompare("-version",option+1) == 0))
231
231
        {
232
232
          (void) fprintf(stdout,"Version: %s\n",
233
 
            GetMagickVersion((unsigned long *) NULL));
 
233
            GetMagickVersion((size_t *) NULL));
234
234
          (void) fprintf(stdout,"Copyright: %s\n",GetMagickCopyright());
235
235
          (void) fprintf(stdout,"Features: %s\n\n",GetMagickFeatures());
236
236
          return(MagickFalse);
237
237
        }
238
238
    }
239
239
  if (argc < 3)
240
 
    {
241
 
      (void) StreamUsage();
242
 
      return(MagickTrue);
243
 
    }
 
240
    return(StreamUsage());
244
241
  format="%w,%h,%m";
245
242
  j=1;
246
243
  k=0;
263
260
      DestroyStream();
264
261
      return(MagickFalse);
265
262
    }
266
 
  for (i=1; i < (long) (argc-1); i++)
 
263
  for (i=1; i < (ssize_t) (argc-1); i++)
267
264
  {
268
265
    option=argv[i];
269
266
    if (LocaleCompare(option,"(") == 0)
292
289
        */
293
290
        FireImageStack(MagickFalse,MagickFalse,pend);
294
291
        filename=argv[i];
295
 
        if ((LocaleCompare(filename,"--") == 0) && (i < (argc-1)))
 
292
        if ((LocaleCompare(filename,"--") == 0) && (i < (ssize_t) (argc-1)))
296
293
          filename=argv[++i];
297
294
        (void) CopyMagickString(image_info->filename,filename,MaxTextExtent);
298
295
        images=StreamImage(image_info,stream_info,exception);
313
310
            if (*option == '+')
314
311
              break;
315
312
            i++;
316
 
            if (i == (long) (argc-1))
 
313
            if (i == (ssize_t) (argc-1))
317
314
              ThrowStreamException(OptionError,"MissingArgument",option);
318
315
            break;
319
316
          }
326
323
            if (*option == '+')
327
324
              break;
328
325
            i++;
329
 
            if (i == (long) argc)
 
326
            if (i == (ssize_t) argc)
330
327
              ThrowStreamException(OptionError,"MissingArgument",option);
331
328
            if (IsGeometry(argv[i]) == MagickFalse)
332
329
              ThrowStreamInvalidArgumentException(option,argv[i]);
334
331
          }
335
332
        if (LocaleCompare("channel",option+1) == 0)
336
333
          {
337
 
            long
 
334
            ssize_t
338
335
              channel;
339
336
 
340
337
            if (*option == '+')
341
338
              break;
342
339
            i++;
343
 
            if (i == (long) (argc-1))
 
340
            if (i == (ssize_t) (argc-1))
344
341
              ThrowStreamException(OptionError,"MissingArgument",option);
345
342
            channel=ParseChannelOption(argv[i]);
346
343
            if (channel < 0)
350
347
          }
351
348
        if (LocaleCompare("colorspace",option+1) == 0)
352
349
          {
353
 
            long
 
350
            ssize_t
354
351
              colorspace;
355
352
 
356
353
            if (*option == '+')
357
354
              break;
358
355
            i++;
359
 
            if (i == (long) (argc-1))
 
356
            if (i == (ssize_t) (argc-1))
360
357
              ThrowStreamException(OptionError,"MissingArgument",option);
361
358
            colorspace=ParseMagickOption(MagickColorspaceOptions,MagickFalse,
362
359
              argv[i]);
367
364
          }
368
365
        if (LocaleCompare("compress",option+1) == 0)
369
366
          {
370
 
            long
 
367
            ssize_t
371
368
              compress;
372
369
 
373
370
            if (*option == '+')
374
371
              break;
375
372
            i++;
376
 
            if (i == (long) (argc-1))
 
373
            if (i == (ssize_t) (argc-1))
377
374
              ThrowStreamException(OptionError,"MissingArgument",option);
378
375
            compress=ParseMagickOption(MagickCompressOptions,MagickFalse,
379
376
              argv[i]);
390
387
      {
391
388
        if (LocaleCompare("debug",option+1) == 0)
392
389
          {
393
 
            long
 
390
            ssize_t
394
391
              event;
395
392
 
396
393
            if (*option == '+')
397
394
              break;
398
395
            i++;
399
 
            if (i == (long) argc)
 
396
            if (i == (ssize_t) argc)
400
397
              ThrowStreamException(OptionError,"MissingArgument",option);
401
398
            event=ParseMagickOption(MagickLogEventOptions,MagickFalse,argv[i]);
402
399
            if (event < 0)
407
404
        if (LocaleCompare("define",option+1) == 0)
408
405
          {
409
406
            i++;
410
 
            if (i == (long) argc)
 
407
            if (i == (ssize_t) argc)
411
408
              ThrowStreamException(OptionError,"MissingArgument",option);
412
409
            if (*option == '+')
413
410
              {
426
423
            if (*option == '+')
427
424
              break;
428
425
            i++;
429
 
            if (i == (long) argc)
 
426
            if (i == (ssize_t) argc)
430
427
              ThrowStreamException(OptionError,"MissingArgument",option);
431
428
            if (IsGeometry(argv[i]) == MagickFalse)
432
429
              ThrowStreamInvalidArgumentException(option,argv[i]);
437
434
            if (*option == '+')
438
435
              break;
439
436
            i++;
440
 
            if (i == (long) argc)
 
437
            if (i == (ssize_t) argc)
441
438
              ThrowStreamException(OptionError,"MissingArgument",option);
442
439
            if (IsGeometry(argv[i]) == MagickFalse)
443
440
              ThrowStreamInvalidArgumentException(option,argv[i]);
448
445
            if (*option == '+')
449
446
              break;
450
447
            i++;
451
 
            if (i == (long) (argc-1))
 
448
            if (i == (ssize_t) (argc-1))
452
449
              ThrowStreamException(OptionError,"MissingArgument",option);
453
450
            if (IsGeometry(argv[i]) == MagickFalse)
454
451
              ThrowStreamInvalidArgumentException(option,argv[i]);
463
460
            if (*option == '+')
464
461
              break;
465
462
            i++;
466
 
            if (i == (long) (argc-1))
 
463
            if (i == (ssize_t) (argc-1))
467
464
              ThrowStreamException(OptionError,"MissingArgument",option);
468
465
            if (IsGeometry(argv[i]) == MagickFalse)
469
466
              ThrowStreamInvalidArgumentException(option,argv[i]);
484
481
          break;
485
482
        if (LocaleCompare("interlace",option+1) == 0)
486
483
          {
487
 
            long
 
484
            ssize_t
488
485
              interlace;
489
486
 
490
487
            if (*option == '+')
491
488
              break;
492
489
            i++;
493
 
            if (i == (long) argc)
 
490
            if (i == (ssize_t) argc)
494
491
              ThrowStreamException(OptionError,"MissingArgument",option);
495
492
            interlace=ParseMagickOption(MagickInterlaceOptions,MagickFalse,
496
493
              argv[i]);
501
498
          }
502
499
        if (LocaleCompare("interpolate",option+1) == 0)
503
500
          {
504
 
            long
 
501
            ssize_t
505
502
              interpolate;
506
503
 
507
504
            if (*option == '+')
508
505
              break;
509
506
            i++;
510
 
            if (i == (long) argc)
 
507
            if (i == (ssize_t) argc)
511
508
              ThrowStreamException(OptionError,"MissingArgument",option);
512
509
            interpolate=ParseMagickOption(MagickInterpolateOptions,MagickFalse,
513
510
              argv[i]);
528
525
            double
529
526
              value;
530
527
 
531
 
            long
 
528
            ssize_t
532
529
              resource;
533
530
 
534
531
            if (*option == '+')
535
532
              break;
536
533
            i++;
537
 
            if (i == (long) argc)
 
534
            if (i == (ssize_t) argc)
538
535
              ThrowStreamException(OptionError,"MissingArgument",option);
539
536
            resource=ParseMagickOption(MagickResourceOptions,MagickFalse,
540
537
              argv[i]);
542
539
              ThrowStreamException(OptionError,"UnrecognizedResourceType",
543
540
                argv[i]);
544
541
            i++;
545
 
            if (i == (long) argc)
 
542
            if (i == (ssize_t) argc)
546
543
              ThrowStreamException(OptionError,"MissingArgument",option);
547
544
            value=strtod(argv[i],&p);
548
545
            if ((p == argv[i]) && (LocaleCompare("unlimited",argv[i]) != 0))
551
548
          }
552
549
        if (LocaleCompare("list",option+1) == 0)
553
550
          {
554
 
            long
 
551
            ssize_t
555
552
              list;
556
553
 
557
554
            if (*option == '+')
558
555
              break;
559
556
            i++;
560
 
            if (i == (long) argc)
 
557
            if (i == (ssize_t) argc)
561
558
              ThrowStreamException(OptionError,"MissingArgument",option);
562
559
            list=ParseMagickOption(MagickListOptions,MagickFalse,argv[i]);
563
560
            if (list < 0)
564
561
              ThrowStreamException(OptionError,"UnrecognizedListType",argv[i]);
565
 
            (void) MogrifyImageInfo(image_info,(int) (i-j+1),(const char **)
 
562
            status=MogrifyImageInfo(image_info,(int) (i-j+1),(const char **)
566
563
              argv+j,exception);
567
564
            DestroyStream();
568
 
            return(MagickTrue);
 
565
            return(status != 0 ? MagickFalse : MagickTrue);
569
566
          }
570
567
        if (LocaleCompare("log",option+1) == 0)
571
568
          {
572
569
            if (*option == '+')
573
570
              break;
574
571
            i++;
575
 
            if ((i == (long) argc) || (strchr(argv[i],'%') == (char *) NULL))
 
572
            if ((i == (ssize_t) argc) || (strchr(argv[i],'%') == (char *) NULL))
576
573
              ThrowStreamException(OptionError,"MissingArgument",option);
577
574
            break;
578
575
          }
597
594
      {
598
595
        if (LocaleCompare("quantize",option+1) == 0)
599
596
          {
600
 
            long
 
597
            ssize_t
601
598
              colorspace;
602
599
 
603
600
            if (*option == '+')
604
601
              break;
605
602
            i++;
606
 
            if (i == (long) (argc-1))
 
603
            if (i == (ssize_t) (argc-1))
607
604
              ThrowStreamException(OptionError,"MissingArgument",option);
608
605
            colorspace=ParseMagickOption(MagickColorspaceOptions,
609
606
              MagickFalse,argv[i]);
634
631
            if (*option == '+')
635
632
              break;
636
633
            i++;
637
 
            if (i == (long) argc)
 
634
            if (i == (ssize_t) argc)
638
635
              ThrowStreamException(OptionError,"MissingArgument",option);
639
636
            if (IsGeometry(argv[i]) == MagickFalse)
640
637
              ThrowStreamInvalidArgumentException(option,argv[i]);
645
642
            if (*option == '+')
646
643
              break;
647
644
            i++;
648
 
            if (i == (long) (argc-1))
 
645
            if (i == (ssize_t) (argc-1))
649
646
              ThrowStreamException(OptionError,"MissingArgument",option);
650
647
            if (IsGeometry(argv[i]) == MagickFalse)
651
648
              ThrowStreamInvalidArgumentException(option,argv[i]);
654
651
        if (LocaleCompare("set",option+1) == 0)
655
652
          {
656
653
            i++;
657
 
            if (i == (long) argc)
 
654
            if (i == (ssize_t) argc)
658
655
              ThrowStreamException(OptionError,"MissingArgument",option);
659
656
            if (*option == '+')
660
657
              break;
661
658
            i++;
662
 
            if (i == (long) argc)
 
659
            if (i == (ssize_t) argc)
663
660
              ThrowStreamException(OptionError,"MissingArgument",option);
664
661
            break;
665
662
          }
668
665
            if (*option == '+')
669
666
              break;
670
667
            i++;
671
 
            if (i == (long) argc)
 
668
            if (i == (ssize_t) argc)
672
669
              ThrowStreamException(OptionError,"MissingArgument",option);
673
670
            if (IsGeometry(argv[i]) == MagickFalse)
674
671
              ThrowStreamInvalidArgumentException(option,argv[i]);
676
673
          }
677
674
        if (LocaleCompare("storage-type",option+1) == 0)
678
675
          {
679
 
            long
 
676
            ssize_t
680
677
              type;
681
678
 
682
679
            if (*option == '+')
683
680
              break;
684
681
            i++;
685
 
            if (i == (long) (argc-1))
 
682
            if (i == (ssize_t) (argc-1))
686
683
              ThrowStreamException(OptionError,"MissingArgument",option);
687
684
            type=ParseMagickOption(MagickStorageOptions,MagickFalse,argv[i]);
688
685
            if (type < 0)
700
697
            if (*option == '+')
701
698
              break;
702
699
            i++;
703
 
            if (i == (long) (argc-1))
 
700
            if (i == (ssize_t) (argc-1))
704
701
              ThrowStreamException(OptionError,"MissingArgument",option);
705
702
            break;
706
703
          }
714
711
            (LocaleCompare("-version",option+1) == 0))
715
712
          {
716
713
            (void) fprintf(stdout,"Version: %s\n",
717
 
              GetMagickVersion((unsigned long *) NULL));
 
714
              GetMagickVersion((size_t *) NULL));
718
715
            (void) fprintf(stdout,"Copyright: %s\n",GetMagickCopyright());
719
716
            (void) fprintf(stdout,"Features: %s\n\n",GetMagickFeatures());
720
717
            break;
721
718
          }
722
719
        if (LocaleCompare("virtual-pixel",option+1) == 0)
723
720
          {
724
 
            long
 
721
            ssize_t
725
722
              method;
726
723
 
727
724
            if (*option == '+')
728
725
              break;
729
726
            i++;
730
 
            if (i == (long) (argc-1))
 
727
            if (i == (ssize_t) (argc-1))
731
728
              ThrowStreamException(OptionError,"MissingArgument",option);
732
729
            method=ParseMagickOption(MagickVirtualPixelOptions,MagickFalse,
733
730
              argv[i]);
750
747
  }
751
748
  if (k != 0)
752
749
    ThrowStreamException(OptionError,"UnbalancedParenthesis",argv[i]);
753
 
  if (i-- != (long) (argc-1))
 
750
  if (i-- != (ssize_t) (argc-1))
754
751
    ThrowStreamException(OptionError,"MissingAnImageFilename",argv[i]);
755
752
  if (image == (Image *) NULL)
756
753
    ThrowStreamException(OptionError,"MissingAnImageFilename",argv[i]);