Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 503692 | Differences between
and this patch

Collapse All | Expand All

(-)coders/jp2.c (-6 / +6 lines)
Lines 369-375 static Image *ReadJP2Image(const ImageIn Link Here
369
  if (opj_read_header(jp2_stream,jp2_codec,&jp2_image) == 0)
369
  if (opj_read_header(jp2_stream,jp2_codec,&jp2_image) == 0)
370
    {
370
    {
371
      opj_stream_set_user_data(jp2_stream,NULL);
371
      opj_stream_set_user_data(jp2_stream,NULL);
372
      opj_stream_destroy_v3(jp2_stream);
372
      opj_stream_destroy(jp2_stream);
373
      opj_destroy_codec(jp2_codec);
373
      opj_destroy_codec(jp2_codec);
374
      ThrowReaderException(DelegateError,"UnableToDecodeImageFile");
374
      ThrowReaderException(DelegateError,"UnableToDecodeImageFile");
375
    }
375
    }
Lines 384-390 static Image *ReadJP2Image(const ImageIn Link Here
384
      if (jp2_status == 0)
384
      if (jp2_status == 0)
385
        {
385
        {
386
          opj_stream_set_user_data(jp2_stream,NULL);
386
          opj_stream_set_user_data(jp2_stream,NULL);
387
          opj_stream_destroy_v3(jp2_stream);
387
          opj_stream_destroy(jp2_stream);
388
          opj_destroy_codec(jp2_codec);
388
          opj_destroy_codec(jp2_codec);
389
          opj_image_destroy(jp2_image);
389
          opj_image_destroy(jp2_image);
390
          ThrowReaderException(DelegateError,"UnableToDecodeImageFile");
390
          ThrowReaderException(DelegateError,"UnableToDecodeImageFile");
Lines 402-414 static Image *ReadJP2Image(const ImageIn Link Here
402
  if (jp2_status == 0)
402
  if (jp2_status == 0)
403
    {
403
    {
404
      opj_stream_set_user_data(jp2_stream,NULL);
404
      opj_stream_set_user_data(jp2_stream,NULL);
405
      opj_stream_destroy_v3(jp2_stream);
405
      opj_stream_destroy(jp2_stream);
406
      opj_destroy_codec(jp2_codec);
406
      opj_destroy_codec(jp2_codec);
407
      opj_image_destroy(jp2_image);
407
      opj_image_destroy(jp2_image);
408
      ThrowReaderException(DelegateError,"UnableToDecodeImageFile");
408
      ThrowReaderException(DelegateError,"UnableToDecodeImageFile");
409
    }
409
    }
410
  opj_stream_set_user_data(jp2_stream,NULL);
410
  opj_stream_set_user_data(jp2_stream,NULL);
411
  opj_stream_destroy_v3(jp2_stream);
411
  opj_stream_destroy(jp2_stream);
412
  for (i=0; i < (ssize_t) jp2_image->numcomps; i++)
412
  for (i=0; i < (ssize_t) jp2_image->numcomps; i++)
413
  {
413
  {
414
    if ((jp2_image->comps[i].dx == 0) || (jp2_image->comps[i].dy == 0))
414
    if ((jp2_image->comps[i].dx == 0) || (jp2_image->comps[i].dy == 0))
Lines 1057-1063 static MagickBooleanType WriteJP2Image(c Link Here
1057
      (opj_end_compress(jp2_codec,jp2_stream) == 0))
1057
      (opj_end_compress(jp2_codec,jp2_stream) == 0))
1058
    {
1058
    {
1059
      opj_stream_set_user_data(jp2_stream,NULL);
1059
      opj_stream_set_user_data(jp2_stream,NULL);
1060
      opj_stream_destroy_v3(jp2_stream);
1060
      opj_stream_destroy(jp2_stream);
1061
      opj_destroy_codec(jp2_codec);
1061
      opj_destroy_codec(jp2_codec);
1062
      opj_image_destroy(jp2_image);
1062
      opj_image_destroy(jp2_image);
1063
      ThrowWriterException(DelegateError,"UnableToEncodeImageFile");
1063
      ThrowWriterException(DelegateError,"UnableToEncodeImageFile");
Lines 1066-1072 static MagickBooleanType WriteJP2Image(c Link Here
1066
    Free resources.
1066
    Free resources.
1067
  */
1067
  */
1068
  opj_stream_set_user_data(jp2_stream,NULL);
1068
  opj_stream_set_user_data(jp2_stream,NULL);
1069
  opj_stream_destroy_v3(jp2_stream);
1069
  opj_stream_destroy(jp2_stream);
1070
  opj_destroy_codec(jp2_codec);
1070
  opj_destroy_codec(jp2_codec);
1071
  opj_image_destroy(jp2_image);
1071
  opj_image_destroy(jp2_image);
1072
  (void) CloseBlob(image);
1072
  (void) CloseBlob(image);

Return to bug 503692