...

ImageMagick · Apr 23, 2016 · f739cf56af7383b13d8e7b39961c27948fa14876 · f739cf5
1 parent 1fe0b87
commit f739cf56af7383b13d8e7b39961c27948fa14876
Unified Split

Showing with 5 additions and 7 deletions.

+2 −2 PerlMagick/t/filter.t

+3 −3 PerlMagick/t/montage.t

+0 −2 coders/rle.c
diff --git a/PerlMagick/t/filter.t b/PerlMagick/t/filter.t
@@ -81,7 +81,7 @@ testFilterCompare('input.miff',  q//, 'reference/filter/Edge.miff', 'Edge', q//,
 testFilterCompare('input.miff',  q//, 'reference/filter/Emboss.miff', 'Emboss', q/'0x1'/, 0.2, 1.0);
 ++$test;

-testFilterCompare('input.miff',  q//, 'reference/filter/Equalize.miff', 'Equalize', q//, 0.0, 0.0);
+testFilterCompare('input.miff',  q//, 'reference/filter/Equalize.miff', 'Equalize', q//, 0.06, 0.5);
 ++$test;

 testFilterCompare('input.miff',  q//, 'reference/filter/Implode.miff', 'Implode', q/0.0/, 0.0, 0.0);
@@ -168,7 +168,7 @@ testFilterCompare('input.miff',  q//, 'reference/filter/Sample.miff', 'Sample',
 testFilterCompare('input.miff',  q//, 'reference/filter/Scale.miff', 'Scale', q/'60%'/, 0.0, 0.0);
 ++$test;

-testFilterCompare('input.miff',  q//, 'reference/filter/Segment.miff', 'Segment', q//, 0.0, 0.0);
+testFilterCompare('input.miff',  q//, 'reference/filter/Segment.miff', 'Segment', q//, 0.07, 0.9);
 ++$test;

 testFilterCompare('input.miff',  q//, 'reference/filter/Shade.miff', 'Shade', q/geometry=>'30x30',gray=>'true'/, 0.09, 0.9);
diff --git a/PerlMagick/t/montage.t b/PerlMagick/t/montage.t
@@ -133,9 +133,9 @@ testMontage( q/bordercolor=>'blue', mattecolor=>'red'/,
 testMontage( q/bordercolor=>'blue', mattecolor=>'red'/, 
  q/background=>'#696e7e',  tile=>'4x4', geometry=>'90x80+6+6>', frame=>'8x10',
  borderwidth=>'0', gravity=>'Center', shadow=>'True',background=>'gray'/,
+  '9fe18e11ac759d3a86362f16d0bdee4b6952d617daa3ad2c3511e19050dda71d',
  '45bfd268dba4385157f76e347b968181a9fc1e0ae64d49d61f53a0171eb80d54',
-  '45bfd268dba4385157f76e347b968181a9fc1e0ae64d49d61f53a0171eb80d54',
-  '2d9b191eea778b1d1d98f9d997558f96e6f6d273a1d92787c9f70866b4382cd4');
+  '9fe18e11ac759d3a86362f16d0bdee4b6952d617daa3ad2c3511e19050dda71d');

 #
 # 13) Test Framed Montage with drop-shadows and background texture
@@ -144,7 +144,7 @@ testMontage( q/bordercolor=>'blue', mattecolor=>'red'/,
 testMontage( q/bordercolor=>'blue', mattecolor=>'red'/, 
  q/background=>'#696e7e',  tile=>'4x4', geometry=>'90x80+6+6>', frame=>'8x10',
  borderwidth=>'0', gravity=>'Center', shadow=>'True', texture=>'granite:'/,
-  '175a0a083869f6d485f35d22e636c9711208710868e39ed66f2f1a395a4e4141');
+  '6d8b83a9e9bd385a8267e3a0205d4972b3fbb4d59bf922fdbc060d3f4cefdbf8');

 #
 # 14) Test Un-bordered, Un-framed Montage
diff --git a/coders/rle.c b/coders/rle.c
@@ -315,8 +315,6 @@ static Image *ReadRLEImage(const ImageInfo *image_info,ExceptionInfo *exception)
    if ((number_pixels*number_planes_filled) != (size_t) (number_pixels*
         number_planes_filled))
      ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
-    if (image->rows < (image->rows*number_planes_filled*sizeof(*pixels)))
-      ThrowReaderException(CorruptImageError,"ImproperImageHeader");
    pixel_info=AcquireVirtualMemory(image->columns,image->rows*
      number_planes_filled*sizeof(*pixels));
    if (pixel_info == (MemoryInfo *) NULL)