ImageMagick-6.9.3-1差分
ImageMagick-6.9.3-0差分 - yoyaのメモの続き
The latest release of ImageMagick is version 6.9.3-1
まとめ
- リソース制限にひっかかった時のメモリリークする不具合に修正
- identify -format %b *.jp2 で 0B の文字列が返る不具合を修正
差分
ChangeLog の分
- リソース制限にあたった時にも AcquireMagickResource に対応して RelinquishMagickResource を呼ぶようにした (メモリリーク修正)
- -format %b オプションで非ゼロを返す
ChangeLogにない差分
- ImageMagick.spec.in
22a23,24 > BuildRequires: jbigkit-devel > BuildRequires: openjpeg2-devel >= 2.1.0 153d151 < --with-lcms2 \ 159c157,160 < --without-dps --- > --without-dps \ > --without-gcc-arch \ > --with-jbig \ > --with-openjp2
- /Magick++/lib/Image.cpp
- Magick::Image::annotate でメモリリーク修正？
1931a1932 > drawInfo->text=DestroyString(drawInfo->text); 1933c1934 < drawInfo->geometry=0; --- > drawInfo->geometry=DestroyString(drawInfo->geometry); 1984,1985c1985,1986 < drawInfo->text=0; < drawInfo->geometry=0; --- > drawInfo->text=(char *) NULL; > drawInfo->geometry=(char *) NULL; 1998a2000 > drawInfo->text=DestroyString(drawInfo->text); 2005c2007 < drawInfo->text=0; --- > drawInfo->text=(char *) NULL;
- PerlMagick/Magick.xs
- Get の xmp 対応
> if (LocaleCompare(attribute,"xmp") == 0) > { > if (image != (Image *) NULL) > { > const StringInfo > *profile; > > profile=GetImageProfile(image,"xmp"); > if (profile != (StringInfo *) NULL) > s=newSVpv((const char *) GetStringInfoDatum(profile), > GetStringInfoLength(profile)); > } > PUSHs(s ? sv_2mortal(s) : &sv_undef); > continue; > }
- ImageMagick-6.9.3-1/PerlMagick/quantum/quantum.xs
- PerlMagick/Magick.xs と同様
- coders/fpx.c
- fxp:view 対応
243c247,250 < if (image_info->view == (char *) NULL) --- > option=image_info->view; > if (option == (const char *) NULL) > option=GetImageOption(image_info,"fpx:view"); > if (option == (const char *) NULL)
- coders/pict.c
- bytes_per_line の上限を倍にした。(意図的なのか間違えたのかは謎)
< count+=EncodeImage(image,scanline,bytes_per_line & 0x7FFF,
< packed_scanline);
---
> count+=EncodeImage(image,scanline,bytes_per_line,packed_scanline);
- coders/psd.c
- static MagickBooleanType ReadPSDChannelPixels の中身がごそっと変わってる。1
- /magick/memory.c
- CheckMemoryOverflow 関数を新規実装
> static MagickBooleanType CheckMemoryOverflow(const size_t count, > const size_t quantum)
- magick/statistic.c
- image=columns を length に入れず直で処理する
174,177c173 < length=image->columns; < if (length < number_images) < length=number_images; < pixels[i]=(MagickPixelPacket *) AcquireQuantumMemory(length, --- > pixels[i]=(MagickPixelPacket *) AcquireQuantumMemory(image->columns, 181c177 < for (j=0; j < (ssize_t) length; j++) --- > for (j=0; j < (ssize_t) image->columns; j++)
- magick/timer.c
- /CLOCKS_PER_SEC から sysconf(_SC_CLK_TCK) に変更
191c191 < #if defined(MAGICKCORE_HAVE_TIMES) --- > #if defined(MAGICKCORE_HAVE_TIMES) && defined(MAGICKCORE_HAVE_SYSCONF) 195c195 < return((double) times(&timer)/CLOCKS_PER_SEC); --- > return((double) times(&timer)/sysconf(_SC_CLK_TCK)); 445c445 < #if defined(MAGICKCORE_HAVE_TIMES) --- > #if defined(MAGICKCORE_HAVE_TIMES) && defined(MAGICKCORE_HAVE_SYSCONF) 450c450 < return((double) (timer.tms_utime+timer.tms_stime)/CLOCKS_PER_SEC); --- > return((double) (timer.tms_utime+timer.tms_stime)/sysconf(_SC_CLK_TCK));
ChangeLog
2016-01-17 6.9.3-1 Cristy <quetzlzacatenango@image...>
* New version 6.9.3-1, GIT revision 10488:e4f046e:20160116.
2016-01-06 6.9.3-1 Cristy <quetzlzacatenango@image...>
* Pair AcquireMagickResource with calls to RelinquishMagickResource when
resource limits are hit (reference
https://github.com/ImageMagick/ImageMagick/pull/75).
* Return non-zero for the -format %b option (reference
http://www.imagemagick.org/discourse-server/viewtopic.php?f=1&t=28969).
