ImageMagick-6.9.9-6差分

ImageMagick

ImageMagick-6.9.9-5差分 - yoyaのメモの続き

The latest release of ImageMagick is version 6.9.9-6

まとめ

  • PNG tIME チャンク修正。UTC タイムを入れるとこにローカルタイムを入れてた。
  • test 改善

差分

  • 可能な場合に、失敗した理由をテストログの中で示す
>   if (date == (const char *) NULL)
>     timestamp=GetImageProperty(image,"date:modify");
>   else
>     timestamp=date;
7938,7941c7948,7956
<   if (date != (const char *) NULL)
<     {
<       if (sscanf(date,"%d-%d-%dT%d:%d:%dZ",&year,&month,&day,&hour,&minute,
<           &second) != 6)
---
>   LogMagickEvent(CoderEvent,GetMagickModule(),
>       "  Writing tIME chunk: timestamp property is %30s\n",timestamp);
>   ret=sscanf(timestamp,"%d-%d-%dT%d:%d:%d",&year,&month,&day,&hour,
>       &minute, &second);
>   addhours=0;
>   addminutes=0;
>   ret=sscanf(timestamp,"%d-%d-%dT%d:%d:%d%d:%d",&year,&month,&day,&hour,
>       &minute, &second, &addhours, &addminutes);
>   if (ret < 6)
7944,7945c7959
<             CoderError,
<             "Invalid date format specified for png:tIME","`%s'",
---
>         CoderError, "Invalid date format specified for png:tIME","`%s'",
7952,7953c7966,7967
<       ptime.hour=(png_byte) hour;
<       ptime.minute=(png_byte) minute;
---
>   ptime.hour=(png_byte) hour+addhours;
>   ptime.minute=(png_byte) minute+addminutes;
7954a7969,7972
>   if (ptime.minute > 60)
>   {
>      ptime.hour++;
>      ptime.minute-=60;
7956c7974,7982
<   else
---
>   if (ptime.hour > 24)
>   {
>      ptime.day ++;
>      ptime.hour -=24;
>   }
>   /* To do: fix this for leap years */
>   if (ptime.day > 31 || (ptime.month == 2 && ptime.day > 28) ||
>       ((ptime.month == 4 || ptime.month == 6 || ptime.month == 9 ||
>       ptime.month == 11) && ptime.day > 30))
7958,7959c7984,7990
<     time(&ttime);
<     png_convert_from_time_t(&ptime,ttime);
---
>      ptime.month++;
>      ptime.day = 1;
>   }
>   if (ptime.month > 12)
>   {
>      ptime.year++;
>      ptime.month=1;
12453a12485,12486
>         {
>           jpeg_image_info=DestroyImageInfo(jpeg_image_info);
12454a12488
>         }
ChangeLogにない差分
954a955,956
>     if (length > GetBlobSize(image))
>       ThrowReaderException(CorruptImageError,"InsufficientImageDataInFile");
diff -rwb ImageMagick-6.9.9-5/coders/dds.c ImageMagick-6.9.9-6/coders/dds.c
1913a1914,1915
>       if (EOFBlob(image) != MagickFalse)
>         break;
＜同様のが沢山＞
  • coders/mat.c
973c973,977
<     if(MATLAB_HDR.DataType!=miMATRIX) continue;  /* skip another objects. */
---
>     if (MATLAB_HDR.DataType!=miMATRIX)
>       {
>         clone_info=DestroyImageInfo(clone_info);
>         continue;  /* skip another objects. */
>       }
1146a1151,1152
>         if ((image != image2) && (image2 != (Image *) NULL))
>           image2=DestroyImage(image2);
1332,1333d1337
<   if (clone_info)
<     clone_info=DestroyImageInfo(clone_info);
1350a1355,1356
>           if (tmp == image2)
>             image2=(Image *) NULL;
  • coders/pcx.c
1016a1017,1018
>         if (page_table != (MagickOffsetType *) NULL)
>           page_table=(MagickOffsetType *) RelinquishMagickMemory(page_table);
1103,1104c1105,1106
<                 status=SetImageProgress(image,SaveImageTag,(MagickOffsetType)
y,
<                 image->rows);
---
>                 status=SetImageProgress(image,SaveImageTag,(MagickOffsetType)
>                   y,image->rows);
1178a1181,1182
>         {
>           page_table=(MagickOffsetType *) RelinquishMagickMemory(page_table);
1179a1184
>         }

ChangeLog

2017-08-10  6.9.9-6 Glenn Randers-Pehrson <glennrp@image...>
  * tests/validate.c: Show the reason for failures in the test logs,
    if available.

2017-08-03  6.9.9-6 Glenn Randers-Pehrson <glennrp@image...>
  * Put UTC time in the PNG tIME chunk instead of local time (reference
    https://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=32447).